nowfocus 0.5.1__py3-none-any.whl → 0.5.3__py3-none-any.whl

nowfocus/__main__.py

@@ -62,13 +62,12 @@ class Application(Gtk.Application):
 
         try:
         
-        
-                
             self.window = None
 
             self.is_running = False
             self.device_in_use = True
             self.UserIdleTime = UserIdleTime()
+            dbg('self.UserIdleTime.platform', self.UserIdleTime.platform,s='user_away')
             self.last_user_idle_check_time = None
             self.session = default_session()
 
@@ -111,6 +110,7 @@ class Application(Gtk.Application):
             Gtk.main()
         except Exception as e:
             print(conf.app_name +' had a pretty bad error. Please submit the following trace as an issue on the git repo or email it to the developers ')
+            print(e)
             traceback.print_tb(e.__traceback__)
             self.quit()
 

nowfocus/settings.py

@@ -105,6 +105,44 @@ class SettingsWindow(Gtk.Window):
         self.add(self.notebook)
 
 
+
+
+
+        # Settings
+        row = 0
+        grid = Gtk.Grid()
+        grid.set_row_spacing(10)
+        grid.set_column_spacing(10)
+        self.notebook.append_page(grid,Gtk.Label('Settings'))
+
+
+        grid.attach(Gtk.Box(border_width=10),0,(row:=row+1),5,1) # Spacer
+
+        grid.attach(self.settings_updater('default_text','What am I Doing?','Entry'),0,(row:=row+1),5,1)
+
+        grid.attach(self.settings_updater('open_task_window_fullscreen',True,'Switch'),0,(row:=row+1),5,1)
+        grid.attach(self.settings_updater('show_task_window_sidebars',True,'Switch'),0,(row:=row+1),5,1)
+
+        grid.attach(self.settings_updater('pomodoro_interval',25,'SpinButton',"(minutes)"),0,(row:=row+1),5,1)
+
+        grid.attach(self.settings_updater('randomness_interrupt_interval', 3, 'SpinButton',"\nPop up todo menu every so many minutes if not doing a task"),0,(row:=row+1),5,1)
+
+        grid.attach(self.settings_updater('todolist_refresh_interval', 3, 'SpinButton',"(hours)"),0,(row:=row+1),5,1)
+        
+    
+        # grid.attach(self.settings_updater('invoice_hourly_rate', 33, 'SpinButton',""),0,(row:=row+1),5,1)
+        
+        grid.attach(self.settings_updater('hours_search_timeframe', 'auto', 'ComboBoxText',"\nDefault timetracking range for hours shown in main window and invoicing", options = list(hours_search_timeframes().keys())),0,(row:=row+1),5,1)
+        
+        grid.attach(self.settings_updater('prompts', None, 'TextView',""),0,(row:=row+1),5,1)
+
+        grid.attach(self.settings_updater('display_todolist_as_top_level_list', 'auto', 'ComboBoxText',"", options = ['auto','always','never']),0,(row:=row+1),5,1)
+ 
+        grid.attach(self.settings_updater('max_top_level_menu_items', 18, 'SpinButton',""),0,(row:=row+1),5,1)
+
+
+
+
         row = 0
         grid = Gtk.Grid()
         grid.set_row_spacing(10)
@@ -113,7 +151,6 @@ class SettingsWindow(Gtk.Window):
 
         self.notebook.append_page(grid,Gtk.Label('Todolists and Time Trackers'))
 
-
         sub_head = Gtk.Label()
         sub_head.set_markup("<b>Todo Lists</b>")
         grid.attach(sub_head,0,(row:=row+1),5,1)
@@ -187,42 +224,6 @@ class SettingsWindow(Gtk.Window):
 
 
 
-        # Settings
-        row = 0
-        grid = Gtk.Grid()
-        grid.set_row_spacing(10)
-        grid.set_column_spacing(10)
-        self.notebook.append_page(grid,Gtk.Label('Settings'))
-
-
-        grid.attach(Gtk.Box(border_width=10),0,(row:=row+1),5,1) # Spacer
-
-        grid.attach(self.settings_updater('default_text','What am I Doing?','Entry'),0,(row:=row+1),5,1)
-
-        grid.attach(self.settings_updater('open_task_window_fullscreen',True,'Switch'),0,(row:=row+1),5,1)
-        grid.attach(self.settings_updater('show_task_window_sidebars',True,'Switch'),0,(row:=row+1),5,1)
-
-        grid.attach(self.settings_updater('pomodoro_interval',25,'SpinButton',"(minutes)"),0,(row:=row+1),5,1)
-
-        grid.attach(self.settings_updater('randomness_interrupt_interval', 3, 'SpinButton',"\nPop up todo menu every so many minutes if not doing a task"),0,(row:=row+1),5,1)
-
-        grid.attach(self.settings_updater('todolist_refresh_interval', 3, 'SpinButton',"(hours)"),0,(row:=row+1),5,1)
-        
-    
-        # grid.attach(self.settings_updater('invoice_hourly_rate', 33, 'SpinButton',""),0,(row:=row+1),5,1)
-        
-        grid.attach(self.settings_updater('hours_search_timeframe', 'auto', 'ComboBoxText',"\nDefault timetracking range for hours shown in main window and invoicing", options = list(hours_search_timeframes().keys())),0,(row:=row+1),5,1)
-        
-        grid.attach(self.settings_updater('prompts', None, 'TextView',""),0,(row:=row+1),5,1)
-
-        grid.attach(self.settings_updater('display_todolist_as_top_level_list', 'auto', 'ComboBoxText',"", options = ['auto','always','never']),0,(row:=row+1),5,1)
- 
-        grid.attach(self.settings_updater('max_top_level_menu_items', 18, 'SpinButton',""),0,(row:=row+1),5,1)
-
-
-
-
-
 
 
         # Task Commands notebook page  

nowfocus/task_window.py

@@ -141,7 +141,7 @@ class TaskWindow(Gtk.Window):
         self.center_box.pack_start(self.scrolled_window, True, True, 0)
         self.scrolled_window.set_size_request(-1, 350) 
 
-        self.scrolled_window.connect('scroll-event', self.on_scroll) # This doesn't catch scrollbar moves
+        # self.scrolled_window.connect('scroll-event', self.on_scroll) # This doesn't catch scrollbar moves
         self.scrolled_window.connect('edge-reached', self.on_scroll) # This is a little late and may not fire if the list is short?
 
         self.tasks_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=7)
@@ -153,6 +153,7 @@ class TaskWindow(Gtk.Window):
         self.total_duration_label.set_margin_end(12)
         self.total_duration_label.get_style_context().add_class('subtle')
         self.total_duration_label.set_halign(Gtk.Align.END)
+        # self.total_duration_label.connect("button-press-event",self.timesheet_to_clipboard) // doesn't work
         self.task_entry_overlay.add_overlay(self.total_duration_label)
 
         # Cool but captures the up/down selection  
@@ -408,8 +409,10 @@ class TaskWindow(Gtk.Window):
 
             self.l_sidebar.add(choose_from_lists(self.select_list_callback, 'None', None, False))
 
-            self.SessionEditDialog = SessionEditDialog # passed to show_sessions
-            show_sessions(None, self, self.sessions_box, None, 'start_time', '30',None, 30)
+            self.SessionEditDialog = SessionEditDialog # passed to show_sessions via self
+            sidebar_sessions = get_sessions(use_sessions_timeframe_setting=False)
+
+            show_sessions(None, self, self.sessions_box, None, passed_sessions=sidebar_sessions, truncate_labels_to_chars=30)
 
             self.l_sidebar.show_all()
             self.r_sidebar.show_all()
@@ -435,11 +438,12 @@ class TaskWindow(Gtk.Window):
 
 
     def task_search(self,widget = None):
-
+        timeit()
         self.tasks_box.foreach(lambda child: child.destroy()) 
         self.shown_tasks.clear()
 
         self.search_term = self.taskEntry.get_text()
