PyPI - NowFocus - Versions diffs - 0.2.7__tar.gz → 0.2.8__tar.gz - Mend

NowFocus 0.2.7tar.gz → 0.2.8tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (63) hide show

{nowfocus-0.2.7/src/nowfocus.egg-info → nowfocus-0.2.8}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nowfocus
-Version: 0.2.7
+Version: 0.2.8
 Summary: nowfocus: the open source task-tracking self-control panel.
 Author: GitFr33
 Project-URL: Homepage, https://gitlab.com/GitFr33/nowfocus

{nowfocus-0.2.7 → nowfocus-0.2.8}/pyproject.toml RENAMED Viewed

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

{nowfocus-0.2.7 → nowfocus-0.2.8}/src/nowfocus/__main__.py RENAMED Viewed

@@ -73,7 +73,7 @@ class Application(Gtk.Application):
         self.menu_tasks = {}
         self.list_menus = {}
-        self.indicator = appindicator.Indicator.new(conf.app_name, os.path.abspath('icon/icon-0.svg'), appindicator.IndicatorCategory.APPLICATION_STATUS)
+        self.indicator = appindicator.Indicator.new(conf.app_name, os.path.abspath('icon/icon-1.svg'), appindicator.IndicatorCategory.APPLICATION_STATUS)
         self.indicator.set_status(appindicator.IndicatorStatus.ACTIVE)
@@ -301,7 +301,7 @@ class Application(Gtk.Application):
         if(self.is_running == True):
             self.icon_tick_number = self.icon_tick_number + 1
-            if self.icon_tick_number > 9:
+            if self.icon_tick_number > 8:
                 self.icon_tick_number = 1
             label = self.session['label'] + ": " + sec_to_time(self.session['duration'])
@@ -312,8 +312,10 @@ class Application(Gtk.Application):
             # label = random.choice(conf.idle_messages) # Cool but makes menu bounce around #Could be paused when the menu opens
             label = conf.user['default_text']
-            indicator.set_icon_full(os.path.abspath('icon/icon-0.svg'),label)
+            if self.session['duration'] > 60 and self.session['duration'] % 2:
+                indicator.set_icon_full(os.path.abspath('icon/icon-red.svg'),label)
+            else:
+                indicator.set_icon_full(os.path.abspath('icon/icon-1.svg'),label)
         # https://lazka.github.io/pgi-docs/#AyatanaAppIndicator3-0.1/classes/Indicator.html#AyatanaAppIndicator3.Indicator.set_label
         indicator.set_label(label, "Wide")
@@ -414,6 +416,7 @@ class Application(Gtk.Application):
         if process:
             print("waiting for already running command with psutils", command)
+            # subprocess.run('wmctrl', '-a', command) # Doesn't work on wayland
             process.wait()
         else:
             print("Launching command with subprocess.run", command)

nowfocus-0.2.8/src/nowfocus/icon/icon-red.svg ADDED Viewed

