mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-08 10:44:09 -04:00
Edit Book: When unmarking text auto-change the 'search where' location to what it was before text was marked rather than 'current file'.
This commit is contained in:
parent
52a757e715
commit
4fea472589
@ -468,6 +468,7 @@ class SearchPanel(QWidget): # {{{
|
|||||||
|
|
||||||
def __init__(self, parent=None):
|
def __init__(self, parent=None):
|
||||||
QWidget.__init__(self, parent)
|
QWidget.__init__(self, parent)
|
||||||
|
self.where_before_marked = None
|
||||||
self.l = l = QHBoxLayout()
|
self.l = l = QHBoxLayout()
|
||||||
self.setLayout(l)
|
self.setLayout(l)
|
||||||
l.setContentsMargins(0, 0, 0, 0)
|
l.setContentsMargins(0, 0, 0, 0)
|
||||||
@ -504,11 +505,14 @@ class SearchPanel(QWidget): # {{{
|
|||||||
return ans
|
return ans
|
||||||
|
|
||||||
def set_where(self, val):
|
def set_where(self, val):
|
||||||
|
if val == 'selected-text':
|
||||||
|
self.where_before_marked = self.widget.where
|
||||||
self.widget.where = val
|
self.widget.where = val
|
||||||
|
|
||||||
def unset_marked(self):
|
def unset_marked(self):
|
||||||
if self.widget.where == 'selected-text':
|
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):
|
def keyPressEvent(self, ev):
|
||||||
if ev.key() == Qt.Key_Escape:
|
if ev.key() == Qt.Key_Escape:
|
||||||
|
Loading…
x
Reference in New Issue
Block a user