+        # print('taskwindow search start: ', self.search_term)
 
         if self.search_term in self.search_cache:
             tasks = self.search_cache[self.search_term]
@@ -465,11 +469,17 @@ class TaskWindow(Gtk.Window):
             self.tasks_box.show_all()
 
         self.total_duration_label.set_markup('<b>'+str(round(total_duration / 60 / 60,1))+'</b> hrs\n'+conf.user['hours_search_timeframe'] )
+        # print('taskwindow search done')
+        timeit()
 
 
     def add_task_to_window(self,t):
 
         try:
+            if not t['extended_label']:
+                utils.dbg("add_task_to_list no extended_label is missing.", t, s='taskwindow',l=1)
+                return False
+
             utils.dbg("add_task_to_list "+ str(t['extended_label']), "status",t['status'], s='taskwindow',l=3)
 
             self.shown_tasks[t['id']] = Gtk.MenuButton(popover=self.task_rclick_menu) 
@@ -479,7 +489,7 @@ class TaskWindow(Gtk.Window):
 
             label = Gtk.Label()
 
-            extended_label = GLib.markup_escape_text(t['extended_label'],)
+            extended_label = GLib.markup_escape_text(t['extended_label'])
 
             if len(extended_label) > 110:
                 extended_label = extended_label[:110]+"..." 
@@ -511,10 +521,12 @@ class TaskWindow(Gtk.Window):
             button.connect("activate", self.select_task, None, t['id']) 
             button.set_relief(Gtk.ReliefStyle.NONE)
             self.tasks_box.add(button)
+            return True
 
 
         except Exception as e:
             utils.dbg("Error adding task to list"+ str(t['extended_label']), t, e, l=0, s='taskwindow')
+            return False
 
 
     def select_task(self,widget,event=None,tid=None):

nowfocus/user_idle_time.py

@@ -17,7 +17,7 @@ class UserIdleTime():
         else:
             self.detect_platform()
 
-        print('UserIdleTime platform set to',self.platform)
+        # print('UserIdleTime platform set to',self.platform)
 
     def get (self) :
         ''' Returns int of seconds since user was active '''

nowfocus/utils.py

@@ -56,7 +56,11 @@ def dbg(*data, s="", l=2, e=None, notify=None):
         if system:
             system = "- "+system
 
-        print(json.dumps(data,indent=2), system+" "+levels[level])
+        try:
+            print(json.dumps(data,indent=2), system+" "+levels[level])
+        except:
+            print(data)
+
 
     # else:
     #     print("Not displaying dbg s:",system,'conf.debug_systems',conf.debug_systems)
@@ -64,6 +68,7 @@ def dbg(*data, s="", l=2, e=None, notify=None):
 
     if e and isinstance(e,Exception): 
         traceback.print_tb(e.__traceback__)
+        print(e)
 
 def error_notice(title, details = None, e = None):
     print('ERROR',title,details,e)
@@ -433,7 +438,8 @@ def reindex(t=None):
 
 
 def reindex_all():
-        
+    timeit()
+    # print('reindex start')
     db_query("DROP TABLE IF EXISTS taskindex",None,None,0)
     db_query("CREATE VIRTUAL TABLE taskindex USING fts5(id, extended_label, priority, status)")
     db_query("INSERT INTO taskindex(id, extended_label, priority, status) SELECT id, extended_label, priority, status FROM tasks WHERE tasks.status IS NOT '-1' ")
@@ -442,6 +448,9 @@ def reindex_all():
         db_query("UPDATE taskindex set priority = ? WHERE id = ?",(t['priority'],t['id']))
 
     db_query("REPLACE INTO system(field, value) VALUES(?,?)",('taskindex_update_time',now().strftime("%Y-%m-%d %H:%M:%S")))
+    # print('reindex done')
+    timeit()
+
     return True
 
 