@@ -0,0 +1,101 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 12.7 12.7"
+   version="1.1"
+   id="svg1"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs1" />
+  <g
+     id="layer1"
+     transform="matrix(1.0567177,0,0,1.0567177,-0.36015771,-0.36015771)">
+    <rect
+       style="display:none;opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.316;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       id="rect1"
+       width="9.5708742"
+       height="9.5708742"
+       x="1.5645629"
+       y="1.5645629" />
+    <rect
+       style="display:none;opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.915798;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       id="rect38"
+       width="9.5708742"
+       height="9.5708742"
+       x="1.5645629"
+       y="1.5645629"
+       ry="3.110863" />
+    <rect
+       style="display:inline;opacity:1;fill:none;fill-opacity:1;stroke:#ffffff;stroke-width:0.915798;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       id="rect2"
+       width="9.5708742"
+       height="9.5708742"
+       x="1.5645629"
+       y="1.5645629"
+       ry="4.7854371"
+       rx="4.7854371" />
+  </g>
+  <g
+     id="layer2"
+     style="display:inline">
+    <path
+       style="display:none;fill:none;stroke:#ffffff;stroke-width:1.465;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6.3410664,6.36546 4.4335013,4.0522236"
+       id="path2" />
+    <path
+       style="display:none;fill:none;stroke:#ffffff;stroke-width:1.465;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6.37713,6.3615649 11.260009,1.2965066"
+       id="use31" />
+    <path
+       style="display:none;fill:none;stroke:#ffffff;stroke-width:1.465;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6.3610066,6.3773634 13.39526,6.248543"
+       id="use32" />
+    <path
+       style="display:none;fill:none;stroke:#ffffff;stroke-width:1.465;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="m 6.338434,6.3771308 5.065058,4.8828782"
+       id="use33" />
+    <path
+       style="display:none;fill:none;stroke:#ffffff;stroke-width:1.465;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6.322637,6.3610073 6.4514574,13.395261"
+       id="use34" />
+    <path
+       style="display:none;fill:none;stroke:#ffffff;stroke-width:1.465;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6.322869,6.3384356 1.4399903,11.403494"
+       id="use35" />
+    <path
+       style="display:none;fill:none;stroke:#ffffff;stroke-width:1.465;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6.3389932,6.3226376 -0.69526049,6.451458"
+       id="use36" />
+    <path
+       style="display:none;fill:none;stroke:#ffffff;stroke-width:1.465;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6.3615647,6.3228685 1.2965064,1.4399898"
+       id="use37" />
+    <path
+       style="display:none;fill:none;stroke:#ffffff;stroke-width:1.465;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       d="M 6.3773615,6.3389927 6.2485411,-0.69526102"
+       id="use38" />
+  </g>
+  <g
+     id="layer3"
+     style="display:inline">
+    <rect
+       style="display:inline;opacity:1;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.915798;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3"
+       width="9.5708742"
+       height="9.5708742"
+       x="1.5645629"
+       y="1.5645629"
+       ry="4.7854371"
+       rx="4.7854371"
+       transform="matrix(1.0567177,0,0,1.0567177,-0.36015771,-0.36015771)" />
+    <path
+       style="font-weight:bold;font-size:10.4396px;line-height:1.25;font-family:'Besley*';-inkscape-font-specification:'Besley*, Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;stroke-width:0.198419"
+       d="m 5.2723149,3.6126858 c 0,-0.040213 0.03016,-0.080427 0.1005332,-0.1407465 0.06032,-0.06032 0.1709064,-0.1105865 0.3116529,-0.1507998 0.1407465,-0.040213 0.2915463,-0.070373 0.4624528,-0.070373 0.4121862,0 0.6936791,0.1105865 0.8545323,0.3317595 0.1507998,0.2211731 0.2312264,0.5428794 0.2312264,0.9550655 0,0.4222395 -0.1206399,0.7640524 -0.3518663,1.0254388 -0.2412797,0.2613863 -0.5830926,0.4825594 -1.0254387,0.6434125 -0.03016,0.020106 -0.080427,0.040213 -0.1608531,0.06032 -0.080427,0.020106 -0.1306932,0.040213 -0.1407465,0.050267 -0.020106,0.010054 -0.040213,0.03016 -0.080427,0.070373 -0.040213,0.040213 -0.06032,0.080427 -0.06032,0.1407464 -0.010054,0.06032 -0.010054,0.1306932 -0.010054,0.2211731 v 0.8243723 c 0,0.080427 0.010054,0.1407465 0.050267,0.1608532 0.03016,0.020106 0.1005332,0.03016 0.2211731,0.03016 h 0.9852264 c 0.1608531,0 0.2613863,-0.010054 0.3015996,-0.040213 C 6.991433,7.6943348 7.01154,7.603855 7.01154,7.4430018 V 6.9906026 c 0,-0.070373 0,-0.1306932 0.010054,-0.1809598 0,-0.040213 0.010054,-0.080427 0.020106,-0.1105865 0.010054,-0.020106 0.03016,-0.050267 0.06032,-0.070373 0.03016,-0.020106 0.050267,-0.03016 0.070373,-0.040213 0.020106,0 0.050267,-0.010054 0.1105865,-0.03016 0.06032,-0.010054 0.1005332,-0.020106 0.1407465,-0.040213 C 7.9263916,6.3572424 8.3184711,6.1159627 8.6100174,5.7842031 8.9015637,5.4624969 9.0523635,5.0402574 9.0523635,4.5375913 c 0,-0.6233059 -0.221173,-1.1159186 -0.6635191,-1.4778381 -0.4423462,-0.3518663 -1.1159187,-0.532826 -2.0408242,-0.532826 -0.8042657,0 -1.4376249,0.2111197 -1.8900243,0.6132525 -0.4624528,0.4121862 -0.6836258,0.8746389 -0.6836258,1.3873583 0,0.3418129 0.090479,0.6132526 0.2915463,0.814319 0.2010664,0.2010664 0.4423461,0.3015996 0.7338924,0.3015996 0.2714397,0 0.502666,-0.080427 0.6936791,-0.251333 0.1809598,-0.1709064 0.281493,-0.3920795 0.281493,-0.6534658 0,-0.2010665 -0.050267,-0.3820262 -0.1306931,-0.5428794 C 5.5638612,4.0349253 5.4733813,3.9142854 5.3929547,3.8238056 5.3125282,3.7333257 5.2723149,3.6629524 5.2723149,3.6126858 Z m -0.050267,5.8510328 c 0,0.2814929 0.090479,0.5127198 0.2915463,0.7137864 0.2010664,0.201066 0.4322928,0.291546 0.7137858,0.291546 0.2714396,0 0.502666,-0.09048 0.7037324,-0.291546 C 7.1321792,9.9764384 7.2327125,9.7452115 7.2327125,9.4637186 7.2327125,9.1922789 7.1321792,8.9610525 6.9311128,8.7599861 6.7300464,8.5589197 6.49882,8.4583865 6.2273804,8.4583865 c -0.281493,0 -0.5127194,0.1005332 -0.7137858,0.3015996 C 5.3125282,8.9610525 5.2220483,9.1922789 5.2220479,9.4637186 Z"
+       id="text38"
+       aria-label="?" />
+  </g>
+</svg>

