nowfocus 0.5.2__tar.gz → 0.5.4__tar.gz

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

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

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

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

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

@@ -100,8 +100,9 @@ class Application(Gtk.Application):
             # time.sleep(3)
             # 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()
 
             signal.signal(signal.SIGINT, self.quit)
             signal.signal(signal.SIGUSR1, self.signal_handler)

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

@@ -407,7 +407,7 @@ class TaskWindow(Gtk.Window):
             # self.r_sidebar.connect("enter-notify-event",self.test)
            
 
-            self.l_sidebar.add(choose_from_lists(self.select_list_callback, 'None', None, False))
+            self.l_sidebar.add(choose_from_lists(self.select_list_callback, 'None', None, False, show_todolist_headers=False))
 
             self.SessionEditDialog = SessionEditDialog # passed to show_sessions via self
             sidebar_sessions = get_sessions(use_sessions_timeframe_setting=False)
@@ -491,8 +491,8 @@ class TaskWindow(Gtk.Window):
 
             extended_label = GLib.markup_escape_text(t['extended_label'])
 
-            if len(extended_label) > 110:
-                extended_label = extended_label[:110]+"..." 
+            if len(extended_label) > 100:
+                extended_label = extended_label[:100]+"..." 
             
             if len(self.search_term) > 1:
 

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

@@ -661,20 +661,20 @@ def db_cleanup(widget = None):
     ids = []
     # print('ids_sql',ids_sql)
     for id, todo in conf.user['todolists'].items():
-        if todo['status']:
-            ids.append(id)
+        ids.append(id)
 
     # Old save
     # print("Active todolist ids",ids)
 
     # Delete unlinked tasks
-    # db_query('DELETE FROM tasks WHERE todolist NOT IN (%s)' % ','.join('?'*len(ids)),ids)
+    db_query('DELETE FROM tasks WHERE todolist NOT IN (%s)' % ','.join('?'*len(ids)),ids)
+    
     # print(len(orphaned_tasks),"orphaned_tasks",orphaned_tasks)
     # orphaned_tasks = db_query('SELECT id, extended_label, todolist FROM tasks WHERE todolist NOT IN (%s)' % ','.join('?'*len(ids)),ids)
     # print(len(orphaned_tasks),"orphaned_tasks",orphaned_tasks)
     
     # Delete unlinked lists
-    # db_query('DELETE FROM lists WHERE todolist NOT IN (%s)' % ','.join('?'*len(ids)),ids)
+    db_query('DELETE FROM lists WHERE todolist NOT IN (%s)' % ','.join('?'*len(ids)),ids)
 
     # orphaned_lists = db_query('SELECT id, extended_label, todolist FROM lists WHERE todolist NOT IN (%s)' % ','.join('?'*len(ids)),ids)
     # print("orphaned_lists",orphaned_lists)
@@ -1043,10 +1043,11 @@ def get_times(task):
 
 
 def db_deactivate_todo(id):
-    dbg("deactivating todolist: "+id, s='todoloading')
+    dbg("deactivating todolist: ",id, s='todoloading')
     # Delete inactive todo items (except where there are sessions for them) 
-    db_query("DELETE FROM tasks WHERE todolist = ? AND id NOT IN (SELECT task_id FROM sessions)",(id,))
-    db_query("DELETE FROM lists WHERE todolist = ? AND id NOT IN (SELECT parent_id FROM tasks)",(id,))
+    # db_query("DELETE FROM tasks WHERE todolist = ? AND id NOT IN (SELECT task_id FROM sessions)",(id,))
+    # db_query("DELETE FROM lists WHERE todolist = ? AND id NOT IN (SELECT parent_id FROM tasks)",(id,))
+
     db_query("UPDATE lists SET status = -1 WHERE todolist = ?",(id,))
     db_query("UPDATE tasks SET status = -1 WHERE todolist = ?",(id,))
 
@@ -1156,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):
+def choose_from_lists(callback, selected_list_id = None, session = None, accepts_tasks = True, skip_top_level_lists = False, show_todolist_headers = True):
     ''' 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 
@@ -1166,6 +1167,7 @@ def choose_from_lists(callback, selected_list_id = None, session = None, accepts
         selected_list_id = get_most_recent_list(session = None)
 
     box = Gtk.VBox()
+    box.set_spacing(8)
 
     scrolled_window = Gtk.ScrolledWindow()
     scrolled_window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC)
@@ -1177,48 +1179,55 @@ def choose_from_lists(callback, selected_list_id = None, session = None, accepts
 
     where = " WHERE status = '1' "
 
-    if accepts_tasks:
-        where += " AND data like '%\"accepts_tasks\": true%' "
-    else:
-        # HACK: to not show op level lists
-        # TODO: think of a better way
-        where += " AND parent_label != '' "
+    if skip_top_level_lists:
+        where += " AND parent_label IS NOT NULL "
 
-
-    lists = db_query("SELECT * FROM lists "+where+" ORDER BY todolist, extended_label ASC ", None, 'id')
+    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')    
+    
+    r_button = None
+    todolist_id = None
 
     for id, l in lists.items():
-        l['data'] = json.loads(l['data']) 
-        # print("AddTask list ",l['label'])
+        try:
+            l['data'] = json.loads(l['data']) 
 
-        if todolist == None:
-            # initial button group
-            button_group = Gtk.RadioButton(label=l['label'])
-            item = button_group
-        else:
             indent = len(get_lists_for_item(l)['ids'])
-            label = f'{"    " * indent}' + l['label']
-            item = Gtk.RadioButton(label=GLib.markup_escape_text(label), group=button_group)
-
-        if todolist != l['todolist']:
-            # new buttongroup for new todolist
-            todolist = l['todolist']
-            l['header'] = Gtk.Label()
+            label = f'{" · " * indent}' + GLib.markup_escape_text(l['label'])
+
+            if todolist_id != l['todolist']:
+                todolist_id = l['todolist']
+                if show_todolist_headers:
+                    label = "<b>" + label + "</b>"
+                    if r_button:
+                        r_button.set_margin_bottom(20)
+                else:
+                    continue
 
-            try:
-                l['header'].set_markup("<b>"+conf.user['todolists'][todolist]["label"]+"</b>")
-            except Exception as e:
-                dbg('Exception creating button group header for list',l, e=e, l=0)
-                
-            box.add(l['header'])
+            label_widget = Gtk.Label()
+            label_widget.set_halign(Gtk.Align.START)
+            label_widget.set_markup(label)
             
-        if l['id'] == selected_list_id:
-            item.set_active(True)
+            if accepts_tasks and l['data']['accepts_tasks'] == False:
+                label_widget.set_markup('   '+label)
+
+                box.add(label_widget)
+
+            else:
+                r_button = Gtk.RadioButton(group=r_button)
+                r_button.add(label_widget)
+
+
+                if l['id'] == selected_list_id:
+                    r_button.set_active(True)
 
-        item.connect("toggled", callback, l) #
-        box.add(item)
+                r_button.connect("toggled", callback, l) 
+                box.add(r_button)
+
+        except Exception as e:
+            dbg('Exception adding to choose_from_lists list', l, e=e, l=0)
 
     # TODO: allow a height argument to account for other things that require space, and possibly a global screen height value?
+
     # Optimize the height, 27px per item with max of 700 px and a min of 50
     height = max(50,min(500, (len(lists) * 27))) 
     scrolled_window.set_size_request(-1, height)

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

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