CodeMirror/manuskript
1
0
Fork 0
mirror of https://github.com/olivierkes/manuskript.git synced 2024-05-16 19:02:32 +12:00
Code Issues Projects Releases Wiki Activity

Improve outline selection in editor view

Browse source 
Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>
This commit is contained in:
TheJackiMonster 2023-02-20 15:55:23 +01:00
parent 955d5d7bdb
commit 8110b204ca
No known key found for this signature in database
GPG key ID: D850A5F772E880F9
1 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
manuskript/ui/views/editorView.py
View file

@ -166,6 +166,7 @@ class EditorView:
self.editorOutlineStore.set_value(list_iter, 8, icon)
def refreshEditorOutlineStore(self):
self.editorOutlineSelection.unselect_all()
self.editorOutlineStore.clear()
for outlineItem in self.editorItems:
@ -176,19 +177,6 @@ class EditorView:
self.__updateEditorOutlineItem(list_iter, outlineItem)
def __selectOutlineStoreRow(self, row: Gtk.TreeModelRow):
path = row.model.get_path(row.iter)
if not self.outlineView.row_expanded(path):
self.outlineView.expand_to_path(path)
if not self.editorOutlineView.row_expanded(path):
self.editorOutlineView.expand_to_path(path)
if not self.outlineSelection.path_is_selected(path):
self.outlineSelection.select_path(path)
if not self.editorOutlineSelection.path_is_selected(path):
self.editorOutlineSelection.select_path(path)
def loadOutlineData(self, outlineItem: OutlineItem):
if outlineItem is None:
self.unloadOutlineData()
@ -290,6 +278,9 @@ class EditorView:
self.loadOutlineData(outlineItem)
def _editorOutlineSelectionChanged(self, selection: Gtk.TreeSelection):
if len(self.editorItems) == 0:
return
model, tree_iter = selection.get_selected()
if tree_iter is None:
@ -309,6 +300,9 @@ class EditorView:
break
def _editorFlowboxSelectionChanged(self, box: Gtk.FlowBox):
if len(self.editorItems) == 0:
return
children = box.get_selected_children()
child = children[0] if len(children) > 0 else None
@ -322,58 +316,51 @@ class EditorView:
outlineItem = self.editorItems[index]
def selectOutlineItem(model: Gtk.TreeModel, path: Gtk.TreePath, _iter: Gtk.TreeIter, outline_id: int):
def selectEditorOutlineItem(model: Gtk.TreeModel, path: Gtk.TreePath, _iter: Gtk.TreeIter, outline_id: int):
if model[_iter][0] != outline_id:
return False
parent_iter = model.iter_parent(_iter)
parent_path = None if parent_iter is None else model.get_path(parent_iter)
if (parent_path is not None) and (not self.editorOutlineView.row_expanded(parent_path)):
self.editorOutlineView.expand_to_path(parent_path)
if not self.editorOutlineSelection.path_is_selected(path):
self.editorOutlineSelection.select_path(path)
return True
self.outlineStore.foreach(selectOutlineItem, outlineItem.UID.value)
self.editorOutlineStore.foreach(selectEditorOutlineItem, outlineItem.UID.value)
def __openOutlineItem(self, outlineItem: OutlineItem | None):
if outlineItem is None:
self.outlineSelection.unselect_all()
self.editorOutlineSelection.unselect_all()
return
def selectOutlineItem(model: Gtk.TreeModel, path: Gtk.TreePath, _iter: Gtk.TreeIter, outline_id: int):
if model[_iter][0] != outline_id:
return False
if not self.editorOutlineView.row_expanded(path):
self.editorOutlineView.expand_to_path(path)
if not self.outlineView.row_expanded(path):
self.outlineView.expand_to_path(path)
if not self.outlineSelection.path_is_selected(path):
self.outlineSelection.select_path(path)
if not self.editorOutlineSelection.path_is_selected(path):
self.editorOutlineSelection.select_path(path)
return True
self.outlineStore.foreach(selectOutlineItem, outlineItem.UID.value)
def _editorFlowboxChildActivated(self, box: Gtk.FlowBox, child: Gtk.FlowBoxChild):
if len(self.editorItems) == 0:
return
if child is None:
self.__openOutlineItem(None)
return
index = child.get_index()
if (index < 0) or (index >= len(self.editorItems)):
return
self.__openOutlineItem(self.editorItems[index])
outlineItem = self.editorItems[index]
self.__openOutlineItem(outlineItem)
def _upButtonClicked(self, button: Gtk.Button):
if self.outlineItem is None: