From 42202faae823d3052150af72ea9ce90d2fd71a35 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Sat, 6 Jul 2013 09:30:37 +0530
Subject: [PATCH] Metadata download dialog: Have the OK button enabled in the
 results screen as well. See #1198288

---
 src/calibre/gui2/metadata/single_download.py | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py
index ed378745a5..fc883bd88f 100644
--- a/src/calibre/gui2/metadata/single_download.py
+++ b/src/calibre/gui2/metadata/single_download.py
@@ -1019,7 +1019,6 @@ class FullFetch(QDialog):  # {{{
         self.log_button = self.bb.addButton(_('View log'), self.bb.ActionRole)
         self.log_button.clicked.connect(self.view_log)
         self.log_button.setIcon(QIcon(I('debug.png')))
-        self.ok_button.setEnabled(False)
         self.prev_button.setVisible(False)
 
         self.identify_widget = IdentifyWidget(self.log, self)
@@ -1044,7 +1043,6 @@ class FullFetch(QDialog):  # {{{
 
     def book_selected(self, book, caches):
         self.next_button.setVisible(False)
-        self.ok_button.setEnabled(True)
         self.prev_button.setVisible(True)
         self.book = book
         self.stack.setCurrentIndex(1)
@@ -1055,7 +1053,6 @@ class FullFetch(QDialog):  # {{{
 
     def back_clicked(self):
         self.next_button.setVisible(True)
-        self.ok_button.setEnabled(False)
         self.prev_button.setVisible(False)
         self.next_button.setFocus()
         self.stack.setCurrentIndex(0)
@@ -1063,11 +1060,14 @@ class FullFetch(QDialog):  # {{{
         self.covers_widget.reset_covers()
 
     def accept(self):
-        gprefs['metadata_single_gui_geom'] = bytearray(self.saveGeometry())
-        if self.stack.currentIndex() == 1:
-            return QDialog.accept(self)
         # Prevent the usual dialog accept mechanisms from working
-        pass
+        gprefs['metadata_single_gui_geom'] = bytearray(self.saveGeometry())
+        if DEBUG_DIALOG:
+            if self.stack.currentIndex() == 2:
+                return QDialog.accept(self)
+        else:
+            if self.stack.currentIndex() == 1:
+                return QDialog.accept(self)
 
     def reject(self):
         gprefs['metadata_single_gui_geom'] = bytearray(self.saveGeometry())
@@ -1087,6 +1087,9 @@ class FullFetch(QDialog):  # {{{
 
     def ok_clicked(self, *args):
         self.cover_pixmap = self.covers_widget.cover_pixmap()
+        if self.stack.currentIndex() == 0:
+            self.next_clicked()
+            return
         if DEBUG_DIALOG:
             if self.cover_pixmap is not None:
                 self.w = QLabel()