Merge pull request #44 from Adam-Color/Develop

merge for 1.9.0

Author: Adam-Color

README.md

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

dev/windows_installer.iss

@@ -3,7 +3,7 @@
 
 #define MyAppName "AppUsageGUI"
 #define MyAppPublisher "Adam Blair-Smith"
-#define MyAppVersion "1.8.8"
+#define MyAppVersion "1.9.0"
 #define MyAppURL "https://github.com/Adam-Color/AppUsageGUI"
 #define MyAppExeName "AppUsageGUI.exe"
 #define MyInstallerName "AppUsageGUI_v" + MyAppVersion + "_WINDOWS_setup"

docs/install_macos.md

@@ -12,7 +12,7 @@ Note: only arm-based systems are currently supported.
 
 If you encounter the error message saying the app was not opened or was damaged, click "done" or "cancel", then enter this in your terminal:
 ```shell
-xattr -dr com.apple.quarantine /Applications/AppUsageGUI/AppUsageGUI.app
+xattr -dr com.apple.quarantine /Applications/AppUsageGUI.app
 ```
 If you mistakingly hit "move to trash" or "delete", repeat installation steps.
 

docs/release_template.md

@@ -1,7 +1,7 @@
 # AppUsageGUI v0.0.0
 
 >[!warning]
->Due to Apple's restrictions when it comes to open source applications such as ours, workarounds are needed to get AppUsageGUI to run on macOS. Please read the installation instructions below.
+>Due to codesigning restrictions, workarounds are needed to get AppUsageGUI to run. Please read the installation instructions below.
 
 To install, follow the instructions for your platform found here:
 
@@ -16,4 +16,4 @@ To install, follow the instructions for your platform found here:
 * 
 
 ### Patches:
-* 
+*

src/_version.py

@@ -1 +1 @@
-__version__ = "1.8.8"
+__version__ = "1.9.0"

src/core/gui_root.py

@@ -21,7 +21,7 @@
 from .screens.save_window import SaveWindow
 from .screens.create_session_window import CreateSessionWindow
 from .screens.session_total_window import SessionTotalWindow
-from .screens.tracker_settings_window import TrackerSettingsWindow
+from .screens.settings_window import SettingsWindow
 
 import logging
 logger = logging.getLogger(__name__)
@@ -300,7 +300,7 @@ def refresh_logs():
     def init_screens(self):
         """Pass the logic_controller when initializing screens"""
         for F in (MainWindow, SessionsWindow, ProjectSessionsWindow, ProjectsWindow, CreateProjectWindow,
-                  SelectAppWindow, TrackerWindow, SaveWindow, CreateSessionWindow, SessionTotalWindow, TrackerSettingsWindow):
+                  SelectAppWindow, TrackerWindow, SaveWindow, CreateSessionWindow, SessionTotalWindow, SettingsWindow):
             page_name = F.__name__
             frame = F(parent=self.container, controller=self, logic_controller=self.logic)
             self.frames[page_name] = frame

src/core/logic/file_handler.py

@@ -193,6 +193,10 @@ def get_current_project(self):
 
     def move_session_to_project(self, session_name, current_project, target_project):
         """Move a session from one project to another (or to/from No Project)"""
+        # If already in the target project, nothing to do
+        if current_project == target_project:
+            return True
+
         try:
             # Load the session data first
             self.load_session_data(session_name, current_project)

src/core/logic/user_trackers.py

@@ -34,26 +34,30 @@ def __init__(self, parent, logic_controller):
 
         self.update_thread = threading.Thread(target=self._update_mouse_position, name="mouse_tracker")
 
+    def _check_mouse_position(self):
+        """Perform a single mouse position check and trigger pause/resume as needed."""
+        self.last_mouse_position = self.mouse_position
+
+        x, y = pynput.mouse.Controller().position
+        self.mouse_position = x, y
+
+        # Pause the timer if mouse hasn't moved
+        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 and self.last_mouse_position != self.mouse_position:
+            self.logic.time_tracker.resume()
+            self.pausing = False
+
     def _update_mouse_position(self):
         while not self.stop_event.is_set():
-            self.last_mouse_position = self.mouse_position
-
             wait_time = self.idle_time_limit if not self.logic.time_tracker.get_is_paused() else 1
 
             # Wait for the idle time or exit early if stop_event is set
             if self.stop_event.wait(timeout=wait_time):
                 break
 
-            x, y = pynput.mouse.Controller().position
-            self.mouse_position = x, y
-
-            # Pause the timer if mouse hasn’t moved
-            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 and self.last_mouse_position != self.mouse_position:
-                self.logic.time_tracker.resume()
-                self.pausing = False
+            self._check_mouse_position()
 
 
     def start(self):

src/core/screens/create_session_window.py

@@ -37,6 +37,7 @@ def __init__(self, parent, controller, logic_controller):
 
         # Project dropdown
         self.project_var = tk.StringVar()
+        self.no_project_var = tk.BooleanVar(value=True)
         self.project_dropdown = tk.OptionMenu(project_frame, self.project_var, "")
         self.project_dropdown.pack(side="left", fill="x", expand=True, padx=(10, 5))
 
@@ -106,8 +107,10 @@ def check_pre_selected_project(self):
         selected_project = self.logic.project_handler.get_selected_project()
         if selected_project:
             self.project_var.set(selected_project)
+            self.no_project_var.set(False)
         else:
             self.project_var.set("No Project")
+            self.no_project_var.set(True)
 
     def create_new_project(self):
         """Open a dialog to create a new project and associate it with the session"""
@@ -134,7 +137,8 @@ def create_new_project(self):
         vcmd = (dialog.register(validate_name), '%P')
         project_name_var = tk.StringVar()
         project_name_entry = tk.Entry(dialog, textvariable=project_name_var,
-                                    validate="key", validatecommand=vcmd, width=30)
+                                    validate="key", validatecommand=vcmd, width=30, 
+                                    borderwidth=3, relief="groove")
         project_name_entry.pack(pady=5)
 
         # Help text

src/core/screens/main_window.py

@@ -47,8 +47,8 @@ def __init__(self, parent, controller, logic_controller):
         btn_sessions.grid(row=1, column=0, padx=10, pady=10)
 
         btn_rules = tk.Button(
-            button_frame, text="Custom Rules",
-            command=lambda: self.controller.show_frame("TrackerSettingsWindow"),
+            button_frame, text="Settings",
+            command=lambda: self.controller.show_frame("SettingsWindow"),
             width=20, height=2
         )
         btn_rules.grid(row=1, column=1, padx=10, pady=10)