nowfocus 0.2.12__py3-none-any.whl → 0.2.13__py3-none-any.whl

nowfocus/__main__.py

@@ -442,8 +442,8 @@ class Application(Gtk.Application):
     def mark_done(self, w=None, task = None):
         ''' second (task) argument is required and must be a task object '''
         
-        print("Mark Task done")
-        print(task)
+        print("Mark Task done",task['label'])
+        # print(task)
 
         todolist_conf = conf.user['todolists'][task['todolist']]
 
@@ -510,8 +510,8 @@ class Application(Gtk.Application):
                     # print("add ",utils.extended_label(task)," to recent tasks")
                     i = Gtk.MenuItem.new_with_label(utils.extended_label(task))
                     i.connect('activate',self.start_task,task)
-                    list_menus['recent'].prepend(i)
                     try:
+                        list_menus['recent'].prepend(i)
                         list_menus['recent'].get_children()[11].destroy()
                     except Exception as e:
                         dbg("Exception trying to rotate recent tasks. probably are less than 11",l=2,s="recent")

nowfocus/connectors/txt.py

@@ -8,16 +8,17 @@ def add_new_task(user_conf,list,task_label):
 
 
     with open(file_uri, 'r') as file:
-        # read a list of lines into data
         data = file.readlines()
 
-        # New Version
+        if list['id'] == user_conf['id']:
+            # Top level list, append to bottom 
+            line_no = len(data) + 1
+        else:
+            line_no = get_line_no(list,data) + 1
 
-        line_no = get_line_no(list,data) + 1
         new_line = list['data']['indent']+task_label+"\n"
 
         # # Old version without recorded indent
-
         # if list['id'] == user_conf['id']:
         #     # Top level insert
         #     new_line = task_label+"\n"
@@ -72,17 +73,15 @@ def get_line_no(i,lines):
     else:
 
         line_no = 0 #TODO: Improve, (better foreach with key)
-        in_list = False
         
         for line in lines:
 
-            # TODO: Find the list 
+            # TODO: Find the list
             if line == i['data']['original_line']:
                 return line_no
 
-            line_no = line_no + 1
-
-    throw("Line not found error Ha!")
+            
+    utils.dbg("Line not found error",i,lines,s='txt',l=0)
 
 def task_id(task):
     ''' The task parameter must have at least "label", "todolist" and "parent_id" '''
@@ -128,18 +127,18 @@ def get_todos(user_conf):
     tasks = {}
     lists = {}
     lists[user_conf['id']] = {
-                    'id':user_conf['id'],
-                    'label':user_conf['label'],
-                    'parent_id':'',
-                    'parent_label':'',
-                    'todolist':user_conf['id'],
-                    'data':{
-                        'line_no':0,
-                        'original_line':'',
-                        'accepts_tasks':True,
-                        'indent':'',
-                    }
-                }
+        'id':user_conf['id'],
+        'label':user_conf['label'],
+        'parent_id':'',
+        'parent_label':'',
+        'todolist':user_conf['id'],
+        'data':{
+            'line_no':0,
+            'original_line':'',
+            'accepts_tasks':True,
+            'indent':'',
+        }
+    }
 
     current_list = []
     current_list_label = []
@@ -205,6 +204,13 @@ def get_todos(user_conf):
 
                     
             utils.dbg(line.rstrip(),s='txt',l=3)
+
+            # Get prioritized tasks (starting with a number)
+            if label.split()[0].isnumeric():
+                priority = float(label.split()[0])
+                label = label.removeprefix(label.split()[0]).strip()
+            else:
+                priority = '0'
             
             task_id = file_uri+":"+"/".join(current_list_label)+":"+label
 
@@ -222,6 +228,7 @@ def get_todos(user_conf):
                     'parent_label':str(parent_label),
                     'todolist':user_conf['id'],
                     'status': status,
+                    'priority': priority,
                     'data':{
                         'line_no':line_no,
                         'original_line':line,
@@ -229,11 +236,7 @@ def get_todos(user_conf):
                     }
                 }
 
-            # Get prioritized tasks (starting with a number)
-            # if label[0].isdigit()
-            if label.split()[0].isnumeric():
-                tasks[task_id]['priority'] = float(label.split()[0])
-                tasks[task_id]['label'] = label.removeprefix(label.split()[0]).strip()
+
 
             prev_indent = indent
             prev_label = label

nowfocus/task_window.py

@@ -292,13 +292,13 @@ class TaskWindow(Gtk.Window):
             pause_button.connect("clicked", self.recreate_header)
 
             pause_button.connect("clicked", self.refresh_search_cache) 
