nowfocus 0.5.6__py3-none-any.whl → 0.5.9__py3-none-any.whl

nowfocus/settings.py

@@ -94,11 +94,13 @@ class SettingsWindow(Gtk.Window):
 
 
 
-    def __init__(self, parent=None, **kwargs):
+    def __init__(self, parent=None, page_number=0, **kwargs):
         self.app = parent #NOTE: This doesn't look like it will work when called from task_window...
         Gtk.Window.__init__(self, title="Settings")
-        self.set_border_width(15)
+        self.set_border_width(0)
         self.set_position(position=1) 
+        self.set_default_size(-1,800)
+
         self.connect("destroy", self.on_close)
 
         self.notebook = Gtk.Notebook()
@@ -106,15 +108,17 @@ class SettingsWindow(Gtk.Window):
 
 
 
-
-
-        # Settings
+        # Settings page
         row = 0
         grid = Gtk.Grid()
         grid.set_row_spacing(10)
         grid.set_column_spacing(10)
-        self.notebook.append_page(grid,Gtk.Label('Settings'))
+        grid.set_border_width(15)
+        settings_page = Gtk.Box()
+        settings_scroller = self.scroll_box(settings_page)
+        settings_scroller.add(grid)
 
+        self.notebook.append_page(settings_page,Gtk.Label('Settings'))
 
         grid.attach(Gtk.Box(border_width=10),0,(row:=row+1),5,1) # Spacer
 
@@ -129,9 +133,11 @@ class SettingsWindow(Gtk.Window):
 
         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('default_list_for_new_tasks', 'List that was last added to', 'ComboBoxText',"", options = ['List that was last added to','Most recently used list']),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)
@@ -143,13 +149,18 @@ class SettingsWindow(Gtk.Window):
 
 
 
+
+        connectors_page = Gtk.Box()
+        self.notebook.append_page(connectors_page,Gtk.Label('Todolists and Time Trackers'))
+        connectors_scroller = self.scroll_box(connectors_page)
+
+        # TODO: perhaps use a scroller for each connector category instead of one big one
         row = 0
         grid = Gtk.Grid()
+        connectors_scroller.add(grid)
         grid.set_row_spacing(10)
         grid.set_column_spacing(10)
-        grid.set_border_width(10)
-
-        self.notebook.append_page(grid,Gtk.Label('Todolists and Time Trackers'))
+        grid.set_border_width(15)
 
         sub_head = Gtk.Label()
         sub_head.set_markup("<b>Todo Lists</b>")
@@ -227,11 +238,13 @@ class SettingsWindow(Gtk.Window):
 
 
         # Task Commands notebook page  
-        self.task_commands_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
-        self.notebook.append_page(self.task_commands_box,Gtk.Label('Task Commands'))
+        self.task_commands_page = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
+        self.notebook.append_page(self.task_commands_page,Gtk.Label('Task Commands'))
+
+        self.task_commands_box = self.scroll_box(self.task_commands_page)
+        self.task_commands_box.set_border_width(15)
 
         self.boxes['task_commands_outer'] = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
-        # self.boxes['task_commands_outer'] = self.scroll_box()
         self.task_commands_box.add(self.boxes['task_commands_outer'])
 
         # Gets replaced when commands are loaded
@@ -248,19 +261,22 @@ class SettingsWindow(Gtk.Window):
 
 
 
+
+
+
         # Time Targets notebook page 
-        self.targets_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
-        self.notebook.append_page(self.targets_box, Gtk.Label('Time Targets'))
+        self.targets_page = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
 
-        self.boxes['lists_time_targets_outer'] = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
-        # self.targets_box.add(self.boxes['lists_time_targets_outer'])
+        self.notebook.append_page(self.targets_page, Gtk.Label('Time Targets'))
 
-        
-        # self.boxes['test'] = self.scroll_box(None ,300) 
-        # self.targets_box.add(self.boxes['test'])
+        self.targets_scroller = self.scroll_box(self.targets_page ,300)
 
-        # self.boxes['lists_time_targets_outer'] = self.scroll_box(None ,300) 
+        self.targets_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
+        self.targets_box.set_border_width(15)
+    
+        self.targets_scroller.add(self.targets_box)
 
+        self.boxes['lists_time_targets_outer'] = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
         
         self.targets_box.add(self.boxes['lists_time_targets_outer'])
 
