Skip to content

Commit a468119

Browse files
committed
1.04
Update 1.04 improved interface
1 parent 9a2aac2 commit a468119

File tree

7 files changed

+35
-18
lines changed

7 files changed

+35
-18
lines changed

Definitive-SMR-Launcher/interface_manager.pyw

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ def unload_map():
1818
__main__.gRemoveSymlink.configure(state="disabled")
1919

2020
def interface_manager(os,ctk):
21-
22-
2321
__main__.error_logs("[interface] Setting up interface", "info")
2422
__main__.gLog_button = ctk.CTkButton(__main__.gApp, text="Logs", corner_radius=0, command=__main__.debug_window, width=40) # Logs Button
2523
__main__.gStart_button = ctk.CTkButton(__main__.gApp, text="Start Game", command=__main__.game_launcher, corner_radius=0) # Start Game Button
@@ -85,7 +83,7 @@ def interface_manager(os,ctk):
8583
command=lambda: __main__.map_editor("toggle")
8684
)
8785

88-
86+
__main__.gInterface_canvas.create_window(25, 690, window=__main__.gStart_button, anchor="w")
8987
__main__.gInterface_canvas.create_window(25, 180, window=__main__.gUpdate_maps_button, anchor="w")
9088
__main__.gInterface_canvas.create_window(25, 220, window=__main__.gGameTypeDrop, anchor="w")
9189
__main__.gInterface_canvas.create_window(25, 260, window=__main__.gCustom_exe_button, anchor="w")

Definitive-SMR-Launcher/load_map_rating.pyw

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ def load_map_ratings_matrix(force_refresh=False):
8080

8181
for map_id, info in data.items():
8282
map_ids.append(map_id)
83-
map_names.append(info.get("Map Name", map_id)) # fallback to ID
83+
map_names.append(info.get("map_name", map_id)) # fallback to ID
8484
urls.append(info.get("url", ""))
8585
is_stable.append(info.get("is_stable", "")) # fallback empty
8686
multiplayer.append(info.get("multiplayer", "")) # fallback empty

Definitive-SMR-Launcher/main.pyw

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ import sys # System-specific parameters and functions
44
import time
55
import threading
66
import shutil
7+
import ctypes
78
from ctypes import windll # Windows API access (e.g., DPI awareness)
89
from functools import partial # Pass arguments into callbacks
910

@@ -116,8 +117,8 @@ if __name__ == '__main__':
116117
gGitHubBranch = "main"
117118
gGitHubOwner = "ageekhere"
118119
gGitHubRepo = "Definitive-SMR-Launcher"
119-
gGitHubVersion: str = "version1.03"
120-
gVersion: str = "1.03"
120+
gGitHubVersion: str = "version1.04"
121+
gVersion: str = "1.04"
121122
ginternetArchiveIdentifier = "sid-meiers-railroads-custom-maps-collection"
122123

123124
# ---------------------- Fonts / Geometry ----------------------
@@ -134,6 +135,7 @@ if __name__ == '__main__':
134135
error_logs(f"[Main] Python version: {sys.version}")
135136

136137
ctk.deactivate_automatic_dpi_awareness()
138+
137139
error_logs("[Main] Disabled DPI awareness", "info")
138140

139141
ctk.set_appearance_mode("dark")

Definitive-SMR-Launcher/map_manager.pyw

Lines changed: 15 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -93,21 +93,30 @@ def map_manager():
9393
info_btn_color = "#1f6aa5"
9494
info_btn_textcolor = "#ffffff"
9595

96-
display_text = ellipsize(map_folder, 30)
97-
map_name = display_text
98-
96+
display_text = ellipsize(map_folder, 99)
97+
map_name = map_folder
98+
99+
if __main__.get_map_data(map_name, __main__.gMap_rating_matrix,"id") != None:
100+
display_text = __main__.get_map_data(map_folder, __main__.gMap_rating_matrix,"name")
101+
display_text = ellipsize(display_text, 27)
102+
103+
if __main__.get_map_data(map_folder, __main__.gMap_rating_matrix,"Map Name") != None:
104+
map_name = __main__.get_map_data(map_folder, __main__.gMap_rating_matrix,"Map Name")
105+
99106
if __main__.get_map_data(map_folder, __main__.gMap_rating_matrix,"is_stable") == "n":
100107
info_btn_textcolor = "black"
101108
info_btn_color = "#d48806"
102109
display_text = "⚠ " + display_text
103-
display_text += "\n"
110+
104111