{nowfocus-0.2.7 → nowfocus-0.2.8}/src/nowfocus/icon/icon.svg RENAMED Viewed

@@ -9,7 +9,7 @@
    id="svg1"
    inkscape:version="1.3.2 (1:1.3.2+202404261509+091e20ef0f)"
    sodipodi:docname="icon.svg"
-   inkscape:export-filename="icon-0.svg"
+   inkscape:export-filename="icon-red.svg"
    inkscape:export-xdpi="128"
    inkscape:export-ydpi="128"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
@@ -185,6 +185,17 @@
      id="layer3"
      inkscape:label="?"
      style="display:inline">
+    <rect
+       style="display:inline;opacity:1;fill:#ff0000;fill-opacity:1;stroke:#ff0000;stroke-width:0.915798;stroke-linecap:round;stroke-linejoin:round;stroke-dasharray:none;stroke-opacity:1"
+       id="rect3"
+       width="9.5708742"
+       height="9.5708742"
+       x="1.5645629"
+       y="1.5645629"
+       inkscape:label="Red"
+       ry="4.7854371"
+       rx="4.7854371"
+       transform="matrix(1.0567177,0,0,1.0567177,-0.36015771,-0.36015771)" />
     <path
        style="font-weight:bold;font-size:10.4396px;line-height:1.25;font-family:'Besley*';-inkscape-font-specification:'Besley*, Bold';letter-spacing:0px;word-spacing:0px;fill:#ffffff;stroke-width:0.198419"
        d="m 5.2723149,3.6126858 c 0,-0.040213 0.03016,-0.080427 0.1005332,-0.1407465 0.06032,-0.06032 0.1709064,-0.1105865 0.3116529,-0.1507998 0.1407465,-0.040213 0.2915463,-0.070373 0.4624528,-0.070373 0.4121862,0 0.6936791,0.1105865 0.8545323,0.3317595 0.1507998,0.2211731 0.2312264,0.5428794 0.2312264,0.9550655 0,0.4222395 -0.1206399,0.7640524 -0.3518663,1.0254388 -0.2412797,0.2613863 -0.5830926,0.4825594 -1.0254387,0.6434125 -0.03016,0.020106 -0.080427,0.040213 -0.1608531,0.06032 -0.080427,0.020106 -0.1306932,0.040213 -0.1407465,0.050267 -0.020106,0.010054 -0.040213,0.03016 -0.080427,0.070373 -0.040213,0.040213 -0.06032,0.080427 -0.06032,0.1407464 -0.010054,0.06032 -0.010054,0.1306932 -0.010054,0.2211731 v 0.8243723 c 0,0.080427 0.010054,0.1407465 0.050267,0.1608532 0.03016,0.020106 0.1005332,0.03016 0.2211731,0.03016 h 0.9852264 c 0.1608531,0 0.2613863,-0.010054 0.3015996,-0.040213 C 6.991433,7.6943348 7.01154,7.603855 7.01154,7.4430018 V 6.9906026 c 0,-0.070373 0,-0.1306932 0.010054,-0.1809598 0,-0.040213 0.010054,-0.080427 0.020106,-0.1105865 0.010054,-0.020106 0.03016,-0.050267 0.06032,-0.070373 0.03016,-0.020106 0.050267,-0.03016 0.070373,-0.040213 0.020106,0 0.050267,-0.010054 0.1105865,-0.03016 0.06032,-0.010054 0.1005332,-0.020106 0.1407465,-0.040213 C 7.9263916,6.3572424 8.3184711,6.1159627 8.6100174,5.7842031 8.9015637,5.4624969 9.0523635,5.0402574 9.0523635,4.5375913 c 0,-0.6233059 -0.221173,-1.1159186 -0.6635191,-1.4778381 -0.4423462,-0.3518663 -1.1159187,-0.532826 -2.0408242,-0.532826 -0.8042657,0 -1.4376249,0.2111197 -1.8900243,0.6132525 -0.4624528,0.4121862 -0.6836258,0.8746389 -0.6836258,1.3873583 0,0.3418129 0.090479,0.6132526 0.2915463,0.814319 0.2010664,0.2010664 0.4423461,0.3015996 0.7338924,0.3015996 0.2714397,0 0.502666,-0.080427 0.6936791,-0.251333 0.1809598,-0.1709064 0.281493,-0.3920795 0.281493,-0.6534658 0,-0.2010665 -0.050267,-0.3820262 -0.1306931,-0.5428794 C 5.5638612,4.0349253 5.4733813,3.9142854 5.3929547,3.8238056 5.3125282,3.7333257 5.2723149,3.6629524 5.2723149,3.6126858 Z m -0.050267,5.8510328 c 0,0.2814929 0.090479,0.5127198 0.2915463,0.7137864 0.2010664,0.201066 0.4322928,0.291546 0.7137858,0.291546 0.2714396,0 0.502666,-0.09048 0.7037324,-0.291546 C 7.1321792,9.9764384 7.2327125,9.7452115 7.2327125,9.4637186 7.2327125,9.1922789 7.1321792,8.9610525 6.9311128,8.7599861 6.7300464,8.5589197 6.49882,8.4583865 6.2273804,8.4583865 c -0.281493,0 -0.5127194,0.1005332 -0.7137858,0.3015996 C 5.3125282,8.9610525 5.2220483,9.1922789 5.2220479,9.4637186 Z"

