From 4fea472589e6fcd620a3140c683ea04783ebb42d Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Sat, 29 Oct 2016 18:02:08 +0530 Subject: [PATCH] Edit Book: When unmarking text auto-change the 'search where' location to what it was before text was marked rather than 'current file'. --- src/calibre/gui2/tweak_book/search.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/calibre/gui2/tweak_book/search.py b/src/calibre/gui2/tweak_book/search.py index b67641adea..d475efa445 100644 --- a/src/calibre/gui2/tweak_book/search.py +++ b/src/calibre/gui2/tweak_book/search.py @@ -468,6 +468,7 @@ class SearchPanel(QWidget): # {{{ def __init__(self, parent=None): QWidget.__init__(self, parent) + self.where_before_marked = None self.l = l = QHBoxLayout() self.setLayout(l) l.setContentsMargins(0, 0, 0, 0) @@ -504,11 +505,14 @@ class SearchPanel(QWidget): # {{{ return ans def set_where(self, val): + if val == 'selected-text': + self.where_before_marked = self.widget.where self.widget.where = val def unset_marked(self): if self.widget.where == 'selected-text': - self.widget.where = self.widget.DEFAULT_STATE['where'] + self.widget.where = self.where_before_marked or self.widget.DEFAULT_STATE['where'] + self.where_before_marked = None def keyPressEvent(self, ev): if ev.key() == Qt.Key_Escape: