minor gui enhancements. remove sizes config

Author: FredHappyface

README.md

@@ -28,7 +28,6 @@ Use this module to convert a CLI program to a GUI
 	- [gui (optional)](#gui-optional)
 	- [theme (optional)](#theme-optional)
 	- [darkTheme (optional)](#darktheme-optional)
-	- [sizes (optional)](#sizes-optional)
 	- [image (optional)](#image-optional)
 	- [program\_name (optional)](#program_name-optional)
 	- [program\_description (optional)](#program_description-optional)
@@ -268,21 +267,6 @@ Set a base24 dark theme variant. Can also pass a base24 scheme file. eg.
 		"#e48bff"])
 ```
 
-### sizes (optional)
-
-Set the UI sizes such as the button size
-
-```python
-@Cli2Gui(sizes={
-		"title_size": 28,
-		"label_size": (30, None),
-		"input_size": (30, 1),
-		"button":(10, 1),
-		"padding":(5, 10),
-		"helpText_size": 14,
-		"text_size": 11})
-```
-
 ### image (optional)
 
 Set the program icon. File extensions can be any that PIL supports

cli2gui/decorators.py

@@ -107,7 +107,6 @@ def Click2Gui(
 	gui: str | GUIType = "dearpygui",
 	theme: str | list[str] = "",
 	darkTheme: str | list[str] = "",
-	sizes: str | dict[str, int] = "",
 	image: str = "",
 	program_name: str = "",
 	program_description: str = "",
@@ -129,8 +128,6 @@ def Click2Gui(
 		darkTheme (Union[str, list[str]], optional): Set a base24 dark
 		theme variant. Can also pass a base24 scheme file. eg. one-dark.yaml.
 		Defaults to "".
-		sizes (Union[dict[str, int]], optional): Set the UI sizes such as
-		the button size. Defaults to "".
 		image (str, optional): Set the program icon. File
 		extensions can be any that PIL supports. Defaults to "".
 		program_name (str, optional): Override the program name.
@@ -155,7 +152,6 @@ def Click2Gui(
 		gui=gui,
 		theme=theme,
 		darkTheme=darkTheme,
-		sizes=sizes,
 		image=image,
 		program_name=program_name,
 		program_description=program_description,
@@ -176,7 +172,6 @@ def Cli2Gui(
 	gui: str | ParserType = "dearpygui",
 	theme: str | list[str] = "",
 	darkTheme: str | list[str] = "",
-	sizes: str | dict[str, int] = "",
 	image: str = "",
 	program_name: str = "",
 	program_description: str = "",
@@ -203,8 +198,6 @@ def Cli2Gui(
 		darkTheme (Union[str, list[str]], optional): Set a base24 dark
 		theme variant. Can also pass a base24 scheme file. eg. one-dark.yaml.
 		Defaults to "".
-		sizes (Union[dict[str, int]], optional): Set the UI sizes such as
-		the button size. Defaults to "".
 		image (str, optional): Set the program icon. File
 		extensions can be any that PIL supports. Defaults to "".
 		program_name (str, optional): Override the program name.
@@ -228,7 +221,6 @@ def Cli2Gui(
 		gui=gui,
 		theme=theme,
 		darkTheme=darkTheme,
-		sizes=sizes,
 		image=image,
 		program_name=program_name,
 		program_description=program_description,

cli2gui/gui/dearpygui_wrapper.py

@@ -186,7 +186,7 @@ def main(
 			)
 			dpg.add_theme_color(
 				dpg.mvThemeCol_MenuBarBg,
-				hex_to_rgb(self.base24Theme[2]),
+				hex_to_rgb(self.base24Theme[0]),
 				category=dpg.mvThemeCat_Core,
 			)
 			dpg.add_theme_color(
@@ -284,7 +284,11 @@ def main(
 		# Create Window, set up Menu and Widgets
 		################
 
-		dpg.create_viewport(title=buildSpec["program_name"], width=875, height=600)
+		dpg.create_viewport(
+			title=buildSpec["program_name"],
+			width=875,
+			height=min(max(400, 120 * buildSpec["max_args_shown"]), 1080),
+		)
 
 		with dpg.window(label="", tag="primary"):
 			if len(buildSpec["menu"]) > 0:

cli2gui/gui/pysimplegui_wrapper.py

@@ -40,7 +40,7 @@ def __init__(self, base24Theme: list[str], psg_lib: str) -> None:
 
 		if psg_lib in ["pysimpleguiqt", "pysimpleguiweb"]:
 			self.sizes = {
-				"title_size": 28,
+				"title_size": 18,
 				"label_size": (600, None),
 				"input_size": (30, 1),
 				"button": (10, 1),
@@ -387,9 +387,15 @@ def createLayout(
 						argConstruct,
 						size=(
 							850,
-							buildSpec["max_args_shown"]
-							* 3.5
-							* (self.sizes["help_text_size"] + self.sizes["text_size"]),
+							min(
+								max(
+									280,
+									buildSpec["max_args_shown"]
+									* 3.5
+									* (self.sizes["help_text_size"] + self.sizes["text_size"]),
+								),
+								700,
+							),
 						),
 						pad=(0, 0),
 						scrollable=True,

cli2gui/types.py

@@ -18,7 +18,6 @@ class BuildSpec(TypedDict):
 	gui: str | GUIType
 	theme: str | list[str]
 	darkTheme: str | list[str]
-	sizes: str | dict[str, Any]
 	image: str
 	program_name: str
 	program_description: str
@@ -83,7 +82,6 @@ class FullBuildSpec(TypedDict):
 	gui: str
 	theme: str | list[str]
 	darkTheme: str | list[str]
-	sizes: str | dict[str, Any]
 	image: str
 	program_name: str
 	program_description: str

documentation/reference/README.md

@@ -7,9 +7,13 @@ A full list of `Cli2gui` project modules.
 - [Cli2gui](cli2gui/index.md#cli2gui)
     - [Application](cli2gui/application/index.md#application)
         - [Application](cli2gui/application/application.md#application)
-        - [Pysimplegui2args](cli2gui/application/pysimplegui2args.md#pysimplegui2args)
-        - [Widgets](cli2gui/application/widgets.md#widgets)
+        - [Application2args](cli2gui/application/application2args.md#application2args)
     - [Decorators](cli2gui/decorators.md#decorators)
+    - [Gui](cli2gui/gui/index.md#gui)
+        - [AbstractGUI](cli2gui/gui/abstract_gui.md#abstractgui)
+        - [DearPyGuiWrapper](cli2gui/gui/dearpygui_wrapper.md#dearpyguiwrapper)
+        - [Helpers](cli2gui/gui/helpers.md#helpers)
+        - [PySimpleGUIWrapper](cli2gui/gui/pysimplegui_wrapper.md#pysimpleguiwrapper)
     - [Tojson](cli2gui/tojson/index.md#tojson)
         - [Argparse2json](cli2gui/tojson/argparse2json.md#argparse2json)
         - [Click2json](cli2gui/tojson/click2json.md#click2json)

documentation/reference/cli2gui/application/application.md

@@ -5,140 +5,11 @@
 > Auto-generated documentation for [cli2gui.application.application](../../../../cli2gui/application/application.py) module.
 
 - [Application](#application)
-  - [addItemsAndGroups](#additemsandgroups)
-  - [createLayout](#createlayout)
-  - [generatePopup](#generatepopup)
-  - [isDarkMode](#isdarkmode)
   - [run](#run)
-  - [setBase24Theme](#setbase24theme)
-  - [setupWidgets](#setupwidgets)
-  - [themeFromFile](#themefromfile)
-
-## addItemsAndGroups
-
-[Show source in application.py:178](../../../../cli2gui/application/application.py#L178)
-
-Add arg_items and groups to the argConstruct list.
-
-#### Arguments
-
-----
- - `section` *types.Group* - contents/ section containing name, arg_items
- and groups
- - `argConstruct` *list[list[Element]]* - list of widgets to
- add to the program window
- - `widgets` *Widgets* - widgets object used to generate widgets to add to
- argConstruct
-
-#### Returns
-
--------
- - `list[list[Element]]` - updated argConstruct
-
-#### Signature
-
-```python
-def addItemsAndGroups(
-    section: types.Group, argConstruct: list[list[Element]], widgets: Widgets
-) -> list[list[Element]]: ...
-```
-
-#### See also
-
-- [Widgets](./widgets.md#widgets)
-
-
-
-## createLayout
-
-[Show source in application.py:284](../../../../cli2gui/application/application.py#L284)
-
-Create the pysimplegui layout from the build spec.
-
-#### Arguments
-
-----
- - `buildSpec` *types.FullBuildSpec* - build spec containing widget
- - `widgets` *Widgets* - class to build widgets
- - `pySimpleGui` *Any* - version of PySimpleGui to use
- - `menu` *list[str]]* - menu data
-
-#### Returns
-
--------
- - `list[list[Element]]` - list of widgets (layout list)
-
-#### Signature
-
-```python
-def createLayout(
-    buildSpec: types.FullBuildSpec,
-    widgets: Widgets,
-    pySimpleGui: Any,
-    menu: str | list[str],
-) -> list[list[Element]]: ...
-```
-
-#### See also
-
-- [Widgets](./widgets.md#widgets)
-
-
-
-## generatePopup
-
-[Show source in application.py:212](../../../../cli2gui/application/application.py#L212)
-
-Create the popup window.
-
-#### Arguments
-
-----
- - `buildSpec` *types.FullBuildSpec* - [description]
- values (Union[dict[Any, Any]): Returned when a button is clicked. Such
- as the menu
- - `widgets` *Widgets* - class to build widgets
- - `pySimpleGui` *Any* - PySimpleGui class
-
-#### Returns
-
--------
- - `pySimpleGui.Window` - A PySimpleGui Window
-
-#### Signature
-
-```python
-def generatePopup(
-    buildSpec: types.FullBuildSpec,
-    values: dict[Any, Any] | list[Any],
-    widgets: Widgets,
-    pySimpleGui: Any,
-) -> Window: ...
-```
-
-#### See also
-
-- [Widgets](./widgets.md#widgets)
-
-
-
-## isDarkMode
-
-[Show source in application.py:15](../../../../cli2gui/application/application.py#L15)
-
-Monkeypatch for getostheme.isDarkMode.
-
-#### Signature
-
-```python
-def isDarkMode() -> bool: ...
-```
-
-
 
 ## run
 
-[Show source in application.py:350](../../../../cli2gui/application/application.py#L350)
+[Show source in application.py:17](../../../../cli2gui/application/application.py#L17)
 
 Establish the main entry point.
 
@@ -152,81 +23,4 @@ Establish the main entry point.
 
 ```python
 def run(buildSpec: types.FullBuildSpec) -> None: ...
-```
-
-
-
-## setBase24Theme
-
-[Show source in application.py:44](../../../../cli2gui/application/application.py#L44)
-
-Set the base24 theme to the application.
-
-#### Arguments
-
-----
- theme (Union[str, list[str]]): the light theme
- darkTheme (Union[str, list[str]]): the dark theme
- - `pySimpleGui` *Any* - pysimplegui module
-
-#### Signature
-
-```python
-def setBase24Theme(
-    theme: str | list[str], darkTheme: str | list[str], pySimpleGui: Any
-) -> None: ...
-```
-
-
-
-## setupWidgets
-
-[Show source in application.py:135](../../../../cli2gui/application/application.py#L135)
-
-Set the widget sizes to the application.
-
-#### Arguments
-
-----
- - `gui` *str* - user selected gui eg. pysimpleguiqt
- sizes (Union[dict[str, Any]]): widget sizes
- - `pySimpleGui` *Any* - pysimplegui module
-
-#### Returns
-
--------
- - `Widgets` - widgets object all set up nicely
-
-#### Signature
-
-```python
-def setupWidgets(gui: str, sizes: dict[str, Any], pySimpleGui: Any) -> Widgets: ...
-```
-
-#### See also
-
-- [Widgets](./widgets.md#widgets)
-
-
-
-## themeFromFile
-
-[Show source in application.py:28](../../../../cli2gui/application/application.py#L28)
-
-Set the base24 theme from a base24 scheme.yaml to the application.
-
-#### Arguments
-
-----
- - `themeFile` *str* - path to file
-
-#### Returns
-
--------
- - `list[str]` - theme to set
-
-#### Signature
-
-```python
-def themeFromFile(themeFile: str) -> list[str]: ...
 ```