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

Download metadata dialog: Get rid of the Next button

Browse Source 
I am tired of being asked why the Next button and the OK button do the
same thing, even though they dont, quite. Since the purpose of the Next
button is to prevent the Back button from changing button positions,
when it appears, remove the Next button and move the Back button out of
the button box, so that it cannot change button positions.
This commit is contained in:
Kovid Goyal 2014-12-15 08:25:26 +05:30
parent 3afe76ab30
commit 6c7edef679
1 changed files with 8 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -21,7 +21,8 @@ from PyQt5.Qt import (
QDialog, QVBoxLayout, QLabel, QDialogButtonBox, QStyle, QStackedWidget, QDialog, QVBoxLayout, QLabel, QDialogButtonBox, QStyle, QStackedWidget,
QWidget, QTableView, QGridLayout, QFontInfo, QPalette, QTimer, pyqtSignal, QWidget, QTableView, QGridLayout, QFontInfo, QPalette, QTimer, pyqtSignal,
QAbstractTableModel, QSize, QListView, QPixmap, QModelIndex, QUrl, QAbstractTableModel, QSize, QListView, QPixmap, QModelIndex, QUrl,
QAbstractListModel, QColor, QRect, QTextBrowser, QStringListModel, QMenu, QCursor) QAbstractListModel, QColor, QRect, QTextBrowser, QStringListModel, QMenu,
QCursor, QHBoxLayout, QPushButton, QSizePolicy)
from PyQt5.QtWebKitWidgets import QWebView from PyQt5.QtWebKitWidgets import QWebView
from calibre.customize.ui import metadata_plugins from calibre.customize.ui import metadata_plugins
@ -1037,24 +1038,21 @@ class FullFetch(QDialog): # {{{
l.addWidget(self.stack) l.addWidget(self.stack)
self.bb = QDialogButtonBox(QDialogButtonBox.Cancel|QDialogButtonBox.Ok) self.bb = QDialogButtonBox(QDialogButtonBox.Cancel|QDialogButtonBox.Ok)
l.addWidget(self.bb) self.h = h = QHBoxLayout()
l.addLayout(h)
self.bb.rejected.connect(self.reject) self.bb.rejected.connect(self.reject)
self.bb.accepted.connect(self.accept) self.bb.accepted.connect(self.accept)
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')))
self.next_button.clicked.connect(self.next_clicked)
self.ok_button = self.bb.button(self.bb.Ok) self.ok_button = self.bb.button(self.bb.Ok)
self.ok_button.setEnabled(False) self.ok_button.setEnabled(False)
self.ok_button.clicked.connect(self.ok_clicked) self.ok_button.clicked.connect(self.ok_clicked)
self.prev_button = self.bb.addButton(_('Back'), self.bb.ActionRole) self.prev_button = pb = QPushButton(QIcon(I('back.png')), _('&Back'), self)
self.prev_button.setIcon(QIcon(I('back.png'))) pb.clicked.connect(self.back_clicked)
self.prev_button.clicked.connect(self.back_clicked) pb.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
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.prev_button.setVisible(False) self.prev_button.setVisible(False)
h.addWidget(self.prev_button), h.addWidget(self.bb)
self.identify_widget = IdentifyWidget(self.log, self) self.identify_widget = IdentifyWidget(self.log, self)
self.identify_widget.rejected.connect(self.reject) self.identify_widget.rejected.connect(self.reject)
@ -1077,7 +1075,6 @@ class FullFetch(QDialog): # {{{
self._lv = LogViewer(self.log, self) self._lv = LogViewer(self.log, self)
def book_selected(self, book, caches): def book_selected(self, book, caches):
self.next_button.setVisible(False)
self.prev_button.setVisible(True) self.prev_button.setVisible(True)
self.book = book self.book = book
self.stack.setCurrentIndex(1) self.stack.setCurrentIndex(1)
@ -1087,9 +1084,7 @@ class FullFetch(QDialog): # {{{
self.ok_button.setFocus() self.ok_button.setFocus()
def back_clicked(self): def back_clicked(self):
self.next_button.setVisible(True)
self.prev_button.setVisible(False) self.prev_button.setVisible(False)
self.next_button.setFocus()
self.stack.setCurrentIndex(0) self.stack.setCurrentIndex(0)
self.covers_widget.cancel() self.covers_widget.cancel()
self.covers_widget.reset_covers() self.covers_widget.reset_covers()
@ -1114,7 +1109,6 @@ class FullFetch(QDialog): # {{{
self.covers_widget.cleanup() self.covers_widget.cleanup()
def identify_results_found(self): def identify_results_found(self):
self.next_button.setEnabled(True)
self.ok_button.setEnabled(True) self.ok_button.setEnabled(True)
def next_clicked(self, *args): def next_clicked(self, *args):