Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Metadata download dialog: Have the OK button enabled in the results

Browse Source 
screen as well. See #1198288
This commit is contained in:
Kovid Goyal 2013-07-06 09:30:37 +05:30
parent 9a8d31ee96
commit 42202faae8
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/calibre/gui2/metadata/single_download.py
View File

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