Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

De-activate snippet without needing an extra Ctrl+Tab if the last placeholder has no mirrors/transforms

Browse Source
This commit is contained in:
Kovid Goyal 2015-01-08 10:34:58 +05:30
parent a5a3ef3b02
commit 4e140ea27d
1 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/calibre/gui2/tweak_book/editor/snippets.py
View File

@ -159,6 +159,8 @@ class EditorTabStop(object):
self.mirrors = tuple(EditorTabStop(left, [ts], editor) for ts in tab_stops[1:]) self.mirrors = tuple(EditorTabStop(left, [ts], editor) for ts in tab_stops[1:])
self.ignore_position_update = False self.ignore_position_update = False
self.join_previous_edit = False self.join_previous_edit = False
self.transform = None
self.has_transform = self.transform is not None
def __enter__(self): def __enter__(self):
self.join_previous_edit = True self.join_previous_edit = True
@ -271,6 +273,8 @@ class Template(list):
return ts return ts
ts = self.active_tab_stop ts = self.active_tab_stop
if not ts.is_deleted: if not ts.is_deleted:
if ts.has_transform:
ts.text = ts.transform(ts.text)
for m in ts.mirrors: for m in ts.mirrors:
if not m.is_deleted: if not m.is_deleted:
m.text = ts.text m.text = ts.text
@ -280,6 +284,15 @@ class Template(list):
x.set_editor_cursor(editor) x.set_editor_cursor(editor)
return x return x
def remains_active(self):
if self.active_tab_stop is None:
return False
ts = self.active_tab_stop
for x in self:
if x.num > ts.num and not x.is_deleted:
return True
return bool(ts.mirrors) or ts.has_transform
def find_closest_tab_stop(self, position): def find_closest_tab_stop(self, position):
ans = dist = None ans = dist = None
for c in self: for c in self:
@ -346,6 +359,9 @@ class SnippetManager(QObject):
if at is not None: if at is not None:
if at.jump_to_next(editor) is None: if at.jump_to_next(editor) is None:
self.active_templates.remove(at) self.active_templates.remove(at)
else:
if not at.remains_active():
self.active_templates.remove(at)
ev.accept() ev.accept()
return True return True
lst, self.last_selected_text = self.last_selected_text, editor.selected_text lst, self.last_selected_text = self.last_selected_text, editor.selected_text