1.01

Fixed issue where gCustomExe was not being set on load, resulting in wrong exe being used.

Fixed some interface issues.

Author: ageekhere

Definitive-SMR-Launcher/autopytoexe/autopytoexe_config.json

@@ -173,10 +173,6 @@
    "optionDest": "datas",
    "value": "./Definitive-SMR-Launcher/exe;exe/"
   },
-  {
-   "optionDest": "datas",
-   "value": "./Definitive-SMR-Launcher/icon;icon/"
-  },
   {
    "optionDest": "datas",
    "value": "./Definitive-SMR-Launcher/interface;interface/"
@@ -188,6 +184,18 @@
   {
    "optionDest": "datas",
    "value": "./Definitive-SMR-Launcher/interface/background.jpg;."
+  },
+  {
+   "optionDest": "datas",
+   "value": "./Definitive-SMR-Launcher/tool_tip.pyw;."
+  },
+  {
+   "optionDest": "copy_metadata",
+   "value": "imageio"
+  },
+  {
+   "optionDest": "datas",
+   "value": "./Definitive-SMR-Launcher/icon/icon.ico;."
   }
  ],
  "nonPyinstallerOptions": {

Definitive-SMR-Launcher/game_launcher.pyw

@@ -24,8 +24,8 @@ def game_launcher():
     runexe = "RailRoads.exe"
 
     # Check if user wants to use custom OpenSpy exe
-    if getattr(__main__, "gCustomExe", False):
-        gametype = __main__.get_config_value("USERINFO", "gametype") or "Steam"
+    if (__main__.gCustomExe == True):
+        gametype = __main__.get_config_value("gametype")
         if gametype == "Steam":
             runexe = "RailRoads_Steam_LAA_OpenSpy.exe"
         else:
@@ -36,9 +36,22 @@ def game_launcher():
 
     exe_path = __main__.os.path.join(__main__.gGamePath, runexe)
 
+    # Check if file exists
+    if not __main__.os.path.isfile(exe_path):
+        __main__.error_logs(f"[game_launcher] File not found: {exe_path}", "error")
+        return
+
+    workdir = __main__.os.path.dirname(exe_path)
+
     try:
-        ret = windll.shell32.ShellExecuteW(None, "runas", exe_path, None, None, 1)
+        ret = windll.shell32.ShellExecuteW(None, "runas", exe_path, None, workdir, 1)
+
+        # Log the return code
+        __main__.error_logs(f"[game_launcher] ShellExecute return code: {ret}", "info")
+
         if ret <= 32:
-            __main__.error_logs("[game_launcher] Cannot start game", "error")
+            __main__.error_logs(f"[game_launcher] Cannot start game, error code {ret}", "error")
+            return
+
     except Exception as e:
         __main__.error_logs(f"[game_launcher] Error starting game: {e}", "error")

Definitive-SMR-Launcher/gamepath_manager.pyw

@@ -19,7 +19,7 @@ def gamepath_manager():
 
             # Update label in UI
             __main__.gGameLocation_label.configure(
-                text=str(__main__.string_utils(folder_path, max_length=180, placeholder="..."))
+                text=str(__main__.string_utils(folder_path, max_length=30, placeholder="..."))
             )
 
             # Update global variables

Definitive-SMR-Launcher/interface_manager.pyw

@@ -30,7 +30,7 @@ def interface_manager(os,ctk):
     __main__.gCustom_difficulty = ctk.IntVar(value=int(__main__.get_config_value("customdifficulty", default="0")))
     __main__.gCustom_levels_button = ctk.CTkCheckBox(
         __main__.gApp,
-        text="Custom Difficulty Levels",
+        text="Custom Difficulty Levels  ",
         variable=__main__.gCustom_difficulty,
         corner_radius=0,
         command=__main__.difficulty_manager
@@ -62,7 +62,7 @@ def interface_manager(os,ctk):
     __main__.gCustom_exe = ctk.IntVar(value=int(__main__.get_config_value("enableopenspy", default="0")))
     __main__.gCustom_exe_button = ctk.CTkCheckBox(
         __main__.gApp,
-        text="Enable OpenSpy LAA exe",
+        text="Enable OpenSpy LAA exe  ",
         variable=__main__.gCustom_exe,
         corner_radius=0,
         command=__main__.custom_exe_manager
@@ -86,7 +86,8 @@ def interface_manager(os,ctk):
         __main__.gCustom_exe_button.configure(state="disabled")
         __main__.gGameTypeDrop.configure(state="disabled")
     else:
-        __main__.gGameLocation_label.configure(text=str(__main__.string_utils(__main__.gGamePath, max_length=40, placeholder="...")))
+        __main__.gGameLocation_label.configure(text=str(__main__.string_utils(__main__.gGamePath, max_length=30, placeholder="...")))
+        __main__.ToolTip(__main__.gGameLocation_label, str(__main__.gGamePath))
         __main__.error_logs(f"[interface] Game Path " + str(__main__.gGamePath), "info")
         __main__.gCustom_levels_button.configure(state="normal")
         __main__.gStart_button.configure(state="normal")

Definitive-SMR-Launcher/main.pyw

@@ -48,9 +48,9 @@ from archive_maps import archive_maps
 from set_game_type_selection import set_game_type_selection
 from gamepath_manager import gamepath_manager
 from github_update import github_update
+from tool_tip import ToolTip
 
 def stopThread():
-    print("thread")
     gStopDownload.set()
     time.sleep(1.0)
 if __name__ == '__main__': 
@@ -81,8 +81,8 @@ if __name__ == '__main__':
     # Internet Archive
     ginternetArchiveIdentifier = "sid-meiers-railroads-custom-maps-collection"
 
-    gVersion:str = "1.00" # App version
-    gGitHubVersion:str = "version1.00"
+    gVersion:str = "1.01" # App version
+    gGitHubVersion:str = "version1.01"
     gBackGroundImageUrl:str = r"interface\background.jpg"
     gCustom_difficulty = None
     gCustom_exe = None
@@ -94,7 +94,7 @@ if __name__ == '__main__':
     gGameDocs = None
     gSelected_button = None
     gGameLocation_label = None
-    gCustomExe = False
+    
     gAppWidth = 1280 
     gAppHeight = 720
     gMain_font = ctk.CTkFont(family="arial", size=19,weight="bold")
@@ -124,6 +124,10 @@ if __name__ == '__main__':
     gApp.geometry(f"{gAppWidth}x{gAppHeight}+{mainWindowX}+{mainWindowY}") # Set the app geometry so that it is centered 
     create_icon(sys) # Create an icon for the app
 
+    gCustomExe = False
+    if get_config_value("enableopenspy") == "1":
+        gCustomExe = True
+
     if getattr(sys, 'frozen', False): # Running as a PyInstaller bundle
         bg_image_path = os.path.join(sys._MEIPASS, "background.jpg")
         error_logs("[Main] Background path " + str(bg_image_path),"info")
@@ -171,10 +175,5 @@ if __name__ == '__main__':
     download_dir_path.mkdir(parents=True, exist_ok=True)
 
     interface_manager(os,ctk)
-
     github_update()
-    gApp.mainloop()
-
-
-
-
+    gApp.mainloop()

Definitive-SMR-Launcher/tool_tip.pyw

@@ -0,0 +1,39 @@
+import tkinter as tk
+
+class ToolTip:
+    def __init__(self, widget, text):
+        self.widget = widget
+        self.text = text
+        self.tip_window = None
+
+        widget.bind("<Enter>", self.show_tip)
+        widget.bind("<Leave>", self.hide_tip)
+
+    def show_tip(self, event=None):
+        if self.tip_window is not None:
+            return
+
+        x = event.x_root + 10
+        y = event.y_root + 10
+
+        self.tip_window = tw = tk.Toplevel(self.widget)
+        tw.wm_overrideredirect(True)
+        tw.wm_geometry(f"+{x}+{y}")
+
+        label = tk.Label(
+            tw,
+            text=self.text,
+            background="#333333",
+            foreground="white",
+            borderwidth=1,
+            relief="solid",
+            padx=5,
+            pady=3
+        )
+        label.pack()
+
+    def hide_tip(self, event=None):
+        tw = self.tip_window
+        self.tip_window = None
+        if tw:
+            tw.destroy()

Definitive-SMR-Launcher/version/version_info.txt

@@ -6,8 +6,8 @@ VSVersionInfo(
   ffi=FixedFileInfo(
     # filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
     # Set not needed items to zero 0.
-    filevers=(1, 0, 0, 0),
-    prodvers=(1, 0, 0, 0),
+    filevers=(1, 0, 1, 0),
+    prodvers=(1, 0, 1, 0),
     # Contains a bitmask that specifies the valid bits 'flags'r
     mask=0x3f,
     # Contains a bitmask that specifies the Boolean attributes of the file.
@@ -31,12 +31,12 @@ VSVersionInfo(
           u'040904B0',
           [StringStruct(u'CompanyName', u'ageekhere'),
           StringStruct(u'FileDescription', u'Definitive-SMR-Launcher'),
-          StringStruct(u'FileVersion', u'1.000'),
+          StringStruct(u'FileVersion', u'1.010'),
           StringStruct(u'InternalName', u'Definitive-SMR-Launcher'),
           StringStruct(u'LegalCopyright', u'ageekhere'),
           StringStruct(u'OriginalFilename', u'Definitive-SMR-Launcher'),
           StringStruct(u'ProductName', u'Definitive-SMR-Launcher'),
-          StringStruct(u'ProductVersion', u'1.0.0.0')])
+          StringStruct(u'ProductVersion', u'1.0.1.0')])
     ]), 
     VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
   ]