NowFocus 0.2.5__tar.gz → 0.2.7__tar.gz

{nowfocus-0.2.5/src/nowfocus.egg-info → nowfocus-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nowfocus
-Version: 0.2.5
+Version: 0.2.7
 Summary: nowfocus: the open source task-tracking self-control panel.
 Author: GitFr33
 Project-URL: Homepage, https://gitlab.com/GitFr33/nowfocus
@@ -92,40 +92,37 @@ nowfocus is a clean, keyboard-driven project time tracker build with python + GT
 - [TimeWarrior](https://timewarrior.net)
 
 
-## Installation (using pipx) 
+## Installation
 
-Run the following in terminal to install and setup:
+1. Run the following in terminal to install and setup:
 ```
 # Install dependencies
-sudo apt install pip pipx install gir1.2-appindicator3-0.1 meson libdbus-glib-1-dev patchelf python3.12-venv libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev
+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
 
 # Set up pipx
 pipx ensurepath
 
+# At this point you may need to restart your terminal window
+
 # Install nowfocus
 pipx install nowfocus
 
 # Enter application directory
-cd ~/.local/pipx/nowfocus
-
-# Copy .desktop and icon to .local/share 
-cp src/desktop-extras/nowfocus.desktop ~/.local/share/applications/nowfocus.desktop
-cp src/desktop-extras/nowfocus.svg ~/.local/share/icons/nowfocus.png
-cp src/desktop-extras/nowfocus.svg ~/.local/share/icons/hicolor/scalable/apps/nowfocus.svg
-
-# Setup autostart
-cp src/desktop-extras/nowfocus.desktop ~/.config/autostart/nowfocus.desktop
+cd ~/.local/share/pipx/venvs/nowfocus/lib/python3.12/site-packages/nowfocus/desktop-extras
 
-# Set Super space as keybinding to raise task window 
-chmod +x src/desktop-extras/set_gsettings_keybinding.sh
-
-src/desktop-extras/set_gsettings_keybinding.sh "Open nowfocus" nowfocus "<Super>space"
+# 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
 
 ```
 
+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` 
+
 
 
 ## Usage
@@ -138,7 +135,10 @@ Open nowfocus **Settings** from the indicator menu or tasks window and connect y
 
 - `F11` Toggle fullscreen
 - `Esc` Close task window
-- `Enter` Start top task (or make a new task with current search phrase if no results)
+- `Enter` Start top/selected task (or make a new task with current search phrase if no results)
+- `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

{nowfocus-0.2.5 → nowfocus-0.2.7}/README.md

@@ -46,40 +46,37 @@ nowfocus is a clean, keyboard-driven project time tracker build with python + GT
 - [TimeWarrior](https://timewarrior.net)
 
 
-## Installation (using pipx) 
+## Installation
 
-Run the following in terminal to install and setup:
+1. Run the following in terminal to install and setup:
 ```
 # Install dependencies
-sudo apt install pip pipx install gir1.2-appindicator3-0.1 meson libdbus-glib-1-dev patchelf python3.12-venv libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev
+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
 
 # Set up pipx
 pipx ensurepath
 
+# At this point you may need to restart your terminal window
+
 # Install nowfocus
 pipx install nowfocus
 
 # Enter application directory
-cd ~/.local/pipx/nowfocus
-
-# Copy .desktop and icon to .local/share 
-cp src/desktop-extras/nowfocus.desktop ~/.local/share/applications/nowfocus.desktop
-cp src/desktop-extras/nowfocus.svg ~/.local/share/icons/nowfocus.png
-cp src/desktop-extras/nowfocus.svg ~/.local/share/icons/hicolor/scalable/apps/nowfocus.svg
-
-# Setup autostart
-cp src/desktop-extras/nowfocus.desktop ~/.config/autostart/nowfocus.desktop
+cd ~/.local/share/pipx/venvs/nowfocus/lib/python3.12/site-packages/nowfocus/desktop-extras
 
-# Set Super space as keybinding to raise task window 
-chmod +x src/desktop-extras/set_gsettings_keybinding.sh
-
-src/desktop-extras/set_gsettings_keybinding.sh "Open nowfocus" nowfocus "<Super>space"
+# 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
 
 ```
 
+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` 
+
 
 
 ## Usage
@@ -92,7 +89,10 @@ Open nowfocus **Settings** from the indicator menu or tasks window and connect y
 
 - `F11` Toggle fullscreen
 - `Esc` Close task window
-- `Enter` Start top task (or make a new task with current search phrase if no results)
+- `Enter` Start top/selected task (or make a new task with current search phrase if no results)
+- `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

{nowfocus-0.2.5 → nowfocus-0.2.7}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "nowfocus"
-version = "0.2.5"
+version = "0.2.7"
 authors = [
   { name="GitFr33" },
 ]

{nowfocus-0.2.5 → nowfocus-0.2.7}/src/nowfocus/__main__.py

@@ -156,8 +156,8 @@ class Application(Gtk.Application):
 
     def quit(self, widget_or_signal_source=None, condition=None):
         print("Adios ", conf.app_name)
-        print("widget_or_signal_source ", widget_or_signal_source)
-        print("condition ", condition)
+        # print("widget_or_signal_source ", widget_or_signal_source)
+        # print("condition ", condition)
         
         if self.is_running:
             print('Caching active session', self.session['label'])
@@ -484,7 +484,7 @@ class Application(Gtk.Application):
                     self.mark_done(None,task)
 
                 else: 
-                    print("add ",utils.extended_label(task)," to recent tasks")
+                    # 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)
@@ -511,8 +511,9 @@ class Application(Gtk.Application):
 
             self.is_running = False
             # print(utils.get_times(task))
-        
-            notify.Notification.new(action.capitalize()+" "+session['label']+" "+sec_to_time(session['duration']),utils.pretty_dict(utils.get_times(task)), None).show()
+            if action != 'cancel':
+                notify.Notification.new("Focused on "+session['label']+" for "+sec_to_time(session['duration']),utils.pretty_dict(utils.get_times(task)), None).show()
+                # notify.Notification.new(action.capitalize()+" "+session['label']+" "+sec_to_time(session['duration']),utils.pretty_dict(utils.get_times(task)), None).show()
         
             # Start randomness timer
             self.session = {

{nowfocus-0.2.5 → nowfocus-0.2.7}/src/nowfocus/connectors/trello.py

@@ -57,8 +57,8 @@ def get_todos(user_conf):
 
     for board in boards:
         
-        print("\n\n--- Board --- \n")
-        pretty_print(board)
+        # print("\n\n--- Board --- \n")
+        # pretty_print(board)
 
         if board['closed']:
             continue
@@ -80,8 +80,8 @@ def get_todos(user_conf):
 
         for bucket in board['lists']:
             
-            print("\n\n--- bucket --- \n")
-            pretty_print(bucket)
+            # print("\n\n--- bucket --- \n")
+            # pretty_print(bucket)
 
             if bucket['closed']:
                 continue
@@ -216,8 +216,8 @@ def mark_task_done(task):
         params=query
     )
 
-    print("response.text")
-    print(response.text)
+    # print("response.text")
+    # print(response.text)
 
     return response.text
 

{nowfocus-0.2.5 → nowfocus-0.2.7}/src/nowfocus/settings.py

@@ -105,8 +105,8 @@ class SettingsWindow(Gtk.Window):
 
     def scroll_box(self, parent_widget = None, height = 300):
 
-        print('parent_widget')
-        print(parent_widget)
+        # print('parent_widget')
+        # print(parent_widget)
 
         scrolled_window = Gtk.ScrolledWindow()
         scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
@@ -744,7 +744,7 @@ class EditAddTargetDialog(Gtk.Dialog):
 
         super().__init__(title="Set Time Target", transient_for=parent, flags=0)
 
-        self.set_default_size(600,400)
+        self.set_default_size(700,850)
         self.set_border_width(15)
         box = self.get_content_area()
         box.set_spacing(15)

{nowfocus-0.2.5 → nowfocus-0.2.7}/src/nowfocus/task_window.py

@@ -15,7 +15,7 @@ class TaskWindow(Gtk.Window):
         Gdk.Screen.get_default(), css_provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION
     )
     _instance = None
-
+    
     def __init__(self,app,passed_data=None):
 
         if TaskWindow._instance:
@@ -39,7 +39,12 @@ class TaskWindow(Gtk.Window):
 
         Gtk.Window.__init__(self, title=conf.app_name)
 
-        self.set_default_size(900,400)
+        self.set_default_size(900,900)
+        self.modifyer_keys = {
+            'control': False,
+            'shift': False,
+            'alt': False,
+        }
 
         self.search_cache_refresh_time = now().strftime("%Y-%m-%d %H:%M:%S")
         self.search_cache = {}
@@ -126,7 +131,7 @@ class TaskWindow(Gtk.Window):
         self.scrolled_window = Gtk.ScrolledWindow()
         self.scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
         box.pack_start(self.scrolled_window, True, True, 0)
-        self.scrolled_window.set_size_request(-1, 600)
+        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('edge-reached', self.on_scroll) # This is a little late
@@ -194,11 +199,8 @@ class TaskWindow(Gtk.Window):
                 except Exception as e:
                     dbg("error adding todo connector open() to task window ",e, s='taskwindow')
 
-
-            
-
         self.new_task_button = Gtk.Button(label="New Task")
-        self.new_task_button.set_property("tooltip-text","Add a new task to an existing list (Ctrl + N)")
+        self.new_task_button.set_property("tooltip-text","Add a new task (Ctrl + N)")
         self.new_task_button.connect("clicked",self.open_new_task_dialog)
         self.buttons_box.add(self.new_task_button)
 
@@ -210,7 +212,8 @@ class TaskWindow(Gtk.Window):
         key, mod = Gtk.accelerator_parse('<Control>r')
         self.refresh_button.add_accelerator("clicked", self.accel_group, key, mod, Gtk.AccelFlags.VISIBLE)        
 
-        self.connect("key-press-event", self.on_win_key_press_event)
+        self.connect("key-press-event", self.key_press)
+        self.connect('key-release-event', self.key_release)
         self.connect("window-state-event", self.on_window_state_event)
 
         self.taskEntry.connect("changed",self.task_search)
@@ -409,7 +412,6 @@ class TaskWindow(Gtk.Window):
 
 
 
-
     def add_task_to_list(self,t):
 
         try:
@@ -423,7 +425,6 @@ class TaskWindow(Gtk.Window):
 
             label = Gtk.Label()
 
-            # self.shown_tasks[t['id']].set_label(label)
             # button_context = self.shown_tasks[t['id']].get_style_context().add_class("large")
             extended_label = GLib.markup_escape_text(t['extended_label'],)
             
@@ -434,6 +435,7 @@ class TaskWindow(Gtk.Window):
 
                 extended_label = extended_label.replace(search_str,"<b>"+search_str+"</b>")
                 extended_label = extended_label.replace(search_str.capitalize(),"<b>"+search_str.capitalize()+"</b>") # Cheesy
+            
             if "duration" in t and t['duration']:
                 extended_label += " ("+sec_to_time(t['duration'])+")"
 
@@ -443,14 +445,12 @@ class TaskWindow(Gtk.Window):
             if t['priority']:
                 extended_label = str(t['priority']) +" "+ extended_label
 
-
             if not t['status']:
-                utils.dbg("add strikethrough to done task "+t['extended_label'],l=3,s="taskwindow")
+                # utils.dbg("add strikethrough to done task "+t['extended_label'],l=3,s="taskwindow")
                 # button_context.add_class("done")
                 label.set_markup('<s>'+extended_label+'</s>')
 
             elif t['priority'] > 0:
-                # button_context.add_class("bold")
                 label.set_name('priorityTask')
                 label.set_markup(extended_label)
             else:
@@ -471,83 +471,90 @@ class TaskWindow(Gtk.Window):
 
 
     def select_task(self,widget,event=None,tid=None):
+        print("select_task task id",tid)
         t = utils.db_get_item_by_id(tid)
-        print('event',event)
-        if event:  # Right-click (button 3)
+        # print('event',event)
+        print("select_task self.modifyer_keys", self.modifyer_keys)
 
-            if  event.button == 3:  # Right-click (button 3) context menu popover
-                
-                popover = self.task_rclick_menu
-                widget.set_popover(popover)
+        if self.modifyer_keys['control'] or event and event.button == 3:  # Right-click (button 3)  or control click context menu popover
+            
+            popover = self.task_rclick_menu
+            widget.set_popover(popover)
 
-                popover.foreach(lambda child: child.destroy()) 
+            popover.foreach(lambda child: child.destroy()) 
 
-                vbox = Gtk.Box(spacing=0, orientation=Gtk.Orientation.VERTICAL)
-                vbox.set_border_width(5)
-                
-                # Open todo
-                w = Gtk.Button(label="Open in "+conf.user['todolists'][t['todolist']]['label'])
-                w.set_halign(Gtk.Align.START)
-                w.set_relief(Gtk.ReliefStyle.NONE)
-                w.connect('clicked',utils.open_todo,t)
-                vbox.pack_start(w, True, True, 5)
-
-                # mark_done
-                w = Gtk.Button(label="Mark done")
-                w.set_halign(Gtk.Align.START)
-                w.set_relief(Gtk.ReliefStyle.NONE)
-                w.connect('clicked',self.app.mark_done,t)
-                vbox.pack_start(w, True, True, 5)
-
-                # Reassign session/randomness to be on this task, 
-                w = Gtk.Button(label="Reassign last "+ str(round((self.app.session['duration'] / 60),1))+" minutes to this task" )
-                w.set_halign(Gtk.Align.START)
-                w.set_relief(Gtk.ReliefStyle.NONE)
-                w.connect('clicked',self.app.start_task,t,True)
-                vbox.pack_start(w, True, True, 5)
-
-                # show/edit targets
-                ttt_data = utils.get_time_target_data(t) 
-                if ttt_data:
-                    w = Gtk.Button(label="Edit Target:"+str(ttt_data['type'])+ " "+str(round(ttt_data['value']))+" minutes per "+str(round(ttt_data['within_value']))+" "+str(ttt_data['within_unit'])+"  ("+str(round(utils.check_time_target(t)))+" minutes remaining)")
-                else:
-                    w = Gtk.Button(label="Set Time Target")
-                w.set_halign(Gtk.Align.START)
-                w.set_relief(Gtk.ReliefStyle.NONE)
-                w.connect('clicked', lambda button_widget: EditAddTargetDialog(self,'tasks', t['id']))
-                vbox.pack_start(w, True, True, 5)
-
-
-                # show/edit commands
-                if t['id'] in conf.user['task_commands']:
-                    command_data = conf.user['task_commands'][t['id']]
-                    if not command_data['status']:
-                        disabled = "(disabled)"
-                    else:
-                        disabled = ""
-
-                    w = Gtk.Button(label="Edit Command: '"+command_data['command']+"' "+disabled+"")
+            vbox = Gtk.Box(spacing=0, orientation=Gtk.Orientation.VERTICAL)
+            vbox.set_border_width(5)
+            
+            # Open todo
+            w = Gtk.Button(label="Open in "+conf.user['todolists'][t['todolist']]['label'])
+            w.set_halign(Gtk.Align.START)
+            w.set_relief(Gtk.ReliefStyle.NONE)
+            w.connect('clicked',utils.open_todo,t)
+            vbox.pack_start(w, True, True, 5)
+
+            # mark_done
+            w = Gtk.Button(label="Mark done")
+            w.set_halign(Gtk.Align.START)
+            w.set_relief(Gtk.ReliefStyle.NONE)
+            w.connect('clicked',self.app.mark_done,t)
+            vbox.pack_start(w, True, True, 5)
+
+            # Reassign session/randomness to be on this task, 
+            w = Gtk.Button(label="Reassign last "+ str(round((self.app.session['duration'] / 60),1))+" minutes to this task" )
+            w.set_halign(Gtk.Align.START)
+            w.set_relief(Gtk.ReliefStyle.NONE)
+            w.connect('clicked',self.app.start_task,t,True)
+            vbox.pack_start(w, True, True, 5)
+
+            # show/edit targets
+            ttt_data = utils.get_time_target_data(t) 
+            if ttt_data:
+                w = Gtk.Button(label="Edit Target:"+str(ttt_data['type'])+ " "+str(round(ttt_data['value']))+" minutes per "+str(round(ttt_data['within_value']))+" "+str(ttt_data['within_unit'])+"  ("+str(round(utils.check_time_target(t)))+" minutes remaining)")
+            else:
+                w = Gtk.Button(label="Set Time Target")
+            w.set_halign(Gtk.Align.START)
+            w.set_relief(Gtk.ReliefStyle.NONE)
+            w.connect('clicked', lambda button_widget: EditAddTargetDialog(self,'tasks', t['id']))
+            vbox.pack_start(w, True, True, 5)
+
+
+            # show/edit commands
+            if t['id'] in conf.user['task_commands']:
+                command_data = conf.user['task_commands'][t['id']]
+                if not command_data['status']:
+                    disabled = "(disabled)"
                 else:
-                    w = Gtk.Button(label="Add Task Command")
+                    disabled = ""
 
-                w.set_halign(Gtk.Align.START)
-                w.set_relief(Gtk.ReliefStyle.NONE)
-                w.connect('clicked', lambda button_widget: EditTaskCommandDialog(None, self, t['id']))
-                vbox.pack_start(w, True, True, 5)
+                w = Gtk.Button(label="Edit Command: '"+command_data['command']+"' "+disabled+"")
+            else:
+                w = Gtk.Button(label="Add Task Command")
 
+            w.set_halign(Gtk.Align.START)
+            w.set_relief(Gtk.ReliefStyle.NONE)
+            w.connect('clicked', lambda button_widget: EditTaskCommandDialog(None, self, t['id']))
+            vbox.pack_start(w, True, True, 5)
 
-                # get_times, Ugly 
-                # for key, val in utils.get_times(t).items():
-                #     vbox.pack_start(Gtk.Label(key+": "+val), True, True, 5)
 
-                popover.add(vbox)
-                popover.set_position(Gtk.PositionType.BOTTOM)
-                popover.show_all()
+            # get_times, Ugly 
+            # for key, val in utils.get_times(t).items():
+            #     vbox.pack_start(Gtk.Label(key+": "+val), True, True, 5)
 
-                return
+            popover.add(vbox)
+            popover.set_position(Gtk.PositionType.BOTTOM)
+            popover.show_all()
 
+            return
 
-        self.app.start_task(None,t) 
+        if self.modifyer_keys['shift']:
+            print('transfer session')
+            self.app.start_task(None,t,True) 
+        elif self.modifyer_keys['alt']:
+            print('open_todo')
+            utils.open_todo(None,t)
+        else:
+            self.app.start_task(None,t) 
 
         self.destroy()
 
@@ -596,29 +603,61 @@ class TaskWindow(Gtk.Window):
         utils.save_user_settings()
 
 
-    def on_win_key_press_event(self, widget, ev):
+    def key_release(self, widget, event):
+        key = Gdk.keyval_name(event.keyval)
+        # utils.dbg("key_release",key,s="taskwindow",l=1)
+        # utils.dbg("key_release event.state",event.state,s="taskwindow",l=1)
+        if (event.state & Gdk.ModifierType.CONTROL_MASK):
+            self.modifyer_keys['control'] = False
+        if (event.state & Gdk.ModifierType.SHIFT_MASK):
+            self.modifyer_keys['shift'] = False        
+        if (event.state & Gdk.ModifierType.MOD1_MASK):
+            self.modifyer_keys['alt'] = False
+        
+        
+        # print("modifyer_keys",self.modifyer_keys)
+
+
+    def key_press(self, widget, event):
 
-        key = Gdk.keyval_name(ev.keyval)
-        utils.dbg("task window key",key,s="taskwindow",l=3)
-        # utils.dbg("key_press_event",ev,s="taskwindow",l=1)
-        utils.dbg("ModifierType is CONTROL_MASK",Gdk.ModifierType.CONTROL_MASK,s="taskwindow",l=3)
+        key = Gdk.keyval_name(event.keyval)
+        # 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        
+        if (event.state & Gdk.ModifierType.SHIFT_MASK) or key == 'Shift_L':
+            self.modifyer_keys['shift'] = True        
+        if (event.state & Gdk.ModifierType.MOD1_MASK) or key == 'Alt_L':
+            self.modifyer_keys['alt'] = True
+
+        # print("modifyer_keys", self.modifyer_keys)
+
 
         if key == "F11":
             self.toggle_fullscreen()
         elif key == "Escape":
             self.destroy()
-        elif key in ['l','f'] and Gdk.ModifierType.CONTROL_MASK and not self.taskEntry.is_focus():
+        elif key in ['l','f'] and (event.state & Gdk.ModifierType.CONTROL_MASK) and not self.taskEntry.is_focus():
             self.taskEntry.grab_focus()
 
-        elif key == "Return" and self.taskEntry.is_focus():
-            # print("self.taskEntry has focus, do the thing")
-            if self.shown_tasks:
-                self.tasks_box.get_children()[0].emit('activate')
-            else:
-                self.new_task_button.emit('clicked')
+        elif key == "Return":
+            # print('self.get_focus()',self.get_focus())
+            # print('self.tasks_box.get_children()[1]',self.tasks_box.get_children()[1])
+            if self.taskEntry.is_focus():
+                # print("self.taskEntry has focus, do the thing")
+                if self.shown_tasks:
+                    self.tasks_box.get_children()[0].emit('activate')
+                else:
+                    self.new_task_button.emit('clicked')
+            
+            elif self.shown_tasks and self.get_focus() in self.tasks_box.get_children():
+                # print("Return pressed on shown task select it",self.get_focus())
+                self.get_focus().emit('activate')
 
 
-    def on_window_state_event(self, widget, ev):
-        self.__is_fullscreen = bool(ev.new_window_state & Gdk.WindowState.FULLSCREEN)
+    def on_window_state_event(self, widget, event):
+        self.__is_fullscreen = bool(event.new_window_state & Gdk.WindowState.FULLSCREEN)
 

{nowfocus-0.2.5 → nowfocus-0.2.7}/src/nowfocus/utils.py

@@ -144,7 +144,7 @@ def validate_start_time_str(start_time_string):
         error_notice('Incorrect Start Time Format', start_time_string+" does no match %Y-%m-%d %H:%M:%S", e)
         return False
 
-def open_todo(w=None, i=None, item_type = 'task'):
+def open_todo(w=None, i=None, item_type = 'tasks'):
     ''' run the launch() function from the todo connector for the provided i(tem) '''
     if not isinstance(i, dict): 
         i = db_get_item_by_id(i,item_type)
@@ -414,7 +414,7 @@ def reindex(t=None):
 
 def reindex_all():
         
-    db_query("DROP TABLE taskindex")
+    db_query("DROP TABLE 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' ")
 
@@ -684,7 +684,9 @@ def db_cleanup(widget = None):
     # exit()
 
 def db_get_item_by_id(id,table = 'tasks'):
-    
+
+    if table in ['task','list']:
+        table = table+'s'
     if table not in ['tasks','lists']:
         dbg('bad table "'+str(table)+'" passed to db_get_item_by_id',id,l=0)
         return {}

{nowfocus-0.2.5 → nowfocus-0.2.7/src/nowfocus.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nowfocus
-Version: 0.2.5
+Version: 0.2.7
 Summary: nowfocus: the open source task-tracking self-control panel.
 Author: GitFr33
 Project-URL: Homepage, https://gitlab.com/GitFr33/nowfocus
@@ -92,40 +92,37 @@ nowfocus is a clean, keyboard-driven project time tracker build with python + GT
 - [TimeWarrior](https://timewarrior.net)
 
 
-## Installation (using pipx) 
+## Installation
 
-Run the following in terminal to install and setup:
+1. Run the following in terminal to install and setup:
 ```
 # Install dependencies
-sudo apt install pip pipx install gir1.2-appindicator3-0.1 meson libdbus-glib-1-dev patchelf python3.12-venv libgirepository1.0-dev gcc libcairo2-dev pkg-config python3-dev
+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
 
 # Set up pipx
 pipx ensurepath
 
+# At this point you may need to restart your terminal window
+
 # Install nowfocus
 pipx install nowfocus
 
 # Enter application directory
-cd ~/.local/pipx/nowfocus
-
-# Copy .desktop and icon to .local/share 
-cp src/desktop-extras/nowfocus.desktop ~/.local/share/applications/nowfocus.desktop
-cp src/desktop-extras/nowfocus.svg ~/.local/share/icons/nowfocus.png
-cp src/desktop-extras/nowfocus.svg ~/.local/share/icons/hicolor/scalable/apps/nowfocus.svg
-
-# Setup autostart
-cp src/desktop-extras/nowfocus.desktop ~/.config/autostart/nowfocus.desktop
+cd ~/.local/share/pipx/venvs/nowfocus/lib/python3.12/site-packages/nowfocus/desktop-extras
 
-# Set Super space as keybinding to raise task window 
-chmod +x src/desktop-extras/set_gsettings_keybinding.sh
-
-src/desktop-extras/set_gsettings_keybinding.sh "Open nowfocus" nowfocus "<Super>space"
+# 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
 
 ```
 
+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` 
+
 
 
 ## Usage
@@ -138,7 +135,10 @@ Open nowfocus **Settings** from the indicator menu or tasks window and connect y
 
 - `F11` Toggle fullscreen
 - `Esc` Close task window
-- `Enter` Start top task (or make a new task with current search phrase if no results)
+- `Enter` Start top/selected task (or make a new task with current search phrase if no results)
+- `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

{nowfocus-0.2.5 → nowfocus-0.2.7}/src/nowfocus.egg-info/SOURCES.txt

@@ -1,10 +1,6 @@
 LICENSE
 README.md
 pyproject.toml
-src/desktop-extras/nowfocus.desktop
-src/desktop-extras/nowfocus.png
-src/desktop-extras/nowfocus.svg
-src/desktop-extras/set_gsettings_keybinding.sh
 src/nowfocus/__init__.py
 src/nowfocus/__main__.py
 src/nowfocus/conf.py
@@ -34,6 +30,10 @@ src/nowfocus/connectors/todotxt.py
 src/nowfocus/connectors/trello.py
 src/nowfocus/connectors/txt.py
 src/nowfocus/connectors/vikunja.py
+src/nowfocus/desktop-extras/nowfocus.desktop
+src/nowfocus/desktop-extras/nowfocus.png
+src/nowfocus/desktop-extras/nowfocus.svg
+src/nowfocus/desktop-extras/set_gsettings_keybinding.sh
 src/nowfocus/icon/cancel.png
 src/nowfocus/icon/cancel.svg
 src/nowfocus/icon/edit.png

nowfocus-0.2.7/src/nowfocus.egg-info/top_level.txt

@@ -0,0 +1 @@
+nowfocus

nowfocus-0.2.5/src/nowfocus.egg-info/top_level.txt

@@ -1,2 +0,0 @@
-desktop-extras
-nowfocus