fixed autostart and removed [DEV] from config.ini

Author: wrecks-code

.gitignore

@@ -153,3 +153,4 @@ cython_debug/
 
 output/
 .vscode/
+MultiMonitorTool/

SimpleMonitorControlTrayModule/autoStartHandler.py

@@ -6,35 +6,39 @@
 import SimpleMonitorControlTrayModule.notificationHandler as nH
 import SimpleMonitorControlTrayModule.trayHandler as tH
 
-config_file_path = "config.ini"
-assets_folder = "assets"
-asset_iconEnabled = "assets\iconEnabled.png"
-asset_iconDisabled = "assets\iconDisabled.png"
+config_file_path = dH.getDirectory() + r"\config.ini"
+asset_iconEnabled_path = dH.getDirectory() + r"\assets\iconEnabled.png"
+asset_iconDisabled_path = dH.getDirectory() + r"\assets\iconDisabled.png"
 
 fileNotFound = " file not found. Exiting."
 
-MULTIMONITORTOOL_PATH, CSV_FILE_PATH, MM_CONFIG_FILE_PATH, MONITOR_NAME, AUTOSTART = (
-    None,
-    None,
-    None,
-    None,
+MULTIMONITORTOOL_PATH, MONITOR_NAME, AUTOSTART = (
+    "",
+    "",
     False,
 )
 
+CSV_FILE_PATH = dH.getDirectory() + r"\MultiMonitorTool\multiMonitorToolOutput.csv"
+MM_CONFIG_FILE_PATH = dH.getDirectory() + r"\MultiMonitorTool\MultiMonitorToolConfig"
+
+"""[DEV]
+mm_csv_export_path = MultiMonitorTool\multiMonitorToolOutput.csv
+mm_config_file_path = MultiMonitorTool\MultiMonitorToolConfig"""
+
 
 def check_for_missing_files():
 
     if not os.path.exists(MULTIMONITORTOOL_PATH):
         nH.sendError(MULTIMONITORTOOL_PATH + fileNotFound)
         tH.exitItemClicked()
-    if not os.path.exists(os.path.join(dH.getDirectory(), asset_iconEnabled)):
-        nH.sendError(asset_iconDisabled + fileNotFound)
+    if not os.path.exists(os.path.join(dH.getDirectory(), asset_iconEnabled_path)):
+        nH.sendError(asset_iconDisabled_path + fileNotFound)
         tH.exitItemClicked()
 
     if not os.path.exists(CSV_FILE_PATH):
         mH.saveMultiMonitorToolConfig()
 
-    multiMonitorToolOutputPath = os.path.join(dH.getDirectory(), "MultiMonitorTool")
+    multiMonitorToolOutputPath = dH.getDirectory() + r"\MultiMonitorTool"
 
     if not os.path.exists(multiMonitorToolOutputPath):
         os.makedirs(multiMonitorToolOutputPath)
@@ -51,8 +55,8 @@ def read_config():
 
     global AUTOSTART, MULTIMONITORTOOL_PATH, CSV_FILE_PATH, MM_CONFIG_FILE_PATH, MONITOR_NAME
 
-    if not os.path.exists(os.path.join(dH.getDirectory(), asset_iconEnabled)):
-        nH.sendError(config_file_path + fileNotFound)
+    if not os.path.exists(os.path.join(dH.getDirectory(), asset_iconEnabled_path)):
+        nH.sendError(asset_iconEnabled_path + fileNotFound)
         tH.exitItemClicked()
 
     config = configparser.ConfigParser()
@@ -62,9 +66,6 @@ def read_config():
     MULTIMONITORTOOL_PATH = config.get("SETTINGS", "multimonitorpath")
     MONITOR_NAME = config.get("SETTINGS", "monitor_name")
     AUTOSTART = config.get("SETTINGS", "autostart")
-    CSV_FILE_PATH = config.get("DEV", "mm_csv_export_path")
-    MM_CONFIG_FILE_PATH = config.get("DEV", "mm_config_file_path")
-
     check_for_missing_files()
 
 

SimpleMonitorControlTrayModule/configHandler.py

@@ -21,7 +21,9 @@ def isAutostartKeyinRegistry():
 
 def add_to_autostart():
     key = reg.OpenKey(reg.HKEY_CURRENT_USER, registry_key, 0, reg.KEY_WRITE)
-    reg.SetValueEx(key, keyName, 0, reg.REG_SZ, exe_path)
+    reg.SetValueEx(
+        key, keyName, 0, reg.REG_SZ, f'"{exe_path[0].upper() + exe_path[1:]}"'
+    )
     reg.CloseKey(key)
 
 

SimpleMonitorControlTrayModule/registryHandler.py

@@ -4,16 +4,16 @@
 from PIL import Image
 from pystray import MenuItem as item
 
-import SimpleMonitorControlTrayModule.autoStartHandler as aH
 import SimpleMonitorControlTrayModule.configHandler as cH
 import SimpleMonitorControlTrayModule.directoryHandler as dH
 import SimpleMonitorControlTrayModule.monitorHandler as mH
+import SimpleMonitorControlTrayModule.registryHandler as rH
 
 icon = None
 itemTitle = ""
 
 script_dir = dH.getDirectory()
-assets_dir = script_dir + "\\assets"
+assets_dir = script_dir + r"\assets"
 
 imageIconEnabled = Image.open(os.path.join(assets_dir, "iconEnabled.png"))
 imageIconDisabled = Image.open(os.path.join(assets_dir, "iconDisabled.png"))
@@ -45,12 +45,14 @@ def toggleAutostart(icon):
     global itemTitle
     if cH.AUTOSTART == "False":
         itemTitle = "Disable Autostart"
-        aH.addShortcutToStartupFolder()
+        # aH.addShortcutToStartupFolder()
+        rH.add_to_autostart()
         cH.set_config_value("SETTINGS", "autostart", "True")
         cH.AUTOSTART = "True"
     else:
         itemTitle = "Enable Autostart"
-        aH.removeShortcutFromStartupFolder()
+        # aH.removeShortcutFromStartupFolder()
+        rH.remove_from_autostart()
         cH.set_config_value("SETTINGS", "autostart", "False")
         cH.AUTOSTART = "False"
 

SimpleMonitorControlTrayModule/trayHandler.py

@@ -3,7 +3,3 @@ monitor_name = \\.\DISPLAY3
 multimonitorpath = C:\\App_Install\\multimonitortool-x64\\MultiMonitorTool.exe
 autostart = False
 
-[DEV]
-mm_csv_export_path = MultiMonitorTool\multiMonitorToolOutput.csv
-mm_config_file_path = MultiMonitorTool\MultiMonitorToolConfig
-