Merge pull request #8 from Mythical-Github/dev

fix(pyproject.toml-and-main.py): fixed icon packaging issue

Author: Mythical-Github

CHANGELOG.md

@@ -1,9 +1,15 @@
+## 1.0.1-dev.14689800227 (2025-04-27)
+
+### Fix
+
+- **pyproject.toml-and-main.py**: fixed icon packaging issue
+
 ## 1.0.0 (2025-04-27)
 
 ### Feat
 
-- **all**: final initial verison
-- **all**: final initial verison
+- **all**: final initial version
+- **all**: final initial version
 - **all**: added localization
 
 ### Fix

README.md

@@ -1 +0,0 @@
-

assets/base/assets/images/project_main_icon.ico

@@ -6,7 +6,7 @@ Next:
 Later:
 
 # have the uninstall and installing check all files were purged/installed at the end and push screen based on that
-    if the passed zip is invalid or something it shouldn't be succesful either
+    if the passed zip is invalid or something it shouldn't be successful either
 
 
 Maybes:

assets/base/assets/images/project_main_icon.png

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "ue4ss_installer_gui"
-version = "1.0.0"
+version = "1.0.1-dev.14689800227"
 description = "GUI installer for UE4SS"
 readme = "README.md"
 requires-python = ">=3.9.1"
@@ -65,7 +65,7 @@ dependencies = [
 
 [tool.hatch.envs.build.scripts]
 exe = [
-  "pyinstaller --noconfirm --onefile --console --name ue4ss_installer_gui --icon=assets/images/project_main_icon.ico --add-data=assets/images/project_main_icon.ico;assets/images/ --add-data=assets/images/project_main_icon.png;assets/images/ src/ue4ss_installer_gui/__main__.pyw"
+  "pyinstaller --noconfirm --onefile --console --name ue4ss_installer_gui --icon=assets/images/project_main_icon.ico src/ue4ss_installer_gui/__main__.pyw"
 ]
 
 [tool.hatch.envs.scripts]

assets/base/assets/localization/en.json

@@ -1,34 +1,34 @@
 {
-    "header_text": "UE4SS",
-    "sub_header_text": "To install UE4SS, choose one of the games below, or add a game manually",
-    "docs_button_text": "Docs",
-    "github_button_text": "Github",
-    "discord_button_text": "Discord",
-    "add_directory_to_scan_for_games_button_text": "Add directory to scan for games",
-    "add_game_by_game_directory": "Add game by game directory",
-    "game_directory_text_label": "Game Directory:",
-    "ue4ss_version_text_label": "UE4SS Version:",
-    "ue4ss_file_to_install_text_label": "Archive to Install:",
-    "enable_pre_releases_text_label": "Enable pre-releases",
-    "keep_mods_and_settings_text_label": "Keep mods and settings",
-    "install_developer_version_text_label": "Install developer version (when applicable)",
-    "install_portable_version_text_label": "Install portable version (when applicable)",
-    "install_button_text": "Install",
-    "install_from_zip_button_text": "Install from zip",
-    "close_button_text": "Close",
-    "uninstall_button_text": "Uninstall",
-    "reinstall_button_text": "Reinstall",
-    "installing_ue4ss_step_text": "Installing UE4SS",
-    "cleaning_up_temp_files_step_text": "Cleaning up temp files",
-    "uninstalling_old_ue4ss_files_step_text": "Uninstalling old UE4SS files",
-    "downloading_ue4ss_zip_step_text": "Downloading UE4SS zip",
-    "install_succeeded_message_text": "The install was successful",
-    "install_failed_message_text": "The install failed",
-    "uninstall_succeeded_message_text": "The uninstall was successful",
-    "uninstall_failed_message_text": "The uninstall failed",
-    "reinstalling_ue4ss_task_text": "Reinstalling UE4SS",
-    "uninstalling_ue4ss_task_text": "Uninstalling UE4SS",
-    "installing_ue4ss_task_text": "Installing UE4SS",
-    "installing_from_zip_ue4ss_task_text": "Installing UE4SS from a zip file",
-    "open_game_exe_directory": "Open game exe directory"
-}
+  "add_directory_to_scan_for_games_button_text": "Add directory to scan for games",
+  "add_game_by_game_directory": "Add game by game directory",
+  "cleaning_up_temp_files_step_text": "Cleaning up temp files",
+  "close_button_text": "Close",
+  "discord_button_text": "Discord",
+  "docs_button_text": "Docs",
+  "downloading_ue4ss_zip_step_text": "Downloading UE4SS zip",
+  "enable_pre_releases_text_label": "Enable pre-releases",
+  "game_directory_text_label": "Game Directory:",
+  "github_button_text": "Github",
+  "header_text": "UE4SS",
+  "install_button_text": "Install",
+  "install_developer_version_text_label": "Install developer version (when applicable)",
+  "install_failed_message_text": "The install failed",
+  "install_from_zip_button_text": "Install from zip",
+  "install_portable_version_text_label": "Install portable version (when applicable)",
+  "install_succeeded_message_text": "The install was successful",
+  "installing_from_zip_ue4ss_task_text": "Installing UE4SS from a zip file",
+  "installing_ue4ss_step_text": "Installing UE4SS",
+  "installing_ue4ss_task_text": "Installing UE4SS",
+  "keep_mods_and_settings_text_label": "Keep mods and settings",
+  "open_game_exe_directory": "Open game exe directory",
+  "reinstall_button_text": "Reinstall",
+  "reinstalling_ue4ss_task_text": "Reinstalling UE4SS",
+  "sub_header_text": "To install UE4SS, choose one of the games below, or add a game manually",
+  "ue4ss_file_to_install_text_label": "Archive to Install:",
+  "ue4ss_version_text_label": "UE4SS Version:",
+  "uninstall_button_text": "Uninstall",
+  "uninstall_failed_message_text": "The uninstall failed",
+  "uninstall_succeeded_message_text": "The uninstall was successful",
+  "uninstalling_old_ue4ss_files_step_text": "Uninstalling old UE4SS files",
+  "uninstalling_ue4ss_task_text": "Uninstalling UE4SS"
+}

