Replace PySimpleGUI with FreeSimpleGUI

Author: elibroftw

.dockerignore

@@ -18,9 +18,6 @@ src/.flatpak-builder
 .env
 settings.json
 settings.json.bak
-PySimpleGUI.py
-PySimpleGUIWx.py
-tempCodeRunnerFile.py
 test.*
 demo.py
 error.log

.gitignore

@@ -14,9 +14,6 @@ src/.flatpak-builder
 .env
 settings.json
 settings.json.bak
-PySimpleGUI.py
-PySimpleGUIWx.py
-tempCodeRunnerFile.py
 test.*
 demo.py
 error.log

requirements.txt

@@ -25,10 +25,12 @@ git+https://github.com/elibroftw/pypresence.git
 git+https://github.com/andor-pierdelacabeza/PySimpleGUI-4-foss.git/
 git+https://github.com/yt-dlp/yt-dlp.git
 git+https://github.com/elibroftw/youtube-comment-downloader.git
+git+https://github.com/spyoungtech/FreeSimpleGUI/@db26fd15f2abec79fcd93d966c9677e1a3464753
 pyqrcode~=1.2.1
 pystray~=0.19.1
 requests~=2.28
 urllib3~=1.26.7
+FreeSimpleGUI
 waitress~=3.0
 wavinfo~=2.1
 scrapetube

src/gui/__init__.py

@@ -1,4 +1,4 @@
-import PySimpleGUI as Sg
+import FreeSimpleGUI as Sg
 import platform
 from .views import *
 import ctypes

src/gui/components.py

@@ -3,7 +3,7 @@
 import platform
 
 import pyqrcode
-import PySimpleGUI as Sg
+import FreeSimpleGUI as Sg
 from meta import FONT_NORMAL, State
 from PIL import Image, ImageDraw
 

src/gui/views.py

@@ -3,7 +3,7 @@
 from datetime import datetime
 from math import ceil, floor
 
-import PySimpleGUI as Sg
+import FreeSimpleGUI as Sg
 from b64_images import (
     CLEAR_QUEUE,
     COPY_ICON,

src/music_caster.py

@@ -264,7 +264,7 @@ def activate_instance(port=2001, default_timeout=0.5, to_port=2004):
     from modules.resolution_switcher import fmt_res, get_all_resolutions, set_resolution, get_all_refresh_rates, get_initial_res, is_plugged_in, get_initial_dpi_scale
     get_initial_dpi_scale()
     from gui import MainWindow, MiniPlayerWindow, focus_window
-    import PySimpleGUI as Sg
+    import FreeSimpleGUI as Sg
     from modules.db import DatabaseConnection, init_db
 
     # 0.5 seconds gone to 3rd party imports
@@ -3066,7 +3066,7 @@ def activate_gui(selected_tab=None, url_option='url_play'):
                                    use_default_focus=False, keep_on_top=mini_mode and settings['mini_on_top'],
                                    location=window_location, metadata=window_metadata, debugger_enabled=is_debug())
             if State.using_tcl_theme:
-                Sg.PySimpleGUI.TOOLTIP_BACKGROUND_COLOR = settings['theme']['background']
+                Sg.TOOLTIP_BACKGROUND_COLOR = settings['theme']['background']
                 try:
                     if not State.theme_sourced:
                         # as per State.using_tcl_theme, sun_valley_tcl_path exists