nowfocus 0.5.4__tar.gz → 0.5.5__tar.gz

{nowfocus-0.5.4/src/nowfocus.egg-info → nowfocus-0.5.5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nowfocus
-Version: 0.5.4
+Version: 0.5.5
 Summary: nowfocus: the open source task-tracking self-control panel.
 Author: AltruistEnterprises
 Project-URL: Homepage, https://www.nowfocus.org

{nowfocus-0.5.4 → nowfocus-0.5.5}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nowfocus"
-version = "0.5.4"
+version = "0.5.5"
 authors = [
   { name="AltruistEnterprises" },
 ]

{nowfocus-0.5.4 → nowfocus-0.5.5}/src/nowfocus/__main__.py

@@ -97,10 +97,10 @@ class Application(Gtk.Application):
             self.open_task_window()
 
             # Testing
-            # time.sleep(3)
+            # TODO: enable these automatically with dbg system
             # self.open_session_options_dialog('test_param')
             # self.open_settings_window() #for testing
-            self.open_new_task_dialog() #for testing
+            # self.open_new_task_dialog() #for testing
             # self.print_time_totals()
             # self.new_task_dialog()
 

{nowfocus-0.5.4 → nowfocus-0.5.5}/src/nowfocus/task_window.py

@@ -405,9 +405,10 @@ class TaskWindow(Gtk.Window):
             # self.r_sidebar.add_events(Gdk.EventMask.ENTER_NOTIFY_MASK)
             # self.r_sidebar.add_events(Gdk.EventMask.LEAVE_NOTIFY_MASK)
             # self.r_sidebar.connect("enter-notify-event",self.test)
-           
+        #    session = None, accepts_tasks = True, skip_top_level_lists = False, show_todolist_headers = True, deduplicate = False, truncate_labels_to_chars = 100
 
-            self.l_sidebar.add(choose_from_lists(self.select_list_callback, 'None', None, False, show_todolist_headers=False))
+            self.l_sidebar.add(choose_from_lists(
+                self.select_list_callback, 'None', None, accepts_tasks=False, skip_top_level_lists =True, show_todolist_headers=False, deduplicate=True, truncate_labels_to_chars=20))
 
             self.SessionEditDialog = SessionEditDialog # passed to show_sessions via self
             sidebar_sessions = get_sessions(use_sessions_timeframe_setting=False)
@@ -489,10 +490,11 @@ class TaskWindow(Gtk.Window):
 
             label = Gtk.Label()
 
+            if len(t['extended_label']) > 100:
+                t['extended_label'] = t['extended_label'][:100]+"…" 
+
             extended_label = GLib.markup_escape_text(t['extended_label'])
 
-            if len(extended_label) > 100:
-                extended_label = extended_label[:100]+"..." 
             
             if len(self.search_term) > 1:
 

{nowfocus-0.5.4 → nowfocus-0.5.5}/src/nowfocus/utils.py

@@ -1157,7 +1157,7 @@ def get_most_recent_list(session = None):
         return last_session[0]['parent_id']
 
 
-def choose_from_lists(callback, selected_list_id = None, session = None, accepts_tasks = True, skip_top_level_lists = False, show_todolist_headers = True):
+def choose_from_lists(callback, selected_list_id = None, session = None, accepts_tasks = True, skip_top_level_lists = False, show_todolist_headers = True, deduplicate = False, truncate_labels_to_chars = 100):
     ''' Returns a Gtk.ScrolledWindow widget with radio buttons'''
 
     # TODO: consider using TreeView https://lazka.github.io/pgi-docs/Gtk-3.0/classes/TreeView.html#Gtk.TreeView 
@@ -1177,12 +1177,15 @@ def choose_from_lists(callback, selected_list_id = None, session = None, accepts
 
     todolist = None
 
-    where = " WHERE status = '1' "
+    conditions = " "
 
     if skip_top_level_lists:
-        where += " AND parent_label IS NOT NULL "
+        conditions += " AND parent_label IS NOT NULL "
 
-    lists = db_query("SELECT lists.*,  (SELECT start_time FROM sessions WHERE todolist = lists.todolist ORDER BY start_time DESC  LIMIT 1 ) as last_session_on_todo FROM lists "+where+" ORDER BY last_session_on_todo DESC, CASE WHEN parent_id IS NULL THEN 1 ELSE 2 END, extended_label ASC ", None, 'id')    
+    if deduplicate:
+        conditions += " GROUP BY extended_label "
+
+    lists = db_query("SELECT lists.*,  (SELECT start_time FROM sessions WHERE todolist = lists.todolist ORDER BY start_time DESC  LIMIT 1 ) as last_session_on_todo FROM lists WHERE status = '1'  "+conditions+" ORDER BY last_session_on_todo DESC, CASE WHEN parent_id IS NULL THEN 1 ELSE 2 END, extended_label ASC ", None, 'id')    
     
     r_button = None
     todolist_id = None
@@ -1190,9 +1193,10 @@ def choose_from_lists(callback, selected_list_id = None, session = None, accepts
     for id, l in lists.items():
         try:
             l['data'] = json.loads(l['data']) 
+            if len(l['label']) > truncate_labels_to_chars:
+                l['label'] = l['label'][:truncate_labels_to_chars] + '…'
 
-            indent = len(get_lists_for_item(l)['ids'])
-            label = f'{" · " * indent}' + GLib.markup_escape_text(l['label'])
+            label = f'{" · " * l['extended_label'].count(' > ')}' + GLib.markup_escape_text(l['label'])
 
             if todolist_id != l['todolist']:
                 todolist_id = l['todolist']

{nowfocus-0.5.4 → nowfocus-0.5.5/src/nowfocus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nowfocus
-Version: 0.5.4
+Version: 0.5.5
 Summary: nowfocus: the open source task-tracking self-control panel.
 Author: AltruistEnterprises
 Project-URL: Homepage, https://www.nowfocus.org