about window from appdata, and clear selection in contexts and projects

Author: imhemish

data/meson.build

@@ -12,18 +12,6 @@ if desktop_utils.found()
   test('Validate desktop file', desktop_utils, args: [desktop_file])
 endif
 
-appstream_file = i18n.merge_file(
-        input: 'net.hemish.kaar.metainfo.xml.in',
-       output: 'net.hemish.kaar.metainfo.xml',
-       po_dir: '../po',
-      install: true,
-  install_dir: get_option('datadir') / 'metainfo'
-)
-
-appstreamcli = find_program('appstreamcli', required: false, disabler: true)
-test('Validate appstream file', appstreamcli,
-     args: ['validate', '--no-net', '--explain', appstream_file])
-
 install_data('net.hemish.kaar.gschema.xml',
   install_dir: get_option('datadir') / 'glib-2.0' / 'schemas'
 )

src/blp/ui.blp

@@ -57,7 +57,7 @@ template $KaarWindow: Adw.ApplicationWindow {
                                 Gtk.Box {
                                     vexpand: true;
                                     orientation: vertical;
-                                    spacing: 15;
+                                    spacing: 10;
 
                                     Gtk.ListBox filters_box {
                                         valign: start;
@@ -91,14 +91,32 @@ template $KaarWindow: Adw.ApplicationWindow {
                                         }
                                     }
 
-                                    Gtk.Label {
-                                        label: "Projects";
-                                        halign: start;
-                                        margin-start: 15;
+                                    Gtk.Box {
+                                        orientation: horizontal;
 
-                                        styles [
-                                            "heading"
-                                        ]
+                                        Gtk.Label {
+                                            label: "Projects";
+                                            halign: start;
+                                            margin-start: 15;
+
+                                            styles [
+                                                "heading"
+                                            ]
+                                        }
+
+                                        Separator {
+                                            hexpand: true;
+
+                                            styles [
+                                                "spacer"
+                                            ]
+                                        }
+
+                                        Gtk.Button projects_clear {
+                                            icon-name: "edit-clear-symbolic";
+                                            tooltip-text: "Clear Selection";
+                                            margin-end: 8;
+                                        }
                                     }
 
                                     Gtk.ListBox projects_box {
@@ -109,14 +127,32 @@ template $KaarWindow: Adw.ApplicationWindow {
                                         selection-mode: multiple;
                                     }
 
-                                    Gtk.Label {
-                                        label: "Contexts";
-                                        halign: start;
-                                        margin-start: 15;
+                                    Gtk.Box {
+                                        orientation: horizontal;
 
-                                        styles [
-                                            "heading"
-                                        ]
+                                        Gtk.Label {
+                                            label: "Contexts";
+                                            halign: start;
+                                            margin-start: 15;
+
+                                            styles [
+                                                "heading"
+                                            ]
+                                        }
+
+                                        Separator {
+                                            hexpand: true;
+
+                                            styles [
+                                                "spacer"
+                                            ]
+                                        }
+
+                                        Gtk.Button contexts_clear {
+                                            icon-name: "edit-clear-symbolic";
+                                            tooltip-text: "Clear Selection";
+                                            margin-end: 8;
+                                        }
                                     }
 
                                     Gtk.ListBox contexts_box {
@@ -165,7 +201,8 @@ template $KaarWindow: Adw.ApplicationWindow {
                                     "flat"
                                 ]
 
-                                icon-name: "document-open-symbolic";
+                                visible: bind tab_bar.tabs-revealed inverted;
+                                icon-name: "tab-new-symbolic";
                                 tooltip-text: "Open File";
                             }
 
@@ -193,8 +230,17 @@ template $KaarWindow: Adw.ApplicationWindow {
                         }
 
                         [top]
-                        Adw.TabBar tab_bar{
+                        Adw.TabBar tab_bar {
                             view: tab_view;
+
+                            end-action-widget: Gtk.Button trailing_open_button {
+                                icon-name: "tab-new-symbolic";
+                                tooltip-text: "Open File";
+
+                                styles [
+                                    "flat"
+                                ]
+                            };
                         }
 
                         [bottom]

src/gtk/help-overlay.ui

@@ -76,6 +76,12 @@
               <property name="action-name">win.reload</property>
               </object>
             </child>
+            <child>
+              <object class="GtkShortcutsShortcut">
+              <property name="title">Close Tab</property>
+              <property name="action-name">win.close_tab</property>
+              </object>
+            </child>
           </object>
         </child>
       </object>

src/kaar.gresource.xml

@@ -6,6 +6,7 @@
     <file preprocess="xml-stripblanks">blp/task.ui</file>
     <file preprocess="xml-stripblanks">blp/tab.ui</file>
     <file preprocess="xml-stripblanks">gtk/help-overlay.ui</file>
+    <file preprocess="xml-stripblanks">net.hemish.kaar.metainfo.xml</file>
     <file>style.css</file>
   </gresource>
 </gresources>

src/main.py

@@ -79,13 +79,8 @@ def open_file(self, file: Gio.File):
 
     def on_about_action(self, widget, _):
         """Callback for the app.about action."""
-        about = Adw.AboutWindow(transient_for=self.props.active_window,
-                                application_name='Kaar',
-                                application_icon='net.hemish.kaar',
-                                developer_name='Hemish',
-                                version='0.1.0',
-                                developers=['Hemish'],
-                                copyright='© 2023 Hemish')
+        about = Adw.AboutWindow.new_from_appdata("/net/hemish/kaar/net.hemish.kaar.metainfo.xml")
+        about.set_transient_for(self.props.active_window)
         about.present()
 
     def on_preferences_action(self, widget, _):

src/meson.build

@@ -13,12 +13,24 @@ blueprints = custom_target('blueprints',
   command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
 )
 
+appstream_file = i18n.merge_file(
+        input: 'net.hemish.kaar.metainfo.xml.in',
+       output: 'net.hemish.kaar.metainfo.xml',
+       po_dir: '../po',
+      install: true,
+  install_dir: get_option('datadir') / 'metainfo'
+)
+
+appstreamcli = find_program('appstreamcli', required: false, disabler: true)
+test('Validate appstream file', appstreamcli,
+     args: ['validate', '--no-net', '--explain', appstream_file])
+
 gnome.compile_resources('kaar',
   'kaar.gresource.xml',
   gresource_bundle: true,
   install: true,
   install_dir: pkgdatadir,
-  dependencies: blueprints,
+  dependencies: [blueprints, appstream_file],
 )
 
 python = import('python')

src/model.py

@@ -75,6 +75,7 @@ def __init__(self, render_pango_markup: bool, **kwargs):
         super().__init__(**kwargs)
         self.connect("setup", self.create_task_item)
         self.connect("bind", self.bind_task_item)
+        self.connect("unbind", self.unbind_task_item)
         self.render_pango_markup = render_pango_markup
 
     def create_task_item(self, fact, list_item):
@@ -85,7 +86,7 @@ def create_task_item(self, fact, list_item):
 
     def bind_task_item(self, fact, list_item):
         task_stack = list_item.get_child()
-        task_object: GObject.Object = list_item.get_item()
+        task_object: TodoTask = list_item.get_item()
         task_stack.object = task_object
 
         task_stack.task_label.set_label(task_object.duplicatedescription)
@@ -96,12 +97,9 @@ def bind_task_item(self, fact, list_item):
 
         task_stack.entry_row.set_text(task_object.line)
 
-        if task_object.completed:
-            task_stack.check_button.set_active(True)
-        task_object.bind_property("completed", task_stack.check_button, "active", GObject.BindingFlags.BIDIRECTIONAL)
+        task_stack.check_button.set_active(task_object.completed)
+        task_stack.completed_binding = task_object.bind_property("completed", task_stack.check_button, "active", GObject.BindingFlags.BIDIRECTIONAL)
 
-        # FIXME: completing tasks via check button does not autosave
-        #task_object.connect("notify::completed", lambda *args: )
 
         if task_object.duplicatepriority != None: 
             task_stack.priority_label.set_label(task_object.duplicatepriority)
@@ -115,10 +113,18 @@ def bind_task_item(self, fact, list_item):
         for date in task_object._dates:
             task_stack.dates_flow_box.append(task_stack.create_flow_box_item(date))
 
+        task_object.completed_signal = task_object.connect("notify::completed", lambda *args: task_stack.activate_action("win.save"))
 
+    def unbind_task_item(self, fact, list_item):
+        task_object: TodoTask = list_item.get_item()
+        task_stack = list_item.get_child()
+
+        task_object.disconnect(task_object.completed_signal)
+
+        task_stack.completed_binding.unbind()
 
 
-# a subclass of pytodotxt.Task to be consumed by Gtk Widgets and GObjects
+# a subclass of pytodotxt.Task to be consumed by Gtk Widgets and GListModels
 class TodoTask(Task, GObject.Object):
     mode = GObject.Property(type=str, default="view")
     __gtype_name__ = "TodoTask"
@@ -130,6 +136,7 @@ def __init__(self, *args):
         self._line = str(self)
         self._dates = self.calculate_date_strings()
         self.tags = [*map(lambda x: "+"+x, self.projects), *map(lambda x: "@"+x, self.contexts)]
+        self.notify("completed")
 
 
 
@@ -143,7 +150,7 @@ def line(self, value):
         self.parse(value)
         self._line = str(self)
         self.notify("duplicatedescription")
-        self.completed = self.is_completed
+        self.notify("completed")
         self._dates = self.calculate_date_strings() # Doesnt matter what value you pass here
         self.duplicatepriority = self.priority
         self.tags = [*map(lambda x: "+"+x, self.projects), *map(lambda x: "@"+x, self.contexts)]
@@ -155,10 +162,6 @@ def duplicatedescription(self):
     @GObject.Property(type=bool, default=False)
     def completed(self):
         return self.is_completed
-    
-    @completed.setter
-    def completed(self, value):
-        self.is_completed = value
 
     @GObject.Property(type=str)
     def duplicatepriority(self):

data/net.hemish.kaar.metainfo.xml.in src/net.hemish.kaar.metainfo.xml.in

@@ -43,4 +43,4 @@
     <value key="Purism::form_factor">workstation</value>
     <value key="Purism::form_factor">mobile</value>
   </custom>
-</component>
+</component>

src/tab.py

@@ -134,20 +134,19 @@ def reload_file(self, *args):
             self.file_monitor.disconnect(self.file_monitor_signal)
 
         except: pass
-        
-    
-        file_path = self.file_obj.get_parse_name()
 
-        # FIXME: read from Gfile itself to have support for non-local files
-        self.todotxt = TodoTxt(file_path, parser=TodoTxtParser(task_type=TodoTask))
+        done, contents, tag = self.file_obj.load_contents(cancellable=None)
+
         try:
-            self.todotxt.parse()
+            if done:
+                for task in TodoTxtParser(task_type=TodoTask).parse(contents):
+                    self.list_store.append(task)
+                    print(task)
         except Exception as e:
             print(e)
         finally:
             self.file_monitor_signal = self.file_monitor.connect("changed", lambda *args: print("File Changed"))
-        for task in self.todotxt.tasks:
-            self.list_store.append(task)
+            
         # Reload filters
         self.tasks_filter.changed(Gtk.FilterChange.DIFFERENT)
         self.search_filter.changed(Gtk.FilterChange.DIFFERENT)
@@ -157,8 +156,6 @@ def save_file(self, *args):
         pb.set_fraction(0)
         pb.set_visible(True)
 
-        self.todotxt.tasks = []
-
         @_async
         def report_progress():
             for i in range(10):
@@ -167,11 +164,19 @@ def report_progress():
             sleep(0.15)
             pb.set_visible(False)
 
+        tasks = []
+
         for item in self.list_store:
-            self.todotxt.tasks.append(item)
+            tasks.append(str(item))
 
         self.file_monitor.disconnect(self.file_monitor_signal)
-        self.todotxt.save()
+
+        readwrite = self.file_obj.open_readwrite()
+
+        readwrite.get_output_stream().write_all(buffer=bytes("\n".join(tasks), 'utf-8'), cancellable=None)
+
+        readwrite.close(cancellable=None)
+
         self.file_monitor_signal = self.file_monitor.connect('changed', lambda *args: print("file Changed"))
 
         report_progress()

src/todo

@@ -1,13 +1,11 @@
-TODO: improve sorting and its UI for preferences
-
-TODO: improve projects and contexts filtering UI
+TODO: improve sorting and its UI for preferences (high)
 
 TODO: internationalisation
 
-TODO: notify user that file changed on disk
+TODO: notify user that file changed on disk (high)
 
-TODO: remember last selected page on session save
+TODO: remember last selected page on session save (low priority)
 
-TODO: add content menu for each task for edit, delete
+TODO: add content menu for each task for edit, delete (low priority)
 
-TODO: increase, decrease priority buttons and preference
+TODO: increase, decrease priority buttons and preference (low priority)