From a3adb69d944dc2535895eedf9d0159302a07e839 Mon Sep 17 00:00:00 2001
From: Kovid Goyal <kovid@kovidgoyal.net>
Date: Wed, 3 Jul 2013 21:18:32 +0530
Subject: [PATCH] Metadata download dialog: Prevent the buttons from being
 re-ordered when the Next button is clicked.

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

diff --git a/src/calibre/gui2/metadata/single_download.py b/src/calibre/gui2/metadata/single_download.py
index 3e9bb87687..ed378745a5 100644
--- a/src/calibre/gui2/metadata/single_download.py
+++ b/src/calibre/gui2/metadata/single_download.py
@@ -1006,7 +1006,7 @@ class FullFetch(QDialog):  # {{{
         l.addWidget(self.bb)
         self.bb.rejected.connect(self.reject)
         self.bb.accepted.connect(self.accept)
-        self.next_button = self.bb.addButton(_('Next'), self.bb.AcceptRole)
+        self.next_button = self.bb.addButton(_('Next'), self.bb.ActionRole)
         self.next_button.setDefault(True)
         self.next_button.setEnabled(False)
         self.next_button.setIcon(QIcon(I('ok.png')))
@@ -1019,7 +1019,7 @@ 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.setVisible(False)
+        self.ok_button.setEnabled(False)
         self.prev_button.setVisible(False)
 
         self.identify_widget = IdentifyWidget(self.log, self)
@@ -1044,7 +1044,7 @@ class FullFetch(QDialog):  # {{{
 
     def book_selected(self, book, caches):
         self.next_button.setVisible(False)
-        self.ok_button.setVisible(True)
+        self.ok_button.setEnabled(True)
         self.prev_button.setVisible(True)
         self.book = book
         self.stack.setCurrentIndex(1)
@@ -1055,8 +1055,9 @@ class FullFetch(QDialog):  # {{{
 
     def back_clicked(self):
         self.next_button.setVisible(True)
-        self.ok_button.setVisible(False)
+        self.ok_button.setEnabled(False)
         self.prev_button.setVisible(False)
+        self.next_button.setFocus()
         self.stack.setCurrentIndex(0)
         self.covers_widget.cancel()
         self.covers_widget.reset_covers()
@@ -1081,6 +1082,7 @@ class FullFetch(QDialog):  # {{{
         self.next_button.setEnabled(True)
 
     def next_clicked(self, *args):
+        gprefs['metadata_single_gui_geom'] = bytearray(self.saveGeometry())
         self.identify_widget.get_result()
 
     def ok_clicked(self, *args):