Skip to content

merge for 1.4.2 #15

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Adam-Color merged 2 commits into from
May 30, 2025
Merged

merge for 1.4.2 #15

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0a36c33
fixed unhandled exception is user_trackers.py
Adam-Color May 30, 2025
ce329c1
versioning for 1.4.2
Adam-Color May 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
![version](https://img.shields.io/badge/Version-1.4.1-white.svg)
![version](https://img.shields.io/badge/Version-1.4.2-white.svg)
![license](https://img.shields.io/badge/License-GPL%20v3-blue.svg)
![python](https://img.shields.io/badge/Python-3.12-green.svg)

Expand Down
2 changes: 1 addition & 1 deletion installers/macos_installer.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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.1'
app_version='1.4.2'

mv dist/AppUsageGUI.app dist/AppUsageGUI/

Expand Down
4 changes: 2 additions & 2 deletions installers/windows_installer.iss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@
; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!

#define MyAppName "AppUsageGUI"
#define MyAppVersion "1.4.1"
#define MyAppVersion "1.4.2"
#define MyAppPublisher "Adam Blair-Smith"
#define MyAppURL "https://github.com/Adam-Color/AppUsageGUI"
#define MyAppExeName "AppUsageGUI.exe"
#define MyInstallerName "AppUsageGUI_v1.4.1_WINDOWS_setup"
#define MyInstallerName "AppUsageGUI_v1.4.2_WINDOWS_setup"

[Setup]
; NOTE: The value of AppId uniquely identifies this application. Do not use the same AppId value in installers for other applications.
Expand Down
2 changes: 1 addition & 1 deletion src/_version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "1.4.1"
__version__ = "1.4.2"
4 changes: 2 additions & 2 deletions src/core/logic/user_trackers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ def __init__(self, parent, logic_controller):
self.parent = parent
try:
self.idle_time_limit = read_file(config_file())["mouse_idle_time_limit"]
except FileNotFoundError:
except (FileNotFoundError, KeyError):
self.idle_time_limit = 300 # Default value
x = 0
y = 0
Expand All @@ -24,7 +24,7 @@ def __init__(self, parent, logic_controller):
self.stop_event = threading.Event() # Used to stop the thread gracefully
try:
self.enabled = read_file(config_file())["mouse_tracker_enabled"]
except FileNotFoundError:
except (FileNotFoundError, KeyError):
self.enabled = False # Default value

self.pausing = False
Expand Down