diff --git a/gui/ui_files/__pycache__.py b/gui/ui_files/__pycache__.py deleted file mode 100644 index 2b5b74d1c3192765a962da0bf5d00e4f31dc1f93..0000000000000000000000000000000000000000 --- a/gui/ui_files/__pycache__.py +++ /dev/null @@ -1,10 +0,0 @@ -# -*- coding: utf-8 -*- - -# Form implementation generated from reading ui file 'D:\irods-clientsb\gui\ui_files\__pycache__' -# -# Created by: PyQt5 UI code generator 5.15.4 -# -# WARNING: Any manual changes made to this file will be lost when pyuic5 is -# run again. Do not edit this file unless you know what you are doing. - - diff --git a/icons/GUI.ico b/icons/GUI.ico new file mode 100644 index 0000000000000000000000000000000000000000..6aa25f2fb3e63295ac9f3febaaace75d782e445f Binary files /dev/null and b/icons/GUI.ico differ diff --git a/pyinstaller_script.py b/pyinstaller_script.py index 64c2cab214d46bc81b23b58548eb99a044022612..f9977c33ff6b09fd1471d051800937bc4dbf3063 100644 --- a/pyinstaller_script.py +++ b/pyinstaller_script.py @@ -28,7 +28,7 @@ def run_cmd(cmd): # Convert the .ui files to .py files def ui_to_py(ui_folder, python): # python -m PyQt5.uic.pyuic -x main.ui -o mainUI.py - for ui_file in glob(ui_folder + '*'): + for ui_file in glob(ui_folder + '*.ui'): filename, ext = path.splitext(ui_file) print(f"Converting {filename} to .py") run_cmd(f"""{python} -m PyQt5.uic.pyuic -x {ui_file} -o {filename +".py"}""") @@ -105,7 +105,7 @@ if __name__ == "__main__": run_cmd(f"{venv_activate} {cmd_sep} pip install -r requirements.txt") # Step 3, Activate venv and tun pyinstaller - run_cmd(f"{venv_activate} {cmd_sep} pyinstaller --clean --noconfirm {getcwd()}{sep}irods-iBridgesGui.py") + run_cmd(f"{venv_activate} {cmd_sep} pyinstaller --clean --noconfirm --icon irods-iBridgesGui.ico irods-iBridgesGui.py") dist_folder = f"{getcwd()}{sep}dist"