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

Edit metadata dialog: Make pressing up on an undefined numeric field set the value to zero instead of -99999. Fixes #1622757 [Metadata Edit - Step Up on Integers is broken](https://bugs.launchpad.net/calibre/+bug/1622757)

Browse Source 
Merge branch 'master' of https://github.com/cbhaley/calibre
This commit is contained in:
Kovid Goyal 2016-09-13 17:54:17 +05:30
commit 874a7790b4
1 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/calibre/gui2/custom_column_widgets.py
View File

@ -123,19 +123,20 @@ class Bool(Base):
class Int(Base): class Int(Base):
def setup_ui(self, parent): def setup_ui(self, parent):
self.was_none = False
self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent), self.widgets = [QLabel('&'+self.col_metadata['name']+':', parent),
ClearingSpinBox(parent)] ClearingSpinBox(parent)]
w = self.widgets[1] w = self.widgets[1]
w.setRange(-1000000, 100000000) w.setRange(-1000000, 100000000)
w.setSpecialValueText(_('Undefined')) w.setSpecialValueText(_('Undefined'))
w.setSingleStep(1) w.setSingleStep(1)
w.valueChanged.connect(self.valueChanged)
def setter(self, val): def setter(self, val):
if val is None: if val is None:
val = self.widgets[1].minimum() val = self.widgets[1].minimum()
else:
val = int(val)
self.widgets[1].setValue(val) self.widgets[1].setValue(val)
self.was_none = val == self.widgets[1].minimum()
def getter(self): def getter(self):
val = self.widgets[1].value() val = self.widgets[1].value()
@ -143,6 +144,11 @@ class Int(Base):
val = None val = None
return val return val
def valueChanged(self, to_what):
if self.was_none and to_what == -999999:
self.setter(0)
self.was_none = to_what == self.widgets[1].minimum()
class Float(Int): class Float(Int):
def setup_ui(self, parent): def setup_ui(self, parent):
@ -153,11 +159,8 @@ class Float(Int):
w.setDecimals(2) w.setDecimals(2)
w.setSpecialValueText(_('Undefined')) w.setSpecialValueText(_('Undefined'))
w.setSingleStep(1) w.setSingleStep(1)
self.was_none = False
def setter(self, val): w.valueChanged.connect(self.valueChanged)
if val is None:
val = self.widgets[1].minimum()
self.widgets[1].setValue(val)
class Rating(Base): class Rating(Base):
@ -793,18 +796,19 @@ class BulkBool(BulkBase, Bool):
class BulkInt(BulkBase): class BulkInt(BulkBase):
def setup_ui(self, parent): def setup_ui(self, parent):
self.was_none = False
self.make_widgets(parent, QSpinBox) self.make_widgets(parent, QSpinBox)
self.main_widget.setRange(-1000000, 100000000) self.main_widget.setRange(-1000000, 100000000)
self.main_widget.setSpecialValueText(_('Undefined')) self.main_widget.setSpecialValueText(_('Undefined'))
self.main_widget.setSingleStep(1) self.main_widget.setSingleStep(1)
self.main_widget.valueChanged.connect(self.valueChanged)
def setter(self, val): def setter(self, val):
if val is None: if val is None:
val = self.main_widget.minimum() val = self.main_widget.minimum()
else:
val = int(val)
self.main_widget.setValue(val) self.main_widget.setValue(val)
self.ignore_change_signals = False self.ignore_change_signals = False
self.was_none = val == self.main_widget.minimum()
def getter(self): def getter(self):
val = self.main_widget.value() val = self.main_widget.value()
@ -812,6 +816,11 @@ class BulkInt(BulkBase):
val = None val = None
return val return val
def valueChanged(self, to_what):
if self.was_none and to_what == -999999:
self.setter(0)
self.was_none = to_what == self.main_widget.minimum()
class BulkFloat(BulkInt): class BulkFloat(BulkInt):
def setup_ui(self, parent): def setup_ui(self, parent):
@ -820,6 +829,8 @@ class BulkFloat(BulkInt):
self.main_widget.setDecimals(2) self.main_widget.setDecimals(2)
self.main_widget.setSpecialValueText(_('Undefined')) self.main_widget.setSpecialValueText(_('Undefined'))
self.main_widget.setSingleStep(1) self.main_widget.setSingleStep(1)
self.was_none = False
self.main_widget.valueChanged.connect(self.valueChanged)
class BulkRating(BulkBase): class BulkRating(BulkBase):