Merge pull request #20 from mokurin000/support-fpg

feat: support FreePyGUI

Author: FredHappyface

cli2gui/application/application.py

@@ -1,5 +1,4 @@
-"""Application here uses PySimpleGUI.
-"""
+"""Application here uses PySimpleGUI."""
 
 from __future__ import annotations
 
@@ -27,14 +26,19 @@ def run(buildSpec: types.FullBuildSpec) -> None:
 	# Set the theme
 	theme = helpers.get_base24_theme(buildSpec["theme"], buildSpec["darkTheme"])
 
-	gui_wrapper = {
-		"dearpygui": DearPyGuiWrapper,
-		"pysimplegui": PySimpleGUIWrapper,
-	}.get(buildSpec["gui"], DearPyGuiWrapper)
+	if buildSpec["gui"] in [
+		"pysimplegui",
+		"pysimpleguiqt",
+		"pysimpleguiweb",
+		"freesimplegui",
+	]:
+		gui_wrapper = PySimpleGUIWrapper
+	else:
+		gui_wrapper = DearPyGuiWrapper
 
-	if "pysimplegui" in buildSpec["gui"]:
+	if gui_wrapper is PySimpleGUIWrapper:
 		gui = gui_wrapper(theme, buildSpec["gui"])
-	else:
+	elif gui_wrapper is DearPyGuiWrapper:
 		gui = gui_wrapper(theme)
 
 	def quit_callback() -> None:

cli2gui/decorators.py

@@ -121,8 +121,8 @@ def Click2Gui(
 	----
 		run_function (Callable[..., Any]): The name of the function to call eg.
 		gui (str, optional): Override the gui to use. Current options are:
-		"dearpygui", "pysimplegui", "pysimpleguiqt","pysimpleguiweb". Defaults to
-		"dearpygui".
+		"dearpygui", "pysimplegui", "pysimpleguiqt","pysimpleguiweb","freesimplegui",
+		Defaults to "dearpygui".
 		theme (Union[str, list[str]], optional): Set a base24 theme. Can
 		also pass a base24 scheme file. eg. one-light.yaml. Defaults to "".
 		darkTheme (Union[str, list[str]], optional): Set a base24 dark
@@ -191,8 +191,8 @@ def Cli2Gui(
 		options are: "argparse", "getopt", "optparse", "docopt",
 		"dephell_argparse". Defaults to "argparse".
 		gui (str, optional): Override the gui to use. Current options are:
-		"dearpygui" ,"pysimplegui", "pysimpleguiqt","pysimpleguiweb". Defaults to
-		"dearpygui".
+		"dearpygui", "pysimplegui", "pysimpleguiqt","pysimpleguiweb","freesimplegui",
+		Defaults to "dearpygui".
 		theme (Union[str, list[str]], optional): Set a base24 theme. Can
 		also pass a base24 scheme file. eg. one-light.yaml. Defaults to "".
 		darkTheme (Union[str, list[str]], optional): Set a base24 dark

cli2gui/gui/pysimplegui_wrapper.py

@@ -20,12 +20,16 @@ class PySimpleGUIWrapper(AbstractGUI):
 	def __init__(self, base24Theme: list[str], psg_lib: str) -> None:
 		super().__init__()
 
-		import PySimpleGUI as gui_lib
+		if psg_lib.startswith("pysimplegui"):
+			import PySimpleGUI as gui_lib
+		else:
+			import FreeSimpleGUI as gui_lib
 
 		if psg_lib == "pysimpleguiqt":
 			import PySimpleGUIQt as gui_lib
 		elif psg_lib == "pysimpleguiweb":
 			import PySimpleGUIWeb as gui_lib
+
 		self.sg = gui_lib
 		self.psg_lib = psg_lib
 		self.sizes = {
@@ -38,7 +42,7 @@ def __init__(self, base24Theme: list[str], psg_lib: str) -> None:
 			"text_size": 11,
 		}
 
-		if psg_lib in ["pysimpleguiqt", "pysimpleguiweb"]:
+		if psg_lib not in ["pysimplegui", "freesimplegui"]:
 			self.sizes = {
 				"title_size": 18,
 				"label_size": (600, None),

cli2gui/types.py

@@ -120,8 +120,10 @@ class GUIType(str, Enum):
 	DEFAULT = "pysimplegui"
 	WEB = "pysimpleguiweb"
 	QT = "pysimpleguiqt"
+	FSG = "freesimplegui"
 	"""
 
 	DEFAULT = "pysimplegui"
 	WEB = "pysimpleguiweb"
 	QT = "pysimpleguiqt"
+	FSG = "freesimplegui"

requirements_optional.txt

@@ -6,3 +6,4 @@ catpandoc<2026,>=2024
 dearpygui<2,>=1.11.1
 getostheme<2026,>=2024.0.1
 pysimplegui<6,>=5.0.3
+freesimplegui<6,>=5.0.0