From 87eb1fb16437a36c6de477be2dd448140a7362b6 Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sat, 12 Dec 2020 22:16:04 +0000 Subject: [PATCH 1/3] Bug #1907856: Typing in number fails to replace undefined integers --- src/calibre/gui2/library/delegates.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/calibre/gui2/library/delegates.py b/src/calibre/gui2/library/delegates.py index a2f679e475..0be684247e 100644 --- a/src/calibre/gui2/library/delegates.py +++ b/src/calibre/gui2/library/delegates.py @@ -145,6 +145,8 @@ def make_clearing_spinbox(spinbox): if ev.key() == Qt.Key.Key_Space: self.clear_to_undefined() else: + if self.value() == self.minimum(): + self.clear() return spinbox.keyPressEvent(self, ev) return SpinBox From 0a02aa4827f05b23c751b917c2a6b5561f71d3de Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sat, 12 Dec 2020 23:35:01 +0000 Subject: [PATCH 2/3] Throw away empty icon specifications in icon rule evaluation --- src/calibre/gui2/library/models.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index 6aa176292a..d82558c682 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -117,7 +117,8 @@ class ColumnIcon(object): # {{{ template_cache=template_cache) if not rule_icons: continue - icon_list = [ic.strip() for ic in rule_icons.split(':')] + icon_list = [ic.strip() for ic in rule_icons.split(':') if ic.strip()] + print(icon_list) icons.extend(icon_list) if icon_list and not kind.endswith('_composed'): break From 99a647068cdbccf223772a963506023913ee784e Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sat, 12 Dec 2020 23:39:57 +0000 Subject: [PATCH 3/3] Remove print statement --- src/calibre/gui2/library/models.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calibre/gui2/library/models.py b/src/calibre/gui2/library/models.py index d82558c682..4ab816e90a 100644 --- a/src/calibre/gui2/library/models.py +++ b/src/calibre/gui2/library/models.py @@ -118,7 +118,6 @@ class ColumnIcon(object): # {{{ if not rule_icons: continue icon_list = [ic.strip() for ic in rule_icons.split(':') if ic.strip()] - print(icon_list) icons.extend(icon_list) if icon_list and not kind.endswith('_composed'): break