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

previous button should be disabled when previous queue is empty

Browse Source
This commit is contained in:
Kovid Goyal 2024-05-28 10:06:01 +05:30
parent 4aebb5a6d4
commit 114cee2cd3
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 27 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
src/calibre/gui2/metadata/diff.py
View File

@ -642,13 +642,13 @@ class CompareMany(QDialog):
self.l = l = QVBoxLayout(w) self.l = l = QVBoxLayout(w)
s.addWidget(w) s.addWidget(w)
self.next_called = False self.next_called = False
# initialize the previous items list, we will use it to store the watched items that were rejected or accepted # initialize the previous items list, we will use it to store the watched items that were rejected or accepted
# when the user clicks on the next or reject button we will add the current item to the previous items list # when the user clicks on the next or reject button we will add the current item to the previous items list
# when the user presses the back button we will pop the last item from the previous items list and set it as current item # when the user presses the back button we will pop the last item from the previous items list and set it as current item
# also the popped item will be removed from the rejected or accepted items list (and will be unmarked if it was marked) # also the popped item will be removed from the rejected or accepted items list (and will be unmarked if it was marked)
self.previous_items = [] self.previous_items = []
self.setWindowIcon(QIcon.ic('auto_author_sort.png')) self.setWindowIcon(QIcon.ic('auto_author_sort.png'))
self.get_metadata = get_metadata self.get_metadata = get_metadata
self.ids = list(ids) self.ids = list(ids)
@ -675,9 +675,9 @@ class CompareMany(QDialog):
self.bb = bb = QDialogButtonBox(QDialogButtonBox.StandardButton.Cancel) self.bb = bb = QDialogButtonBox(QDialogButtonBox.StandardButton.Cancel)
bb.button(QDialogButtonBox.StandardButton.Cancel).setAutoDefault(False) bb.button(QDialogButtonBox.StandardButton.Cancel).setAutoDefault(False)
bb.rejected.connect(self.reject) bb.rejected.connect(self.reject)
if self.total > 1: if self.total > 1:
self.aarb = b = bb.addButton(_('&Accept all remaining'), QDialogButtonBox.ButtonRole.YesRole) self.aarb = b = bb.addButton(_('&Accept all remaining'), QDialogButtonBox.ButtonRole.YesRole)
b.setIcon(QIcon.ic('ok.png')), b.setAutoDefault(False) b.setIcon(QIcon.ic('ok.png')), b.setAutoDefault(False)
if accept_all_tooltip: if accept_all_tooltip:
@ -706,21 +706,21 @@ class CompareMany(QDialog):
b.setIcon(QIcon.ic(action_button[1])) b.setIcon(QIcon.ic(action_button[1]))
self.action_button_action = action_button[2] self.action_button_action = action_button[2]
b.clicked.connect(self.action_button_clicked) b.clicked.connect(self.action_button_clicked)
# Add a Back button, wich allows the user to go back to the previous book cancel any reject/edit/accept that was done to it, and review it again # Add a Back button, wich allows the user to go back to the previous book cancel any reject/edit/accept that was done to it, and review it again
# create a Back action that will be triggered when the user presses the back button or the back shortcut # create a Back action that will be triggered when the user presses the back button or the back shortcut
self.back_action = QAction(self) self.back_action = QAction(self)
self.back_action.setShortcut(QKeySequence(Qt.KeyboardModifier.AltModifier | Qt.Key.Key_Left)) self.back_action.setShortcut(QKeySequence(Qt.KeyboardModifier.AltModifier | Qt.Key.Key_Left))
self.back_action.triggered.connect(self.previous_item) self.back_action.triggered.connect(self.previous_item)
self.addAction(self.back_action) self.addAction(self.back_action)
# create the back button, set it's name, tooltip, icon and action to call the previous_item method # create the back button, set it's name, tooltip, icon and action to call the previous_item method
self.back_button = bb.addButton(_('P&revious'), QDialogButtonBox.ButtonRole.ActionRole) self.back_button = bb.addButton(_('P&revious'), QDialogButtonBox.ButtonRole.ActionRole)
self.back_button.setToolTip(_(f'Move to previous {self.back_action.shortcut().toString(QKeySequence.SequenceFormat.NativeText)}')) self.back_button.setToolTip(_(f'Move to previous {self.back_action.shortcut().toString(QKeySequence.SequenceFormat.NativeText)}'))
self.back_button.setIcon(QIcon.ic('back.png')) self.back_button.setIcon(QIcon.ic('back.png'))
self.back_button.clicked.connect(self.previous_item) self.back_button.clicked.connect(self.previous_item)
self.back_button.setDefault(True) self.back_button.setDefault(True)
self.back_button.setAutoDefault(False) self.back_button.setAutoDefault(False)
self.nb = b = bb.addButton(_('&Next') if self.total > 1 else _('&OK'), QDialogButtonBox.ButtonRole.ActionRole) self.nb = b = bb.addButton(_('&Next') if self.total > 1 else _('&OK'), QDialogButtonBox.ButtonRole.ActionRole)
if self.total > 1: if self.total > 1:
b.setToolTip(_('Move to next [%s]') % self.next_action.shortcut().toString(QKeySequence.SequenceFormat.NativeText)) b.setToolTip(_('Move to next [%s]') % self.next_action.shortcut().toString(QKeySequence.SequenceFormat.NativeText))
@ -786,30 +786,38 @@ class CompareMany(QDialog):
return self.compare_widget.current_mi return self.compare_widget.current_mi
def show_current_item(self):
self.setWindowTitle(self.window_title + _(' [%(num)d of %(tot)d]') % dict(
num=(self.total - len(self.ids) + 1), tot=self.total))
oldmi, newmi = self.get_metadata(self.ids[0])
self.compare_widget(oldmi, newmi)
self.update_back_button_state()
def update_back_button_state(self):
enabled = bool(self.previous_items)
self.back_action.setEnabled(enabled)
self.back_button.setEnabled(enabled)
def next_item(self, accept): def next_item(self, accept):
self.next_called = True self.next_called = True
if not self.ids: if not self.ids:
return self.accept() return self.accept()
if self.current_mi is not None: if self.current_mi is not None:
changed = self.compare_widget.apply_changes() changed = self.compare_widget.apply_changes()
if self.current_mi is not None: if self.current_mi is not None:
old_id = self.ids.pop(0) old_id = self.ids.pop(0)
# Save the current book that was just reviewed and accepted or rejected to the previous_items list # Save the current book that was just reviewed and accepted or rejected to the previous_items list
# this book can be displayed again if the user presses the back button # this book can be displayed again if the user presses the back button
self.previous_items.append(old_id) self.previous_items.append(old_id)
if not accept: if not accept:
self.rejected_ids.add(old_id) self.rejected_ids.add(old_id)
self.accepted[old_id] = (changed, self.current_mi) if accept else (False, None) self.accepted[old_id] = (changed, self.current_mi) if accept else (False, None)
if not self.ids: if not self.ids:
return self.accept() return self.accept()
self.setWindowTitle(self.window_title + _(' [%(num)d of %(tot)d]') % dict( self.show_current_item()
num=(self.total - len(self.ids) + 1), tot=self.total))
oldmi, newmi = self.get_metadata(self.ids[0])
self.compare_widget(oldmi, newmi)
def previous_item(self): def previous_item(self):
@ -817,23 +825,18 @@ class CompareMany(QDialog):
# get the last book id from the previous items list and remove it from the previous items list # get the last book id from the previous items list and remove it from the previous items list
# this book id is the last book id that was reviewed and accepted or rejected # this book id is the last book id that was reviewed and accepted or rejected
last_previous_item = self.previous_items.pop() last_previous_item = self.previous_items.pop()
# if this book id was rejected, remove it from the rejected ids set # if this book id was rejected, remove it from the rejected ids set
if last_previous_item in self.rejected_ids: if last_previous_item in self.rejected_ids:
self.rejected_ids.remove(last_previous_item) self.rejected_ids.remove(last_previous_item)
self.markq.setChecked(False) self.markq.setChecked(False)
# if this book id was accepted, remove it from the accepted dictionary # if this book id was accepted, remove it from the accepted dictionary
elif last_previous_item in self.accepted: elif last_previous_item in self.accepted:
self.accepted.pop(last_previous_item) self.accepted.pop(last_previous_item)
# move the last previous item to the begining of the pending list # move the last previous item to the begining of the pending list
self.ids.insert(0, last_previous_item) self.ids.insert(0, last_previous_item)
self.show_current_item()
# display the last previous item (from the ids list)
self.setWindowTitle(self.window_title + _(' [%(num)d of %(tot)d]') % dict(
num=(self.total - len(self.ids) + 1), tot=self.total))
oldmi, newmi = self.get_metadata(self.ids[0])
self.compare_widget(oldmi, newmi)
def accept_all_remaining(self): def accept_all_remaining(self):