@@ -268,13 +284,6 @@ class SettingsWindow(Gtk.Window):
         # Gets replaced when targets are loaded
         self.boxes['lists_time_targets_inner'] = Gtk.Box()
         self.boxes['lists_time_targets_outer'].add(self.boxes['lists_time_targets_inner'])
-
-        # separator = Gtk.Separator(orientation=Gtk.Orientation.HORIZONTAL)
-        # self.boxes['lists_time_targets_outer'].pack_start(separator, True, True, 0)   
-
-        # test_button = Gtk.Button(label="test")
-        # self.boxes['lists_time_targets_inner'].add(test_button)
-
         
         self.show_time_targets('lists')
 
@@ -286,6 +295,7 @@ class SettingsWindow(Gtk.Window):
 
         self.boxes['tasks_time_targets_outer'] = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
         self.targets_box.add(self.boxes['tasks_time_targets_outer'])
+
         # Gets replaced when targets are loaded
         self.boxes['tasks_time_targets_inner'] = Gtk.Box()
         self.boxes['tasks_time_targets_outer'].add(self.boxes['tasks_time_targets_inner'])
@@ -308,6 +318,7 @@ class SettingsWindow(Gtk.Window):
 
         # Sessions notebook page  
         self.sessions_page = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=5)
+        self.sessions_page.set_border_width(15)
 
         self.notebook.append_page(self.sessions_page,Gtk.Label('Sessions'))
         
@@ -336,8 +347,9 @@ class SettingsWindow(Gtk.Window):
 
         self.SessionEditDialog = SessionEditDialog # passed to show_sessions
 
-
+        print('set_current_page',page_number)
         self.show_all()
+        self.notebook.set_current_page(page_number)
 
         
 
@@ -434,7 +446,7 @@ class SettingsWindow(Gtk.Window):
                 checkbutton.set_label("Error: '"+str(id)+"' didn't match anything " )
             else:     
                 # print('Show time target',item_data)
-                checkbutton.set_label(item_data['label']+": "+str(data['type'])+ " "+str(data['value'])+" minutes per "+str(data['within_value'])+" "+str(data['within_unit']) )
+                checkbutton.set_label(item_data['label']+" \n"+str(data['type'])+ " "+str(data['value'])+" minutes per "+str(data['within_value'])+" "+str(data['within_unit']) )
             checkbutton.set_active(data['status'])
 
             # checkbutton.connect("toggled", print, checkbutton.get_active())
@@ -476,9 +488,9 @@ class SettingsWindow(Gtk.Window):
             
             task_data = db_get_item_by_id(id,"tasks")
             if not task_data:
-                checkbutton.set_label("Error: '"+str(id)+"' task missing "+str(command_data['command']))
+                checkbutton.set_label("Error: '"+str(id)+"' task missing \n"+str(command_data['command']))
             else:     
-                checkbutton.set_label(task_data['extended_label']+" "+str(command_data['command']) )
+                checkbutton.set_label(task_data['extended_label']+" \n"+str(command_data['command']) )
             checkbutton.set_active(command_data['status'])
             
             checkbutton.connect("toggled", update_user_setting, conf.user['task_commands'][id], 'status', checkbutton.get_active)
@@ -923,7 +935,7 @@ class EditAddConnectorDialog(Gtk.Dialog):
 
 
             if key in ['file']:
-                self.entries[key] = Gtk.FileChooserButton(title="Select Todo File")
+                self.entries[key] = Gtk.FileChooserButton(title="Select "+connector_category+" file")
                 self.entries[key].set_action(Gtk.FileChooserAction.OPEN)
                 
             else:

nowfocus/task_window.py

@@ -36,7 +36,7 @@ class TaskWindow(Gtk.Window):
                 # TaskWindow._instance.present()
                 # return None
             except Exception as e:
-                dbg("TaskWindow._instance exception",e,s='taskwindow')
+                dbg("TaskWindow._instance exception",e=e ,s='taskwindow')
 
         TaskWindow._instance = self
 
@@ -197,7 +197,7 @@ class TaskWindow(Gtk.Window):
                     self.buttons_box.add(openable_button)
 
                 except Exception as e:
-                    dbg("error adding todo connector open() to task window ",e, s='taskwindow')
+                    dbg("error adding todo connector open() to task window ",e=e , s='taskwindow')
 
         self.new_task_button = Gtk.Button(label="New Task")
         self.new_task_button.set_property("tooltip-text","Add a new task (Ctrl + N)")