-            pause_button.set_property("tooltip-text", "Pause Task (Ctrl + P)")
+            pause_button.set_property("tooltip-text", "Pause Task (Control S)")
             pause_button.set_relief(Gtk.ReliefStyle.NONE)
             self.header.add(pause_button)
 
             done_button = Gtk.Button()
             done_button.set_image(Gtk.Image.new_from_file(os.path.abspath('icon/mark-done.png')))
-            done_button.set_property("tooltip-text", "Mark Task Done (Ctrl + D)")
+            done_button.set_property("tooltip-text", "Mark Task Done (Control D)")
             done_button.connect("clicked", self.app.stop_task,'mark_done')
             done_button.connect("clicked", self.recreate_header)
             done_button.connect("clicked", self.refresh_search_cache) # doesn't work, probably because it happens before stop_task 
@@ -310,14 +310,17 @@ class TaskWindow(Gtk.Window):
             cancel_button.set_image(Gtk.Image.new_from_file(os.path.abspath('icon/cancel.png'))) 
             cancel_button.connect("clicked", self.app.stop_task,"cancel")
             cancel_button.connect("clicked", self.recreate_header)
-            cancel_button.set_property("tooltip-text", "Discard timer (Ctrl + X)")
+            cancel_button.set_property("tooltip-text", "Discard timer (Control Q)")
             cancel_button.set_relief(Gtk.ReliefStyle.NONE)
             self.header.add(cancel_button)
 
-            key, mod = Gtk.accelerator_parse('<Control>p')
+            key, mod = Gtk.accelerator_parse('<Control>p') # for backward compatibility
+            pause_button.add_accelerator("clicked", self.accel_group, key, mod, Gtk.AccelFlags.VISIBLE)
+            
+            key, mod = Gtk.accelerator_parse('<Control>S')
             pause_button.add_accelerator("clicked", self.accel_group, key, mod, Gtk.AccelFlags.VISIBLE)
 
-            key, mod = Gtk.accelerator_parse('<Control>x')
+            key, mod = Gtk.accelerator_parse('<Control>q')
             cancel_button.add_accelerator("clicked", self.accel_group, key, mod, Gtk.AccelFlags.VISIBLE)
 
             key, mod = Gtk.accelerator_parse('<Control>d')
@@ -415,6 +418,10 @@ class TaskWindow(Gtk.Window):
 
             # button_context = self.shown_tasks[t['id']].get_style_context().add_class("large")
             extended_label = GLib.markup_escape_text(t['extended_label'],)
+
+            # Truncate excessively long task labels 
+            if len(extended_label) > 110:
+                extended_label = extended_label[:110]+"..." 
             
             if len(search_str) > 1:
                 
@@ -612,7 +619,6 @@ class TaskWindow(Gtk.Window):
         # utils.dbg("key_press",key,s="taskwindow",l=1)
         # utils.dbg("key_press event.state",event.state,s="taskwindow",l=1)
         # utils.dbg("key_press_event",event,s="taskwindow",l=1)
-        # utils.dbg("ModifierType is CONTROL_MASK",Gdk.ModifierType.CONTROL_MASK,s="taskwindow",l=3)
         
         if (event.state & Gdk.ModifierType.CONTROL_MASK) or key == 'Control_L':
             self.modifyer_keys['control'] = True        

nowfocus/utils.py