@@ -652,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)
@@ -811,7 +820,7 @@ def get_sessions(conditions_sql = None, order_by = 'start_time', limit = 35, use
     return db_query(" SELECT * FROM sessions WHERE 1=1 "+conditions+" ORDER BY "+order_by+" DESC LIMIT ? ",(limit,)) 
 
 
-def show_sessions(widget = None, self = None, sessions_box = None, label_text = "Most Recent Sessions", order_by = 'start_time', limit = 35, passed_sessions = None, truncate = None ):
+def show_sessions(widget = None, self = None, sessions_box = None, label_text = "Most Recent Sessions", order_by = 'start_time', limit = 35, passed_sessions = None, truncate_labels_to_chars = None ):
 
     sessions_box.foreach(lambda child: child.destroy()) 
 
@@ -833,10 +842,10 @@ def show_sessions(widget = None, self = None, sessions_box = None, label_text =
 
     for ls in sessions:
         dbg('Add session to session_box',ls['extended_label'],s='settings')
-        if truncate:
+        if truncate_labels_to_chars:
             label = ls['extended_label'].split('>')[-1].strip()
-            if len(label) > truncate:
-                label = label[:truncate]+'…'
+            if len(label) > truncate_labels_to_chars:
+                label = label[:truncate_labels_to_chars]+'…'
             btn = Gtk.Button(label=label+' '+str(sec_to_time(ls['duration'])))
         else:
             btn = Gtk.Button(label=ls['extended_label']+' '+str(sec_to_time(ls['duration'])))
@@ -1034,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,))
 