assets/to_do_list.txt

@@ -37,5 +37,5 @@
     "TheKillingAntidotePlaytest": "The Killing Antidote Playtest",
     "TheKillingAntidote": "The Killing Antidote",
     "BronzebeardsTavern-Windows": "Bronzebeard's Tavern",
-    os.path.normpath("Aero GPX/WindowsNoEditor"): 'Aero GPX'
+    os.path.normpath("Aero GPX/WindowsNoEditor"): "Aero GPX",
 }

pyproject.toml

@@ -12,9 +12,7 @@
 )
 
 
-PACKED_DIR = (
-    sys._MEIPASS if getattr(sys, 'frozen', False) else SCRIPT_DIR
-)
+PACKED_DIR = sys._MEIPASS if getattr(sys, "frozen", False) else SCRIPT_DIR  # type: ignore
 
 
 def get_all_drive_letter_paths() -> list[str]:
@@ -27,14 +25,14 @@ def get_all_drive_letter_paths() -> list[str]:
 
 
 def get_temp_dir() -> pathlib.Path:
-    return pathlib.Path(os.path.normpath(f'{SCRIPT_DIR}/temp'))
+    return pathlib.Path(os.path.normpath(f"{SCRIPT_DIR}/temp"))
 
 
 def download_file(url, destination_path):
     try:
         with requests.get(url, stream=True) as r:
             r.raise_for_status()
-            with open(destination_path, 'wb') as f:
+            with open(destination_path, "wb") as f:
                 for chunk in r.iter_content(chunk_size=8192):
                     f.write(chunk)
         print(f"Downloaded: {destination_path}")
@@ -43,12 +41,12 @@ def download_file(url, destination_path):
 
 
 def unzip_zip(zip_file: pathlib.Path, output_directory: pathlib.Path):
-    with zipfile.ZipFile(zip_file, 'r') as zip_ref:
+    with zipfile.ZipFile(zip_file, "r") as zip_ref:
         zip_ref.extractall(output_directory)
 
 
 def get_paths_of_files_in_zip(zip_file: pathlib.Path) -> list[str]:
     paths_of_files_in_zip = []
-    with zipfile.ZipFile(zip_file, 'r') as zip_ref:
+    with zipfile.ZipFile(zip_file, "r") as zip_ref:
         paths_of_files_in_zip = zip_ref.namelist()
-    return paths_of_files_in_zip
+    return paths_of_files_in_zip