@@ -521,7 +521,7 @@ class TaskWindow(Gtk.Window):
 
 
         except Exception as e:
-            utils.dbg("Error adding task to list"+ str(t['extended_label']), t, e, l=0, s='taskwindow')
+            utils.dbg("Error adding task to list"+ str(t['extended_label']), t, e=e, l=0, s='taskwindow')
             return False
 
 

nowfocus/upgrade.py

@@ -0,0 +1,106 @@
+import conf
+from utils import * 
+# from pkg_resources import parse_version
+
+
+def do_upgrades(app):
+    db_schema_version = get_system_db_value('db_schema_version')
+
+    if db_schema_version == '0.2':
+                
+        db_query("ALTER TABLE lists DROP COLUMN status")
+        db_query("ALTER TABLE tasks DROP COLUMN status")
+
+        db_query("ALTER TABLE lists ADD COLUMN status INTEGER DEFAULT 1")
+        db_query("ALTER TABLE tasks ADD COLUMN status INTEGER DEFAULT 1")
+
+        db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.3')")
+    
+        db_schema_version = '0.3'
+
+
+    if db_schema_version == '0.3':
+        db_query("ALTER TABLE sessions ADD COLUMN timetracker TEXT")
+        db_query("ALTER TABLE sessions ADD COLUMN notes TEXT")
+        db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.4')")
+        print('adding timetracker column to session table')
+
+        for todolist_id, todo in conf.user['todolists'].items():
+            db_query("UPDATE sessions SET timetracker = ? WHERE todolist = ?",(todo['timetracker'],todolist_id) )
+
+        db_schema_version = '0.4'
+
+    if db_schema_version == '0.4':
+        dbg('Schema Update from', db_schema_version, 'to 0.5',l=-1)
+
+        print('Adding priority column to session table')
+
+        db_query("ALTER TABLE sessions ADD COLUMN priority INTEGER DEFAULT 0")
+
+
+        db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.5')")
+
+        db_schema_version = '0.5'
+
+    if db_schema_version == '0.5':
+        dbg('Schema Update from', db_schema_version, 'to 0.5.6',l=-1)
+
+        from install import copy_desktop_integration_files
+        copy_desktop_integration_files()
+
+        db_schema_version = "0.5.6"
+        set_system_db_value("db_schema_version",db_schema_version)
+
+    if db_schema_version == '0.5.6':
+        dbg('Schema Update from', db_schema_version, 'to 0.5.9',l=-1)
+
+        for session in db_query("SELECT DISTINCT task_id, extended_label FROM sessions"):
+            t = db_get_item_by_id(session['task_id'],dgb_error_level_for_failure=3)
+            if t and t['priority'] > 0:
+                print("setting",session['extended_label']," session priority to ",t['priority'] )
+
+                db_query("UPDATE sessions SET priority = ? WHERE task_id = ?",(t['priority'],session['task_id']))
+
+        print("Total hours priority sessions",round(divide(db_query("SELECT SUM(duration) as total FROM sessions WHERE priority > 0")[0]['total'],3600),2))
+        
+        db_schema_version = "0.5.9"
+        set_system_db_value("db_schema_version",db_schema_version)
+    # if db_schema_version == 0.5:
+    #     db_query("ALTER TABLE tasks ADD COLUMN tags TEXT DEFAULT '{}'")
+    #     db_query("REPLACE INTO system(field, value) VALUES('db_schema_version', '0.5')")
+    #     db_schema_version = 0.6
+
+
+    dbg('db_schema_version updated to', db_schema_version,s='db')
+
+
+
+
+
+
+
+
+
+
+
+
+
+# update time_target format 
+# for id, tt in user['time_targets']['lists'].items():
+#     if 'within_value' not in tt:
+#         print("Updating time target to new format ",tt)
+#         tt['within_value'] = tt['num_days']
+#         tt['within_unit'] = 'days'
+#         print(tt)
+#     if 'status' not in tt:
+#         tt['status'] = True
+
+        
+# for id, tt in user['time_targets']['tasks'].items():
+#     if 'within_value' not in tt:
+#         print("Updating time target to new format ",tt)
+#         tt['within_value'] = tt['num_days']
+#         tt['within_unit'] = 'days'
+#         print(tt)
+#     if 'status' not in tt:
+#         tt['status'] = True