@@ -1170,6 +1180,11 @@ def choose_from_lists(callback, selected_list_id = None, session = None, accepts
 
     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 != '' "
+
 
     lists = db_query("SELECT * FROM lists "+where+" ORDER BY todolist, extended_label ASC ", None, 'id')
 
@@ -1182,12 +1197,15 @@ def choose_from_lists(callback, selected_list_id = None, session = None, accepts
             button_group = Gtk.RadioButton(label=l['label'])
             item = button_group
         else:
-            item = Gtk.RadioButton(label=l['extended_label'], group=button_group)
+            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()
+
             try:
                 l['header'].set_markup("<b>"+conf.user['todolists'][todolist]["label"]+"</b>")
             except Exception as e:

{nowfocus-0.5.1.dist-info → nowfocus-0.5.3.dist-info}/METADATA

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

{nowfocus-0.5.1.dist-info → nowfocus-0.5.3.dist-info}/RECORD

@@ -1,5 +1,5 @@
 nowfocus/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nowfocus/__main__.py,sha256=pJhJsaKUFVbXTjZiQBxHZJ_aIcxkkVzm-FIhITtfc_Y,33014
+nowfocus/__main__.py,sha256=kIJy1gd2FIZkXNqLdUYhjU7OSBKLYarieSw7f9PQA4U,33097
 nowfocus/conf.py,sha256=KV0iouYSSpYUITLlG-lPvmk1sHFVQsykwqmvb9wyTdk,6693
 nowfocus/example-todo.txt,sha256=o-ZRNiTlSGFbTK9jpdDIi07qHBrpvP0JhBZSk0VlpQU,246
 nowfocus/install.py,sha256=tcds4l6b492HTC7DfapatafgeMmDWvBfy8nwi1CjFXk,3040
@@ -7,11 +7,11 @@ nowfocus/new_task_dialog.py,sha256=GG49tOAwXiUKAHeaKnCG8Q3SZlL5pJijRZEcSjMwQng,4
 nowfocus/session_edit_dialog.py,sha256=V2QWSdNaxsQHRcG28CJBQM2sa45m5RNcu_suQF26mkM,6912
 nowfocus/session_options.py,sha256=mOnyEM3-usKgVvBhESY0TNBcy4FTG-AHP6ETMgB1fQ4,5071
 nowfocus/sessions.csv,sha256=kYpr06yQg_J86NQ4AiYw4RnQchcw3ouPKVYa1lYDUNo,39
-nowfocus/settings.py,sha256=Ufabuqd90tTDlzXB68jsbDz7233CEMsjnmPzaTSEHLI,35150
+nowfocus/settings.py,sha256=CZoSpFacxAs99Nq-NXNDKiBqjPSLPwg8bL5hcsi2a6E,35151
 nowfocus/styles.css,sha256=PG1SrLkwSSay8M2VKeRcE0UdK54ndsEDFnRLRkmP-9M,510
-nowfocus/task_window.py,sha256=FgmjAIJqDJXAx2WkkAeTFSE3O0uednHSHh2j2v60Rdo,28478
-nowfocus/user_idle_time.py,sha256=kPZ_bhoBdVMIBJXn2602FUfS4r-u8FnTq5Ze9D5QfHE,2363
-nowfocus/utils.py,sha256=IyOKoFDRxXOugUJmfUmAatUxdlpTu1nMx88TtNOI1r0,50080
+nowfocus/task_window.py,sha256=Ypt3s8czczeoMTsAMbPW_zpFJlQq4uBU5x0ankPnZlg,29071
+nowfocus/user_idle_time.py,sha256=I44Ip-iGGzWAiHnM2_06jNqhCne9y1SbvcBI-nYBolU,2365
+nowfocus/utils.py,sha256=C2t3JPodSEfVdCHuroKpiH05Q5fV_vPfxyszN4cVoo0,50526
 nowfocus/version_migrator.py,sha256=q8T1C8-DLOwUQUM5IPcMjPbVbsLTO4VsqADlAAXd9gw,628
 nowfocus/connectors/activitywatch.py,sha256=QbkOmjIOiVwccWc2xhhePd0Abww5vEiVpCNjeqOyYGg,921
 nowfocus/connectors/caldav.py,sha256=PeM_9yJC8W17L8Y5AyS75o6GfzTrPoMYKIvetND8T78,5089
@@ -52,9 +52,9 @@ nowfocus/icon/settings.svg,sha256=fgkGJouPPtZLxZn2nr_5pEp9MdhRSRaW9mtdxhJHDuQ,39
 nowfocus/sound/bell-xylophone-g.mp3,sha256=1OBcRWvD87AGNcq1uZFR8HqG0nanJykImERfVDVxHD4,53891
 nowfocus/sound/dinner-bell.mp3,sha256=hjjO0xqA4uXpYw9KLwwlBnrVfRhVq1K5OXzwlMXhRn4,113620
 nowfocus/sound/xylophone-chord.mp3,sha256=gwgBSqhMt5PMzT5N03Z6TvDgipQZfnkEz_o81Rq5Z1U,131806
-nowfocus-0.5.1.dist-info/licenses/LICENSE,sha256=fSJzoHs1EOCwEd7FIyokFeGEma7NKmTVEdHkCr5OIV4,35127
-nowfocus-0.5.1.dist-info/METADATA,sha256=gtOx1Ra5RrMXl8xLq3gRW2zUHnefbR_1-WuVI4idMjk,6804
-nowfocus-0.5.1.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nowfocus-0.5.1.dist-info/entry_points.txt,sha256=RbYY19-irSoNVglNeNnL9D36cHft7aKsaEGEYoSH3pA,51
-nowfocus-0.5.1.dist-info/top_level.txt,sha256=3uLd9BwmfarZwqVUxkSJuVwJ8qHzjThte8rt_UYG7tE,9
-nowfocus-0.5.1.dist-info/RECORD,,
+nowfocus-0.5.3.dist-info/licenses/LICENSE,sha256=fSJzoHs1EOCwEd7FIyokFeGEma7NKmTVEdHkCr5OIV4,35127
+nowfocus-0.5.3.dist-info/METADATA,sha256=N_QAlr4Ecm61b-0CKwc2YMPYkmJcFG2s94NHpGvrhzQ,6804
+nowfocus-0.5.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nowfocus-0.5.3.dist-info/entry_points.txt,sha256=RbYY19-irSoNVglNeNnL9D36cHft7aKsaEGEYoSH3pA,51
+nowfocus-0.5.3.dist-info/top_level.txt,sha256=3uLd9BwmfarZwqVUxkSJuVwJ8qHzjThte8rt_UYG7tE,9
+nowfocus-0.5.3.dist-info/RECORD,,