windows install instructions update, small gui tweaks

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```

install-windows.txt

@@ -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

install.bat

@@ -0,0 +1 @@
+python -m pip install -r requirements.txt

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": [
+        "Fingerprinting": [
-            (CTkButton, {"text": "Next Tab", "command": switch_to_next_tab}),
+            (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,
+            (CTkButton, {"text": "Next Tab", "command": switch_to_next_tab}),
-            CTkCheckBox,
-            CTkComboBox,
-            CTkEntry,
-            CTkProgressBar
         ],
-        "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)