Merge pull request #17 from Adam-Color/Develop

Merge for v1.4.3

Author: Adam-Color

README.md

@@ -1,4 +1,4 @@
-![version](https://img.shields.io/badge/Version-1.4.2-white.svg)
+![version](https://img.shields.io/badge/Version-1.4.3-white.svg)
 ![license](https://img.shields.io/badge/License-GPL%20v3-blue.svg)
 ![python](https://img.shields.io/badge/Python-3.12-green.svg)
 

docs/install_macos.md

@@ -3,6 +3,7 @@
 * double-click the .dmg to open it
 * agree to the [license](../LICENSE.txt)
 * drag the "AppUsageGUI" folder to the "Applications" folder
+* if asked to replace another folder, agree to do so
 
 ## Running on macOS:
 >[!warning]

installers/macos_installer.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 # This script is used to create the installer for the macOS version of the application
-app_version='1.4.2'
+app_version='1.4.3'
 
 mv dist/AppUsageGUI.app dist/AppUsageGUI/
 

installers/windows_installer.iss

@@ -2,11 +2,11 @@
 ; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
 
 #define MyAppName "AppUsageGUI"
-#define MyAppVersion "1.4.2"
+#define MyAppVersion "1.4.3"
 #define MyAppPublisher "Adam Blair-Smith"
 #define MyAppURL "https://github.com/Adam-Color/AppUsageGUI"
 #define MyAppExeName "AppUsageGUI.exe"
-#define MyInstallerName "AppUsageGUI_v1.4.2_WINDOWS_setup"
+#define MyInstallerName "AppUsageGUI_v1.4.3_WINDOWS_setup"
 
 [Setup]
 ; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.

requirements.txt

@@ -12,5 +12,5 @@ PyScreeze==1.0.1
 pytweening==1.2.0
 rubicon-objc==0.5.0
 pyinstaller
-requests==2.32.3
+requests==2.32.4
 pillow==11.2.1

src/_version.py

@@ -1 +1 @@
-__version__ = "1.4.2"
+__version__ = "1.4.3"

src/core/logic/user_trackers.py

@@ -15,7 +15,7 @@ def __init__(self, parent, logic_controller):
         try:
             self.idle_time_limit = read_file(config_file())["mouse_idle_time_limit"]
         except (FileNotFoundError, KeyError):
-            self.idle_time_limit = 300  # Default value
+            self.idle_time_limit = 90  # Default value
         x = 0
         y = 0
         self.logic = logic_controller
@@ -45,10 +45,10 @@ def _update_mouse_position(self):
             self.mouse_position = x, y
 
             # Pause the timer if mouse hasn’t moved
-            if self.last_mouse_position == self.mouse_position:
+            if self.last_mouse_position == self.mouse_position and not self.logic.time_tracker.get_is_paused():
                 self.logic.time_tracker.pause()
                 self.pausing = True
-            elif self.pausing:
+            elif self.pausing and self.last_mouse_position != self.mouse_position:
                 self.logic.time_tracker.resume()
                 self.pausing = False
 

src/core/screens/tracker_settings_window.py

@@ -27,7 +27,7 @@ def __init__(self, parent, controller, logic_controller):
 
         self.settings = {
             "mouse_tracker_enabled": False,
-            "mouse_idle_time_limit": 300
+            "mouse_idle_time_limit": 90
         }
 
         # Read settings file if it exists

src/core/screens/tracker_window.py

@@ -102,10 +102,11 @@ def _update_display(self):
 
         if self.logic.mouse_tracker.is_pausing():
             self.page_label.config(text="Tracking paused, mouse is idle...")
-            self.toggle_pause_tracker(button=False)
+            self.pause_toggle_text.set("Resume")
         else:
             new_text = f"Tracking the selected app: {self.app}"
             if self.page_label["text"] != new_text:
+                self.pause_toggle_text.set("Pause")
                 self.page_label.config(text=new_text)
 
         self.update_queue.put((self.TIME_UPDATE, time_text))