From 04b13a0c621fc5e5770f0a60ca67a04e233ef43e Mon Sep 17 00:00:00 2001 From: Charles Haley Date: Sun, 13 Dec 2020 16:19:14 +0000 Subject: [PATCH] Apologies: I broke positioning of converted & duplicated rules in the last commit. --- src/calibre/gui2/preferences/coloring.py | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/calibre/gui2/preferences/coloring.py b/src/calibre/gui2/preferences/coloring.py index a11280c8b1..b697428d67 100644 --- a/src/calibre/gui2/preferences/coloring.py +++ b/src/calibre/gui2/preferences/coloring.py @@ -1032,9 +1032,8 @@ class EditRules(QWidget): # {{{ orig_row = idx.row() self.model.remove_rule(idx) new_idx = self.model.add_rule(kind, col, template) + new_idx = self.model.move(new_idx, -(self.model.rowCount() - orig_row - 1)) self.rules_view.setCurrentIndex(new_idx) - while self.rules_view.currentIndex().row() > orig_row: - self.move_up() self.changed.emit() def duplicate_rule(self): @@ -1047,11 +1046,10 @@ class EditRules(QWidget): # {{{ idx = self.rules_view.currentIndex() if idx.isValid(): kind, col, rule = self.model.data(idx, Qt.ItemDataRole.UserRole) - orig_row = idx.row() + orig_row = idx.row() + 1 new_idx = self.model.add_rule(kind, col, rule) + new_idx = self.model.move(new_idx, -(self.model.rowCount() - orig_row - 1)) self.rules_view.setCurrentIndex(new_idx) - while self.rules_view.currentIndex().row() > orig_row: - self.move_up() self.changed.emit() def add_rule(self):