From 3d9086b89aaacc1719dd283edce73252dea96727 Mon Sep 17 00:00:00 2001 From: admin Date: Sun, 11 Feb 2024 15:13:11 +0100 Subject: [PATCH] windows install instructions update, small gui tweaks --- install-windows-instructions.md | 31 +++++++++++++++++++++++++ install-windows.txt | 18 --------------- install.bat | 1 + install-linux.sh => install.sh | 0 src/gui_main.py | 41 ++++++++++++++++++++++----------- 5 files changed, 60 insertions(+), 31 deletions(-) create mode 100755 install-windows-instructions.md delete mode 100755 install-windows.txt create mode 100644 install.bat rename install-linux.sh => install.sh (100%) diff --git a/install-windows-instructions.md b/install-windows-instructions.md new file mode 100755 index 0000000..a77bce3 --- /dev/null +++ b/install-windows-instructions.md @@ -0,0 +1,31 @@ +## download this repo to pc or use git + +### install git + +[download link](https://git-scm.com/downloads) + +### clone repo + +```git clone https://weforgecode.xyz/Spitfire/Launcher.git``` + +## download python 3.11.x and pip (installs with python) + +### install python + +[download link](https://www.python.org/downloads/release/python-3118/) + +### restart computer to refresh system variables after python install + +## install dependencies + +### run this to install deps + +```./install.bat``` + +### run the app using + +```./run.bat``` + +### build app using + +```./build.bat``` diff --git a/install-windows.txt b/install-windows.txt deleted file mode 100755 index 770cf59..0000000 --- a/install-windows.txt +++ /dev/null @@ -1,18 +0,0 @@ -# install msys2 -https://www.msys2.org/ - -# update msys2 -pacman -Suy - -# install python && pip in msys2 -pacman -S mingw-w64-x86_64-gcc mingw-w64-x86_64-python3 mingw-w64-x86_64-python3-pip mingw-w64-x86_64-python3-setuptools - -# install packages from requirements.txt (in msys2 mingw64) -pip install -r requirements.txt - -# if it does not work by pip, install python-pillow in msys2 -pacman -S mingw-w64-x86_64-python-pillow - -# add python (default: C:\msys2\mingw64\bin) to system variable PATH - -# restart computer to refresh system variables, and if done well you should be able to build and run this app \ No newline at end of file diff --git a/install.bat b/install.bat new file mode 100644 index 0000000..5f4235b --- /dev/null +++ b/install.bat @@ -0,0 +1 @@ +python -m pip install -r requirements.txt \ No newline at end of file diff --git a/install-linux.sh b/install.sh similarity index 100% rename from install-linux.sh rename to install.sh diff --git a/src/gui_main.py b/src/gui_main.py index 450a95c..e1b788f 100644 --- a/src/gui_main.py +++ b/src/gui_main.py @@ -9,7 +9,7 @@ from gui_starfield import StarField from json_main import save_package, get_default_packages def run_installer(download_folder_tmp, col_isDark): - global visible_widgets, tab_combobox # Declare tab_combobox as a global variable + global visible_widgets, tab_combobox, progress_bar # Declare tab_combobox as a global variable app = CTk() app.geometry("800x600") @@ -28,7 +28,7 @@ def run_installer(download_folder_tmp, col_isDark): print("Could not get theme from system.") def start_install(): - switch_to_tab("Tab3") + switch_to_tab("Install") progress_label = CTkLabel(master=container, text="Download in progress...") threading.Thread( @@ -137,37 +137,52 @@ def run_installer(download_folder_tmp, col_isDark): def func1(): print("ON") + global progress_bar + progress_bar = 10 def func2(): print("OFF") tabs = { - "Tab1": [ + "Start": [ (CTkComboBox, {"text": "Language", "values": ["London", "Britan", "New York"]}), (CTkComboBox, {"text": "Theme", "values": [f"System {'(Dark)' if col_isDark else '(Light)'}", "Light", "Dark"]}), - (CTkCheckBox, {"text": f"Force {'dark' if col_isDark else 'light'} mode", "command_on": func1, "command_off": func2}), + (CTkCheckBox, {"text": f"Force {'dark' if col_isDark else 'light'} mode\non every website", "command_on": func1, "command_off": func2}), (CTkButton, {"text": "Install", "command": start_install}), (CTkButton, {"text": "Customise", "command": switch_to_next_tab}), ], - "Tab2": [ - (CTkButton, {"text": "Next Tab", "command": switch_to_next_tab}), + "Fingerprinting": [ + (CTkComboBox, {"text": "Privacy", "values": ["Compatability", "High", "Schyzo"]}), + (CTkCheckBox, {"text": f"Allow web pages to acess \nsystem language, time and theme", "command_on": func1, "command_off": func2}), + (CTkCheckBox, {"text": f"Allow web pages to acess \ninformation about operating system", "command_on": func1, "command_off": func2}), + (CTkCheckBox, {"text": f"Allow web pages to acess \nscreen resolution and referesh rate", "command_on": func1, "command_off": func2}), (CTkButton, {"text": "Previous Tab", "command": switch_to_previous_tab}), - CTkButton, - CTkCheckBox, - CTkComboBox, - CTkEntry, - CTkProgressBar + (CTkButton, {"text": "Next Tab", "command": switch_to_next_tab}), ], - "Tab3": [ + "Annoyences": [ + (CTkCheckBox, {"text": f"Block ADs", "command_on": func1, "command_off": func2}), + (CTkCheckBox, {"text": f"Block Cookie pop-ups", "command_on": func1, "command_off": func2}), + (CTkCheckBox, {"text": f"Skip sponosored parts on YouTube", "command_on": func1, "command_off": func2}), + (CTkButton, {"text": "Previous Tab", "command": switch_to_previous_tab}), + (CTkButton, {"text": "Next Tab", "command": switch_to_next_tab}), + ], + "Install-path": [ + CTkEntry, + (CTkCheckBox, {"text": f"Check for updates\non system startup", "command_on": func1, "command_off": func2}), + (CTkButton, {"text": "Previous Tab", "command": switch_to_previous_tab}), + (CTkButton, {"text": "Install", "command": switch_to_next_tab}), + ], + "Install": [ CTkProgressBar, (CTkButton, {"text": "Start Install", "command": start_install}) ] + # add CTkSwitch } visible_widgets = [] container = CTkFrame(app) - container.pack(ipadx="100") + container.pack(ipadx="110") display_star_field(container)