Fixed hotkey inconsistencies #75

Fixed combination keys not working #85

Author: LOUDO56

src/hotkeys/hotkeys_manager.py

@@ -46,7 +46,7 @@ def __win32_event_filter(self, msg, data):
 
     def __on_press(self, key):
         userSettings = self.settings.get_config()
-        if self.changeKey == True:
+        if self.changeKey:
             keyPressed = getKeyPressed(self.keyboard_listener, key)
             if keyPressed not in self.hotkeys:
                 if ">" in keyPressed:
@@ -93,41 +93,53 @@ def __on_press(self, key):
                     keyPressed = vk_nb[keyPressed]
                 except:
                     pass
+
             for keys in userSettings["Hotkeys"]:
-                if userSettings["Hotkeys"][keys] == []:
+                if not userSettings["Hotkeys"][keys]:
                     userSettings["Hotkeys"][keys] = ""
+
             if keyPressed not in self.hotkey_detection:
                 self.hotkey_detection.append(keyPressed)
+
             by_hotkey = True
+
             if (
-                self.hotkey_detection == userSettings["Hotkeys"]["Record_Start"]
-                and self.macro.record == False
-                and self.macro.playback == False
+                    self.__is_hotkey_triggered(userSettings["Hotkeys"]["Record_Start"], self.hotkey_detection)
+                    and self.macro.record == False
+                    and self.macro.playback == False
             ):
                 self.macro.start_record(by_hotkey)
 
             elif (
-                self.hotkey_detection == userSettings["Hotkeys"]["Record_Stop"]
-                and self.macro.record == True
-                and self.macro.playback == False
+                    self.__is_hotkey_triggered(userSettings["Hotkeys"]["Record_Stop"], self.hotkey_detection)
+                    and self.macro.record == True
+                    and self.macro.playback == False
             ):
                 self.macro.stop_record()
 
             elif (
-                self.hotkey_detection == userSettings["Hotkeys"]["Playback_Start"]
-                and self.macro.record == False
-                and self.macro.playback == False
-                and self.main_app.macro_recorded == True
+                    self.__is_hotkey_triggered(userSettings["Hotkeys"]["Playback_Start"], self.hotkey_detection)
+                    and self.macro.record == False
+                    and self.macro.playback == False
+                    and self.main_app.macro_recorded == True
             ):
                 self.macro.start_playback()
 
             elif (
-                self.hotkey_detection == userSettings["Hotkeys"]["Playback_Stop"]
-                and self.macro.record == False
-                and self.macro.playback == True
+                    self.__is_hotkey_triggered(userSettings["Hotkeys"]["Playback_Stop"], self.hotkey_detection)
+                    and self.macro.record == False
+                    and self.macro.playback == True
             ):
                 self.macro.stop_playback(by_hotkey)
 
     def __on_release(self, key):
         if len(self.hotkey_detection) != 0:
             self.hotkey_detection.pop()
+
+    def __is_hotkey_triggered(self, hotkey_config, detected_keys):
+        has_modifier = any("Key." in key for key in hotkey_config)
+        if has_modifier:
+            return set(hotkey_config) == set(detected_keys)
+        else:
+            return any(key in detected_keys for key in hotkey_config)
+

src/utils/user_settings.py

@@ -19,7 +19,6 @@ def __init__(self, main_app):
             self.path_setting = path.join(path.expanduser("~"), "Library", "Application Support", "PyMacroRecord")
 
         self.user_setting = path.join(self.path_setting, "userSettings.json")
-        self.cached_settings=None
 
         if not path.isdir(self.path_setting) or not path.isfile(self.user_setting):
             self.first_time = True
@@ -91,17 +90,15 @@ def init_settings(self):
             }
         }
 
-        self.cached_settings=userSettings
         userSettings_json = dumps(userSettings, indent=4)
         with open(self.user_setting, "w") as settingFile:
             settingFile.write(userSettings_json)
 
     def get_config(self):
         """Get settings of users"""
-        if self.cached_settings is None:
-            with open(self.user_setting, "r") as settingFile:
-                self.cached_settings = load(settingFile)
-        return self.cached_settings
+        with open(self.user_setting, "r") as settingFile:
+            settingFile_json = load(settingFile)
+        return settingFile_json
 
     def update_settings(self, updatedValues):
         with open(self.user_setting, "w") as settingFile:

src/utils/version.py

@@ -4,7 +4,7 @@
 class Version:
     def __init__(self, userSettings, main_app):
         self.main_app = main_app
-        self.version = "1.3.0"
+        self.version = "1.4.0"
         self.new_version = ""
         if userSettings["Others"]["Check_update"]:
             self.update = self.checkVersion()

src/windows/main/main_app.py

@@ -79,11 +79,11 @@ def __init__(self):
             with open(sys.argv[1], 'r') as record:
                 loaded_content = load(record)
             self.macro.import_record(loaded_content)
+            self.playBtn = Button(self.center_frame, image=self.playImg, command=self.macro.start_playback)
             self.macro_recorded = True
             self.macro_saved = True
-
-        self.playBtn = Button(self.center_frame, image=self.playImg,
-                              command=self.macro.start_playback if self.macro_recorded else None)
+        else:
+            self.playBtn = Button(self.center_frame, image=self.playImg, state=DISABLED)
         self.playBtn.pack(side=LEFT, padx=50)
 
         # Record Button