@@ -1185,10 +1185,13 @@ def add_todos_to_menu(target_menu = None, menu_tasks = None, list_menus = None,
                 list_menus[l['parent_id']].append(list_menu_items[list_id])
 
 
-
     for id, t in tasks.items():
         if t['status'] == 1:
 
+            # Truncate excessively long task labels 
+            if len(t['label']) > 60:
+                t['label'] = t['label'][:60]+"..." 
+
             menu_tasks[t['id']] = Gtk.MenuItem.new_with_label(str(t['label']))
             menu_tasks[t['id']].connect("activate", activate_callback, t)
 

{nowfocus-0.2.12.dist-info → nowfocus-0.2.13.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nowfocus
-Version: 0.2.12
+Version: 0.2.13
 Summary: nowfocus: the open source task-tracking self-control panel.
 Author: GitFr33
 Project-URL: Homepage, https://gitlab.com/GitFr33/nowfocus
@@ -47,43 +47,50 @@ Dynamic: license-file
 
 <div align="center"><img src="https://gitlab.com/GitFr33/nowfocus/-/raw/main/nowfocus.svg" width="60"  align="center">  
 
-# *nowfocus* <br> Open-source task timer for linux  
+# *nowfocus* <br> Open-source task timer for Linux  
 
 **Avoid multifailing. Master your to-do lists. Track your time.**
 
 </div>
 
-nowfocus is a clean, keyboard-driven project time tracker built with python + GTK that flexibly connects multiple to-do lists with multiple time trackers and displays your current task and time spent in the status bar. 
+nowfocus is a clean, keyboard-driven time management dashboard that flexibly connects multiple to-do lists with multiple time trackers and displays your current task and time spent in the status bar. 
 
 ## Features
-- Unlimited flexible combinations of to-do lists and time tracking systems  
-- Infinitely nestable lists  
+
+- Unlimited, flexible combinations of to-do lists and time tracking apps  
 - Inactivity detection that automatically pauses time tracking 
-- Pomodoro timer  
 - Task prioritization   
+- Infinitely nestable lists  
+- Pomodoro timer  
 - Time targets: set a minimum or maximum time for any task or list of tasks and get reminded to follow though  
 - Randomness interrupt bell (optional) to keep you on track with tracking your time
 - Keyboard-driven interface 
 - Offline to-do list cache 
-- CLI
+- CLI interface
 - Run a command (or launch an application) when a task is started
+- Not built with Electron ♥
+- Follows system dark-mode
+- Lightening fast task search
 
-
-<img src="https://gitlab.com/GitFr33/nowfocus/-/raw/main/docs/Screenshot-25-09-23-11-42-56.webp" width="500">  
-<img src="https://gitlab.com/GitFr33/nowfocus/-/raw/main/docs/Screenshot-25-09-23-11-46-14.webp" width="400">  
-<img src="https://gitlab.com/GitFr33/nowfocus/-/raw/main/docs/Screenshot-25-09-23-11-53-22.webp" width="400">  
+<table><tr><td>
+<a href="https://gitlab.com/GitFr33/nowfocus/-/raw/main/docs/darkmode.webp"><img src="https://gitlab.com/GitFr33/nowfocus/-/raw/main/docs/darkmode.webp" height="200"></a></td><td>
+<a href="https://gitlab.com/GitFr33/nowfocus/-/raw/main/docs/Screenshot-25-09-23-11-42-56.webp"><img src="https://gitlab.com/GitFr33/nowfocus/-/raw/main/docs/Screenshot-25-09-23-11-42-56.webp" height="200"></a></td><td>
+<a href="https://gitlab.com/GitFr33/nowfocus/-/raw/main/docs/Screenshot-25-09-23-11-46-14.webp"><img src="https://gitlab.com/GitFr33/nowfocus/-/raw/main/docs/Screenshot-25-09-23-11-46-14.webp" height="200"></a></td><td>
+<a href="https://gitlab.com/GitFr33/nowfocus/-/raw/main/docs/Screenshot-25-09-23-11-53-22.webp"><img src="https://gitlab.com/GitFr33/nowfocus/-/raw/main/docs/Screenshot-25-09-23-11-53-22.webp" height="200"></a></td></tr></table>
 
 <br>
 
 ### Currently Supported To-do List Backends
 
-- Simple text file with indentation based sub-lists
-- Any to-do list that supports [CalDav todos](https://en.wikipedia.org/wiki/CalDAV) 
-- [todotxt format](http://todotxt.org/)
+- [Trello](https://www.trello.com)
 - [TaskWarrior](https://taskwarrior.org/)
+- [todo.txt format](http://todotxt.org/)
 - [Vikunja](https://www.vikunja.io)
 - [Photosynthesis Timetracker](https://github.com/Photosynthesis/Timetracker/)  
-- [Trello](https://www.trello.com)
+- Simple text file with indentation based sub-lists
+- Any to-do list that supports [CalDav todos](https://en.wikipedia.org/wiki/CalDAV) 
+
+
 
 ### Currently Supported Time Tracker Backends 
 
@@ -96,35 +103,43 @@ nowfocus is a clean, keyboard-driven project time tracker built with python + GT
 ## Installation
 
 1. Run the following in terminal to install and setup:
-```
-# Install dependencies
-sudo apt install pipx gir1.2-appindicator3-0.1 meson libdbus-glib-1-dev patchelf libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev
+    ```
+    # Install dependencies
+    sudo apt install pipx gir1.2-appindicator3-0.1 meson libdbus-glib-1-dev patchelf libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev
+
+    # note gir1.2-ayatanaappindicator3-0.1 can be substituted for gir1.2-appindicator3-0.1
 
-# note gir1.2-ayatanaappindicator3-0.1 can be substituted for gir1.2-appindicator3-0.1
+    # Set up pipx   
+    pipx ensurepath
 
-# Set up pipx   
-pipx ensurepath
+    # At this point you may need to source your .bashrc (or open a new terminal)
 
-# At this point you may need to restart your terminal window
+    # Install nowfocus
+    pipx install nowfocus
 
-# Install nowfocus
-pipx install nowfocus
+    # Enter application directory
+    cd ~/.local/share/pipx/venvs/nowfocus/lib/python3.12/site-packages/nowfocus/desktop-extras
 
-# Enter application directory
-cd ~/.local/share/pipx/venvs/nowfocus/lib/python3.12/site-packages/nowfocus/desktop-extras
+    # Copy desktop file and icon to /usr/share 
+    sudo cp nowfocus.desktop /usr/share/applications/nowfocus.desktop
+    sudo cp nowfocus.svg /usr/share/icons/hicolor/scalable/apps/nowfocus.svg
 
-# Copy .desktop and icon to /usr/share 
-sudo cp nowfocus.desktop /usr/share/applications/nowfocus.desktop
-sudo cp nowfocus.svg /usr/share/icons/hicolor/scalable/apps/nowfocus.svg
+    # and now Focus!
+    nowfocus
 
-# and now Focus!
-nowfocus
+    ```
 
-```
+2. Set up a keybinding (on Ubuntu or Linux Mint), open **Settings > Keyboard > Keyboard Shortcuts > Custom Shortcuts**, set the keystroke to Ctrl + Space (or the combination of your choice) set the **command** to:
+    ```
+    bash -c "echo 'open_task_window' > /tmp/nowfocus-pipe"
+    ```
 
-2. Set up a keybinding (on Ubuntu or Linux Mint), open **Settings > Keyboard > Keyboard Shortcuts > Custom Shortcuts**, set the **command** to `nowfocus`, and pick whatever key combo you'd like.
 
-3. Add the following command to your startup applications: `nowfocus --force` 
+
+3. Add the following command to your startup applications: 
+    ```
+    nowfocus --force
+    ``` 
 
 
 
@@ -142,9 +157,9 @@ Open nowfocus **Settings** from the indicator menu or tasks window and connect y
 - `Shift Enter` or `Shift Click` Transfer current session time to selected task (or top task if none selected)
 - `Control Enter` or `Control Click` show opetions menu for selected (or top) task
 - `Alt Enter` or `Alt Click` Open todolist for selected (or top) task
-- `Ctrl + P` **Pause** current task
-- `Ctrl + D` Pause current task and mark it **Done**
-- `Ctrl + X` Cancel current task
+- `Conrol + S` Pause and **save** current session
+- `Conrol + D` Pause current session and mark task **Done**
+- `Conrol + Q` **Quit** and discard current session
 - `Ctrl + N` **New** task
 - `Ctrl + R` **Refresh** todolists
 - `Ctrl + L` or `Ctrl + F` **Focus** the task search
@@ -168,3 +183,5 @@ Open nowfocus **Settings** from the indicator menu or tasks window and connect y
 - Change to `YOUR_INSTALL_PATH` directory with `cd YOUR_INSTALL_PATH/nowfocus`  
 - build python module with `python3 -m build` (this should be done in a venv and will require some dependecies...)  
 - pipx install -e --force YOUR_INSTALL_PATH/monotask/  
+
+<!--built with python + GTK -->

{nowfocus-0.2.12.dist-info → nowfocus-0.2.13.dist-info}/RECORD

@@ -1,5 +1,5 @@
 nowfocus/__init__.py,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-nowfocus/__main__.py,sha256=LMqVVjXaZD31F84U6Ie7B0lYZaz54z2afRFanoBIphY,32504
+nowfocus/__main__.py,sha256=AHKig3rl3KnRK4chw4WcZxFTh7vu8CDXxBbl-ugDlJE,32524
 nowfocus/conf.py,sha256=MZx8gPREKsrzOsTdf_LAaFB8ysMF-jMC5YQZpH6AU3E,6954
 nowfocus/example-todo.txt,sha256=HRaNcPB1k8cksTtJS1GPqMjOdOY3gAUTWiSL0_ip0q8,265
 nowfocus/new_task_dialog.py,sha256=3dEkQ4Ef7Gky4BGTx59U0qNfJCdMUrGrzx8HNTGbov8,4337
@@ -8,8 +8,8 @@ nowfocus/session_options.py,sha256=QVwJA53U7qZsbLe-OFr6UuFeaquco_yps_CRXsQ2_q4,5
 nowfocus/sessions.csv,sha256=kYpr06yQg_J86NQ4AiYw4RnQchcw3ouPKVYa1lYDUNo,39
 nowfocus/settings.py,sha256=c6Z5FSVvSEx9fm8mQkdRo1TLfxFJEJdCMiqGyElv4bs,36873
 nowfocus/styles.css,sha256=m_7YXkDD7wljw5sFrv-CEJVImRpe92ER6kMa5rCICVo,489
-nowfocus/task_window.py,sha256=jVyjruCE2uhxumOccmKCjOG9PqGvoDnch_Ctbbf6-no,26081
-nowfocus/utils.py,sha256=z4eQPKoiRunLnJyorSUCzNqbetvAjeQIZd3fHJmA3ko,46953
+nowfocus/task_window.py,sha256=aCPbiC2qXXSFrM93JWsiEVHNuIPEvldFWt98DPaD1vI,26345
+nowfocus/utils.py,sha256=eTNNO27W3mWzNntIFqJ7NlCRPPd3Ud33MxiNPfbNBH8,47095
 nowfocus/connectors/activitywatch.py,sha256=QbkOmjIOiVwccWc2xhhePd0Abww5vEiVpCNjeqOyYGg,921
 nowfocus/connectors/caldav.py,sha256=PeM_9yJC8W17L8Y5AyS75o6GfzTrPoMYKIvetND8T78,5089
 nowfocus/connectors/csv.py,sha256=FwMpHM5lPIT90HKBCQUncpaW7zqFjlHjMwKR0-XWg-4,821
@@ -19,7 +19,7 @@ nowfocus/connectors/timewarrior.py,sha256=0Hra0GVPYdRqGtG_TbH3gzfUl192hH1DO2_WrD
 nowfocus/connectors/todo_template.py,sha256=R37fA2LXo8_LpWIgqozytI5RqIUjGggFHup25xTykII,1572
 nowfocus/connectors/todotxt.py,sha256=AKkHe_kv7iyk9rbXL1VwCN-ZyCluGlWP4wBcLn_Wnz4,3669
 nowfocus/connectors/trello.py,sha256=VqwnvHGXXcljmdf6kRZcE6sfeBQYhped_KVBEBOzWXM,6072
-nowfocus/connectors/txt.py,sha256=z_UAoJW-pZTRflgXeq5w9BAA0V8IMCGiRfYiOfLc7dQ,7847
+nowfocus/connectors/txt.py,sha256=ybYRagybuI3AjaeJO0QFjTlGntriFqJ3aq2aN2sDOGs,7777
 nowfocus/connectors/vikunja.py,sha256=jOEQGGMu9tJJXlcJwtbsqLkCTqbsSlnja-QoyBrJ9eM,10856
 nowfocus/desktop-extras/nowfocus.desktop,sha256=0kWsx0ZfvPbubGG1uuFSHxxYUw2GV9Ly_rtlboM1mak,294
 nowfocus/desktop-extras/nowfocus.png,sha256=P5rn6-0EAJa2WXf4SJoaNtLRUfiV3LdsOroPKsR6GfA,15148
@@ -49,9 +49,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.2.12.dist-info/licenses/LICENSE,sha256=fSJzoHs1EOCwEd7FIyokFeGEma7NKmTVEdHkCr5OIV4,35127
-nowfocus-0.2.12.dist-info/METADATA,sha256=UKr9IoBZagnBMTFo2McdL67DIUgPBWQz1OH2XmlZtlc,6139
-nowfocus-0.2.12.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nowfocus-0.2.12.dist-info/entry_points.txt,sha256=RbYY19-irSoNVglNeNnL9D36cHft7aKsaEGEYoSH3pA,51
-nowfocus-0.2.12.dist-info/top_level.txt,sha256=3uLd9BwmfarZwqVUxkSJuVwJ8qHzjThte8rt_UYG7tE,9
-nowfocus-0.2.12.dist-info/RECORD,,
+nowfocus-0.2.13.dist-info/licenses/LICENSE,sha256=fSJzoHs1EOCwEd7FIyokFeGEma7NKmTVEdHkCr5OIV4,35127
+nowfocus-0.2.13.dist-info/METADATA,sha256=Xg2xQ1ivQml4HdpkgBbOqzoRisB_1nmzkzfLmn2jiys,7023
+nowfocus-0.2.13.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nowfocus-0.2.13.dist-info/entry_points.txt,sha256=RbYY19-irSoNVglNeNnL9D36cHft7aKsaEGEYoSH3pA,51
+nowfocus-0.2.13.dist-info/top_level.txt,sha256=3uLd9BwmfarZwqVUxkSJuVwJ8qHzjThte8rt_UYG7tE,9
+nowfocus-0.2.13.dist-info/RECORD,,