{nowfocus-0.2.7 → nowfocus-0.2.8}/src/nowfocus/task_window.py RENAMED Viewed

@@ -126,7 +126,6 @@ class TaskWindow(Gtk.Window):
                 self.taskEntry.set_text(passed_data['task']['label'])
-        # box.add(Gtk.Box(border_width=10)) # Spacer
         self.scrolled_window = Gtk.ScrolledWindow()
         self.scrolled_window.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC)
@@ -134,7 +133,7 @@ class TaskWindow(Gtk.Window):
         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
+        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)
         self.tasks_box.set_halign(Gtk.Align.START)
@@ -164,10 +163,6 @@ class TaskWindow(Gtk.Window):
         self.buttons_box.set_halign(Gtk.Align.CENTER)
         self.buttons_box.set_name("Footer")
-        # box.add(Gtk.Box(border_width=10)) # Spacer
-        # box.add(self.buttons_box)
         box.pack_start(self.buttons_box,False, False, 0)
         self.settings_button = Gtk.Button(label="Settings")
@@ -180,19 +175,12 @@ class TaskWindow(Gtk.Window):
         self.buttons_box.add(self.refresh_button)
         # Todolist openables
-        openables = []
         for id, todo in conf.user['todolists'].items():
             if todo['status']:
                 try:
                     openable = conf.todo_connectors[todo['type']].launch
