Popups when the ConversionRules folder or the JSON file(s) are missing.

Author: MyNameIsTrez

README.md

@@ -1,15 +1,15 @@
-<p align="center"><img src="media/cclmc-icon.png" alt="Legacy Mod Converter icon"></p>
+<p align="center"><img src="Media/cclmc-icon.png" alt="Legacy Mod Converter icon"></p>
 <h1 align="center">Cortex Command Legacy Mod Converter</h1>
 
 ## Introduction
 This project automates ***most*** of the conversion work required to convert the legacy (old) `Cortex Command` mods into `Cortex Command Community Project` compatible mods.
 
 ## Getting started
-Download the [***Legacy Mod Converter***](http://www.mediafire.com/file/1ncoydmaehf4nyn/Legacy_Mod_Converter.exe/file) program. Create a new folder and put your legacy mods that you want to convert in it. Run the Legacy Mod Converter program.
+Download the [***Legacy Mod Converter***](http://www.mediafire.com/file/ldp5p3l8pzocz3a/Legacy_Mod_Converter.exe/file) program. Create a new folder and put your legacy mods that you want to convert in it. Run the Legacy Mod Converter program.
 
 If you get a "`Microsoft Defender SmartScreen prevented an unrecognized app from starting. Running this app might put your PC at risk.`" popup message when trying to run the program you should press `More info` and then `Run anyway`.
 
-<p align="center"><img src="media/cclmc-screenshot.png" alt="Legacy Mod Converter screenshot"></p>
+<p align="center"><img src="Media/cclmc-screenshot.png" alt="Legacy Mod Converter screenshot"></p>
 
 ## Disclaimer
 This program will do most of the conversion work for you, but some conversion steps are too hard to automate, so it's likely that `CCCP` will still crash or print errors in the console. If this happens you'll have to manually fix these issues in the legacy mod folder. If you want to properly fix these errors then you should download this repository and follow the instructions below so you can add your own conversion cases to `conversion_rules.py`.

main.py

@@ -1,7 +1,5 @@
 # Run manually: python main.py
-
-# Build exe not from spec: pyinstaller --noconsole --onefile --icon=Media/cclmc-icon.ico --add-data "Media/github-icon.png;Media" --add-data "Media/discord-icon.png;Media" --add-data "Media/finish.wav;Media" --name="Legacy Mod Converter" main.py
-# Build exe from spec (can be outdated): pyinstaller "Legacy Mod Converter.spec"
+# Build EXE for CCCP: pyinstaller --noconsole --onefile --icon=Media/cclmc-icon.ico --add-data="Media/github-icon.png;Media" --add-data="Media/discord-icon.png;Media" --add-data="Media/finish.wav;Media" --name="Legacy Mod Converter" main.py
 
 from Python import gui
 

python/convert.py

@@ -1,8 +1,7 @@
-import os, time, shutil, math, re, sys, shutil, zipfile, json, pathlib
+import os, time, shutil, math, re, sys, shutil, zipfile, json, pathlib, webbrowser
 from pathlib import Path
 from jsoncomment import JsonComment
 from playsound import playsound
-import PySimpleGUI as sg
 
 from Python import shared_globals as cfg
 
@@ -29,8 +28,6 @@ def resource_path(relative_path):
 def	load_conversion_rules():
 	json_parser = JsonComment(json)
 
-	github_url = "https://github.com/cortex-command-community/Cortex-Command-Legacy-Mod-Converter"
-
 	json_files_found = 0
 	try:
 		for name in os.listdir("ConversionRules"):
@@ -40,14 +37,17 @@ def	load_conversion_rules():
 					json_files_found += 1
 					conversion_rules.update(json_parser.load(f))
 	except:
-		sg.Popup("The folder 'ConversionRules' wasn't found next to this executable. You can get the missing folder from the Legacy Mod Converter GitHub repo:", github_url)
-		sys.exit()
+		check_github_button_clicked_and_exit(cfg.sg.Popup("The 'ConversionRules' folder wasn't found next to this executable. You can get the missing folder from the Legacy Mod Converter GitHub repo.", title="Missing ConversionRules folder", custom_text="Go to GitHub"))
 
 	if json_files_found == 0:
-		sg.Popup("The folder 'ConversionRules' didn't contain any JSON files. You can get the JSON files from the Legacy Mod Converter GitHub repo:", github_url)
-		sys.exit()
+		check_github_button_clicked_and_exit(cfg.sg.Popup("The 'ConversionRules' folder didn't contain any JSON files. You can get the JSON files from the Legacy Mod Converter GitHub repo.", title="Missing JSON files", custom_text="Go to GitHub"))
+
+
 
-load_conversion_rules()
+def check_github_button_clicked_and_exit(clicked_github_button):
+	if clicked_github_button:
+		webbrowser.open("https://github.com/cortex-command-community/Cortex-Command-Legacy-Mod-Converter")
+	sys.exit()
 
 
 def convert():

python/gui.py

@@ -46,6 +46,9 @@ def init_window():
 		]
 		], title="Convert Mods")]
 	]
+	
+	play_finish_sound_setting = sg.user_settings_get_entry("play_finish_sound")
+	sg.user_settings_set_entry("play_finish_sound", True if play_finish_sound_setting == None else play_finish_sound_setting)
 
 	options_column = [
 		[sg.Frame(layout=[
@@ -59,8 +62,8 @@ def init_window():
 	info_column = [
 		[sg.Frame(layout=[
 		[
-			sg.Image(resource_path("media/github-icon.png"), enable_events=True, key="-GITHUB-", tooltip=" Visit this program's GitHub page ", size=(0, 30)),
-			sg.Image(resource_path("media/discord-icon.png"), enable_events=True, key="-DISCORD-", tooltip=" Visit the CCCP Discord server for help ", size=(0, 30))
+			sg.Image(resource_path("Media/github-icon.png"), enable_events=True, key="-GITHUB-", tooltip=" Visit this program's GitHub page ", size=(0, 30)),
+			sg.Image(resource_path("Media/discord-icon.png"), enable_events=True, key="-DISCORD-", tooltip=" Visit the CCCP Discord server for help ", size=(0, 30))
 		]
 		], title="", pad=((9, 0), (8, 0)))]
 	]
@@ -76,7 +79,9 @@ def init_window():
 	]
 
 	cfg.sg = sg
-	window = sg.Window("Legacy Mod Converter - v1.0", layout, icon=resource_path("media/cclmc-icon.ico"), button_color=(sg.theme_text_color(), "#2a3948"))
+	convert.load_conversion_rules()
+
+	window = sg.Window("Legacy Mod Converter - v1.0", layout, icon=resource_path("Media/cclmc-icon.ico"), button_color=(sg.theme_text_color(), "#2a3948"))
 	cfg.progress_bar = window["-PROGRESS BAR-"]
 
 	return window