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

Trim cover dialog: Remove the redundant Trim & OK button, instead have the OK button trim automatically if there is a selection. Fixes #1759671 [Inconsistent behaviour in Trim Borders Manually](https://bugs.launchpad.net/calibre/+bug/1759671)

Browse Source
This commit is contained in:
Kovid Goyal 2018-03-29 07:47:03 +05:30
parent c1649b383e
commit 0e2108e74a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/gui2/dialogs/trim_image.py
View File

@ -40,7 +40,7 @@ class TrimImage(QDialog):
u.setShortcut(QKeySequence(QKeySequence.Undo)) u.setShortcut(QKeySequence(QKeySequence.Undo))
self.redo_action = r = c.redo_action self.redo_action = r = c.redo_action
r.setShortcut(QKeySequence(QKeySequence.Redo)) r.setShortcut(QKeySequence(QKeySequence.Redo))
self.trim_action = ac = self.bar.addAction(QIcon(I('trim.png')), _('&Trim'), c.trim_image) self.trim_action = ac = self.bar.addAction(QIcon(I('trim.png')), _('&Trim'), self.do_trim)
ac.setShortcut(QKeySequence('Ctrl+T')) ac.setShortcut(QKeySequence('Ctrl+T'))
ac.setToolTip('%s [%s]' % (_('Trim image by removing borders outside the selected region'), ac.shortcut().toString(QKeySequence.NativeText))) ac.setToolTip('%s [%s]' % (_('Trim image by removing borders outside the selected region'), ac.shortcut().toString(QKeySequence.NativeText)))
ac.setEnabled(False) ac.setEnabled(False)
@ -60,10 +60,6 @@ class TrimImage(QDialog):
bb.rejected.connect(self.reject) bb.rejected.connect(self.reject)
l.addWidget(bb) l.addWidget(bb)
self.tok = b = bb.addButton(_('Trim and OK'), QDialogButtonBox.ActionRole)
b.clicked.connect(self.trim_and_accept)
b.setIcon(self.trim_action.icon())
self.resize(QSize(900, 600)) self.resize(QSize(900, 600))
geom = gprefs.get('image-trim-dialog-geometry', None) geom = gprefs.get('image-trim-dialog-geometry', None)
if geom is not None: if geom is not None:
@ -71,6 +67,10 @@ class TrimImage(QDialog):
self.setWindowIcon(self.trim_action.icon()) self.setWindowIcon(self.trim_action.icon())
self.image_data = None self.image_data = None
def do_trim(self):
self.canvas.trim_image()
self.selection_changed(False)
def selection_changed(self, has_selection): def selection_changed(self, has_selection):
self.trim_action.setEnabled(has_selection) self.trim_action.setEnabled(has_selection)
self.msg.setVisible(not has_selection) self.msg.setVisible(not has_selection)
@ -83,6 +83,8 @@ class TrimImage(QDialog):
gprefs.set('image-trim-dialog-geometry', bytearray(self.saveGeometry())) gprefs.set('image-trim-dialog-geometry', bytearray(self.saveGeometry()))
def accept(self): def accept(self):
if self.trim_action.isEnabled():
self.trim_action.trigger()
if self.canvas.is_modified: if self.canvas.is_modified:
self.image_data = self.canvas.get_image_data() self.image_data = self.canvas.get_image_data()
self.cleanup() self.cleanup()
@ -92,10 +94,6 @@ class TrimImage(QDialog):
self.cleanup() self.cleanup()
QDialog.reject(self) QDialog.reject(self)
def trim_and_accept(self):
if self.canvas.trim_image():
self.accept()
if __name__ == '__main__': if __name__ == '__main__':
app = QApplication([]) app = QApplication([])