-                    # if openable not in openables:
-                    openables.append(openable)
                     openable_button = Gtk.Button(label=GLib.markup_escape_text(todo['label']))
-                    openable_button.connect("clicked", lambda todo: openable(todo))
-                    # openable_button.connect("clicked",  openable, todo) # Doesn't work because of passing widget as first argument
+                    openable_button.connect("clicked", lambda button_widget,todo=todo, openable=openable: openable(todo))
                     openable_button.set_property("tooltip-text","Open (new) "+GLib.markup_escape_text(todo['label']))
                     self.buttons_box.add(openable_button)

{nowfocus-0.2.7 → nowfocus-0.2.8/src/nowfocus.egg-info}/PKG-INFO RENAMED Viewed

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nowfocus
-Version: 0.2.7
+Version: 0.2.8
 Summary: nowfocus: the open source task-tracking self-control panel.
 Author: GitFr33
 Project-URL: Homepage, https://gitlab.com/GitFr33/nowfocus

{nowfocus-0.2.7 → nowfocus-0.2.8}/src/nowfocus.egg-info/SOURCES.txt RENAMED Viewed

@@ -33,7 +33,6 @@ 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
@@ -48,6 +47,7 @@ src/nowfocus/icon/icon-6.svg
 src/nowfocus/icon/icon-7.svg
 src/nowfocus/icon/icon-8.svg
 src/nowfocus/icon/icon-9.svg
+src/nowfocus/icon/icon-red.svg
 src/nowfocus/icon/icon.svg
 src/nowfocus/icon/mark-done.png
 src/nowfocus/icon/mark-done.svg

nowfocus-0.2.7/src/nowfocus/desktop-extras/set_gsettings_keybinding.sh DELETED Viewed

@@ -1,51 +0,0 @@
-#!/bin/bash
-# This function simplifies setting up Gnome 3 shortcuts from terminal
-# $1       name of the shortcut
-# $2       command to execute
-# $3       keyboard shortcut
-# src: https://askubuntu.com/a/597414/279745 and https://gitlab.com/tukusejssirs/lnx_scripts/-/blob/master/bash/functions/gshort.sh
-# TODO
-# - before shortcut creation, check if:
-#   - the shortcut is not used already in custom shortcuts;
-#   - the command is not used already in custom shortcuts;
-# - sometimes is uses the very same $num multiple times;
-gshort(){
-    set -o errexit
-	local name="$1"
-	local command="$2"
-	local shortcut="$3"
-	local value test value_new
-	value="$(gsettings get org.gnome.settings-daemon.plugins.media-keys custom-keybindings)"
-	test="$(sed "s/\['//;s/', '/,/g;s/'\]//" <<< "$value" | tr ',' '\n' | grep -oP ".*/custom\K[0-9]*(?=/$)")"
-	if [ "$(echo "$value" | grep -o "@as")" = "@as" ]; then
-		local num=0
-		value_new="['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom${num}/']"
-	else
-		local i=1
-		until [ "$num" != "" ]; do
-			if [ "$(grep -o $i <<< "$test")" != "$i" ]; then
-				local num=$i
-			fi
-			i="$(echo 1+$i | bc)";
-		done
-		value_new="$(gsettings get org.gnome.settings-daemon.plugins.media-keys custom-keybindings | sed "s#']\$#', '/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom${num}/']#")"
-	fi
-    echo setting custom-keybinding ${num} to ${command} with ${shortcut}
-	gsettings set org.gnome.settings-daemon.plugins.media-keys custom-keybindings "$value_new"
-	gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom${num}/ name "$name"
-	gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom${num}/ command "$command"
-	gsettings set org.gnome.settings-daemon.plugins.media-keys.custom-keybinding:/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom${num}/ binding "$shortcut"
-}
-gshort $1 $2 $3