mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
Merge branch 'master' of https://github.com/cbhaley/calibre
Fixes #1907856 [Edit Metadata: Typing in number fails to replace undefined integers](https://bugs.launchpad.net/calibre/+bug/1907856)
This commit is contained in:
commit
c7c627f285
@ -145,6 +145,8 @@ def make_clearing_spinbox(spinbox):
|
|||||||
if ev.key() == Qt.Key.Key_Space:
|
if ev.key() == Qt.Key.Key_Space:
|
||||||
self.clear_to_undefined()
|
self.clear_to_undefined()
|
||||||
else:
|
else:
|
||||||
|
if self.value() == self.minimum():
|
||||||
|
self.clear()
|
||||||
return spinbox.keyPressEvent(self, ev)
|
return spinbox.keyPressEvent(self, ev)
|
||||||
return SpinBox
|
return SpinBox
|
||||||
|
|
||||||
|
@ -117,7 +117,7 @@ class ColumnIcon(object): # {{{
|
|||||||
template_cache=template_cache)
|
template_cache=template_cache)
|
||||||
if not rule_icons:
|
if not rule_icons:
|
||||||
continue
|
continue
|
||||||
icon_list = [ic.strip() for ic in rule_icons.split(':')]
|
icon_list = [ic.strip() for ic in rule_icons.split(':') if ic.strip()]
|
||||||
icons.extend(icon_list)
|
icons.extend(icon_list)
|
||||||
if icon_list and not kind.endswith('_composed'):
|
if icon_list and not kind.endswith('_composed'):
|
||||||
break
|
break
|
||||||
|
Loading…
x
Reference in New Issue
Block a user