105112
if __main__.get_map_data(map_folder, __main__.gMap_rating_matrix,"multiplayer") == "n":
106-
display_text += "👤 "
113+
display_text += "\n 👤 "
107114
elif __main__.get_map_data(map_folder, __main__.gMap_rating_matrix,"multiplayer") == "y":
108-
display_text += "👤👤 "
115+
display_text += "\n 👤👤 "
109116

110117
if __main__.get_map_data(map_name, __main__.gMap_rating_matrix,"id") != None:
118+
119+
111120
rating_list =__main__.get_map_rating(str(__main__.get_map_data(map_name, __main__.gMap_rating_matrix,"url")))
112121

113122
text_value = float(rating_list[6].strip("()").split("/")[0])

Definitive-SMR-Launcher/map_update_worker.pyw

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,5 +42,4 @@ def map_update_worker():
4242
except Exception as e:
4343
__main__.error_logs(f"[map_update_worker] Error in download thread: {e}", "error")
4444

45-
__main__.stopThread()
46-
#__main__.gCancel_button.configure(state="disabled")
45+
__main__.stopThread()

Definitive-SMR-Launcher/map_updater.pyw

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ Uses globals and imports from main.py.
66
"""
77

88
import __main__ # Access main's globals and imports
9+
from tkinter import messagebox
910

1011
def map_updater():
1112
"""
@@ -66,8 +67,16 @@ def map_updater():
6667
checkbox_vars[value] = var
6768
__main__.gUpdateCheckBoxes[str(value[0])] = checkbox
6869

70+
def disable_close():
71+
if install_button.cget("state") == "disabled":
72+
messagebox.showwarning(
73+
"Please wait",
74+
"Downloads are still in progress Press Cancel to stop the download.",parent=__main__.gUpdateWindow)
75+
6976
# --- Function to install selected maps ---
7077
def install_maps():
78+
__main__.gUpdateWindow.protocol("WM_DELETE_WINDOW", disable_close)
79+
7180
__main__.gDownloadList = [name[0] for name, var in checkbox_vars.items() if var.get() == 1]
7281
__main__.error_logs(f"[map_updater] install list {__main__.gDownloadList}", "info")
7382
install_button.configure(state="disabled")

Definitive-SMR-Launcher/version/version_info.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ VSVersionInfo(
66
ffi=FixedFileInfo(
77
# filevers and prodvers should be always a tuple with four items: (1, 2, 3, 4)
88
# Set not needed items to zero 0.
9-
filevers=(1, 0, 3, 0),
10-
prodvers=(1, 0, 3, 0),
9+
filevers=(1, 0, 4, 0),
10+
prodvers=(1, 0, 4, 0),
1111
# Contains a bitmask that specifies the valid bits 'flags'r
1212
mask=0x3f,
1313
# Contains a bitmask that specifies the Boolean attributes of the file.
@@ -31,12 +31,12 @@ VSVersionInfo(
3131
u'040904B0',
3232
[StringStruct(u'CompanyName', u'ageekhere'),
3333
StringStruct(u'FileDescription', u'Definitive-SMR-Launcher'),
34-
StringStruct(u'FileVersion', u'1.030'),
34+
StringStruct(u'FileVersion', u'1.040'),
3535
StringStruct(u'InternalName', u'Definitive-SMR-Launcher'),
3636
StringStruct(u'LegalCopyright', u'ageekhere'),
3737
StringStruct(u'OriginalFilename', u'Definitive-SMR-Launcher'),
3838
StringStruct(u'ProductName', u'Definitive-SMR-Launcher'),
39-
StringStruct(u'ProductVersion', u'1.0.3.0')])
39+
StringStruct(u'ProductVersion', u'1.0.4.0')])
4040
]),
4141
VarFileInfo([VarStruct(u'Translation', [1033, 1200])])
4242
]

0 commit comments

Comments
 (0)