Adjust editor outline view

Signed-off-by: TheJackiMonster <thejackimonster@gmail.com>

manuskript/ui/views/editorView.py

@@ -34,6 +34,8 @@ class EditorView:
         self.outlineStore = builder.get_object("outline_store")
         self.refreshOutlineStore()
 
+        self.editorOutlineStore = builder.get_object("editor_outline_store")
+
         self.outlineView = builder.get_object("outline_view")
         self.editorOutlineView = builder.get_object("editor_outline_view")
 
@@ -112,6 +114,14 @@ class EditorView:
 
         self.__updateOutlineItem(tree_iter, outlineItem)
 
+        completedItem = outlineItem
+        while completedItem is not None:
+            if completedItem in self.editorItems:
+                self.loadOutlineData(self.outlineItem)
+                break
+
+            completedItem = completedItem.parentItem()
+
         return len(self.outlineCompletion) > 0
 
     def __appendOutlineItem(self, outlineItem: OutlineItem, parent_iter=None):
@@ -138,6 +148,34 @@ class EditorView:
         for item in self.project.outline.items:
             self.__appendOutlineItem(item)
 
+    def __updateEditorOutlineItem(self, list_iter, outlineItem: OutlineItem):
+        icon = iconByOutlineItemType(outlineItem)
+
+        wordCount = validInt(outlineItem.textCount())
+        goal = validInt(outlineItem.goalCount())
+        progress = 100 * safeFraction(wordCount, 0, goal)
+
+        self.editorOutlineStore.set_value(list_iter, 0, outlineItem.UID.value)
+        self.editorOutlineStore.set_value(list_iter, 1, validString(outlineItem.title))
+        self.editorOutlineStore.set_value(list_iter, 2, validString(outlineItem.label))
+        self.editorOutlineStore.set_value(list_iter, 3, validString(outlineItem.status))
+        self.editorOutlineStore.set_value(list_iter, 4, outlineItem.compile)
+        self.editorOutlineStore.set_value(list_iter, 5, wordCount)
+        self.editorOutlineStore.set_value(list_iter, 6, goal)
+        self.editorOutlineStore.set_value(list_iter, 7, progress)
+        self.editorOutlineStore.set_value(list_iter, 8, icon)
+
+    def refreshEditorOutlineStore(self):
+        self.editorOutlineStore.clear()
+
+        for outlineItem in self.editorItems:
+            list_iter = self.editorOutlineStore.append()
+
+            if list_iter is None:
+                continue
+
+            self.__updateEditorOutlineItem(list_iter, outlineItem)
+
     def __selectOutlineStoreRow(self, row: Gtk.TreeModelRow):
         path = row.model.get_path(row.iter)
 
@@ -237,6 +275,7 @@ class EditorView:
         for item in self.editorItems:
             self.editorFlowbox.insert(GridItem(item).widget, -1)
 
+        self.refreshEditorOutlineStore()
         self.outlineItem = outlineItem
 
     def _outlineSelectionChanged(self, selection: Gtk.TreeSelection):
@@ -258,6 +297,17 @@ class EditorView:
 
         outlineItem = self.project.outline.getItemByID(model[tree_iter][0])
 
+        try:
+            index = self.editorItems.index(outlineItem)
+        except ValueError:
+            self.editorFlowbox.unselect_all()
+            return
+
+        for child in self.editorFlowbox.get_children():
+            if index == child.get_index():
+                self.editorFlowbox.select_child(child)
+                break
+
     def _editorFlowboxSelectionChanged(self, box: Gtk.FlowBox):
         children = box.get_selected_children()
         child = children[0] if len(children) > 0 else None

ui/editor.glade

@@ -25,6 +25,28 @@ along with Manuskript.  If not, see <http://www.gnu.org/licenses/>.
   <!-- interface-name Manuskript -->
   <!-- interface-description Manuskript is an open-source tool for writers. -->
   <!-- interface-copyright 2015-2021 Olivier Keshavjee et al. -->
+  <object class="GtkListStore" id="editor_outline_store">
+    <columns>
+      <!-- column-name ID -->
+      <column type="gint"/>
+      <!-- column-name title -->
+      <column type="gchararray"/>
+      <!-- column-name label -->
+      <column type="gchararray"/>
+      <!-- column-name status -->
+      <column type="gchararray"/>
+      <!-- column-name compile -->
+      <column type="gboolean"/>
+      <!-- column-name count -->
+      <column type="gulong"/>
+      <!-- column-name goal -->
+      <column type="gulong"/>
+      <!-- column-name progress -->
+      <column type="gint"/>
+      <!-- column-name icon -->
+      <column type="gchararray"/>
+    </columns>
+  </object>
   <object class="GtkAdjustment" id="editor_scale_adjustment">
     <property name="upper">100</property>
     <property name="step-increment">1</property>
@@ -425,7 +447,7 @@ along with Manuskript.  If not, see <http://www.gnu.org/licenses/>.
                                   <object class="GtkTreeView" id="editor_outline_view">
                                     <property name="visible">True</property>
                                     <property name="can-focus">True</property>
-                                    <property name="model">outline_store</property>
+                                    <property name="model">editor_outline_store</property>
                                     <property name="enable-tree-lines">True</property>
                                     <child internal-child="selection">
                                       <object class="GtkTreeSelection" id="editor_outline_selection"/>