SwiftGUI 0.2.0__tar.gz → 0.2.2__tar.gz

{swiftgui-0.2.0 → swiftgui-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: SwiftGUI
-Version: 0.2.0
+Version: 0.2.2
 Summary: An easy-to-use package for creating and using simple GUIs
 License: Apache-2.0
 Author: Eric aka LeButch
@@ -17,7 +17,7 @@ Description-Content-Type: text/markdown
 [Start your journey here](https://github.com/CheesecakeTV/SwiftGUI/wiki/Getting-started#getting-started)
 
 # Still WIP
-Doesn't have a lot of elements yet, but very useful already!
+But growing quickly. Give it 1-2 month and you will use it for every GUI you create.
 
 # SwiftGUI
 
@@ -29,7 +29,15 @@ but their codebase is an utter mess.
 `SwiftGUI` adapts some concepts of `PySimpleGUI`, but is even simpler (in my opinion)
 and allows writing less offputting code.
 
-## install
+## Legal disclaimer
+
+I did not copy any code from the (once) popular Python-package PySimpleGUI.
+
+Even though some of the concepts are simmilar, everything was written bei me or a contributor.
+Element-names like `Table` and `Input` are common and not owned by PySimpleGUI.
+Even if they were, they got published a long time ago under a different license.
+
+# installation
 
 Install using pip:
 ```bash

{swiftgui-0.2.0 → swiftgui-0.2.2}/README.md

@@ -3,7 +3,7 @@
 [Start your journey here](https://github.com/CheesecakeTV/SwiftGUI/wiki/Getting-started#getting-started)
 
 # Still WIP
-Doesn't have a lot of elements yet, but very useful already!
+But growing quickly. Give it 1-2 month and you will use it for every GUI you create.
 
 # SwiftGUI
 
@@ -15,7 +15,15 @@ but their codebase is an utter mess.
 `SwiftGUI` adapts some concepts of `PySimpleGUI`, but is even simpler (in my opinion)
 and allows writing less offputting code.
 
-## install
+## Legal disclaimer
+
+I did not copy any code from the (once) popular Python-package PySimpleGUI.
+
+Even though some of the concepts are simmilar, everything was written bei me or a contributor.
+Element-names like `Table` and `Input` are common and not owned by PySimpleGUI.
+Even if they were, they got published a long time ago under a different license.
+
+# installation
 
 Install using pip:
 ```bash

{swiftgui-0.2.0 → swiftgui-0.2.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "SwiftGUI"
-version = "0.2.0"
+version = "0.2.2"
 packages = [
     { include = "SwiftGUI", from = "src" }
 ]

{swiftgui-0.2.0 → swiftgui-0.2.2}/src/SwiftGUI/GlobalOptions.py

@@ -165,8 +165,6 @@ class Text(Common,Common_Textual):
     takefocus:bool = False
     underline:int = None
     justify:Literal["left","right","center"] = "left"
-    background_color:Color|str = None
-    text_color:Color|str = None
     #borderwidth:int = "5c" # Does not work
 
     padding:Literals.padding = 0
@@ -177,15 +175,12 @@ class Input(Common,Common_Textual):
     width: int = None
     #
     # Standard-Tkinter options
-    cursor: Literals.cursor = None
     take_focus: bool = None
     #
     # Special Tkinter-options
     justify: Literal["left", "right", "center"] = None
-    background_color: str | Color = None
     # background_color_disabled: str | Color = None
     background_color_readonly: str | Color = None
-    text_color: str | Color = None
     text_color_disabled: str | Color = None
     highlightbackground_color: str | Color = None
     selectbackground_color: str | Color = None
@@ -221,9 +216,7 @@ class Button(Common,Common_Textual):
 
     underline: int = None
     justify: Literal["left", "right", "center"] = None
-    background_color: str | Color = None
     overrelief: Literals.relief = None
-    text_color: str | Color = None
 
     relief: Literals.relief = None
 
@@ -238,17 +231,10 @@ class Frame(Common):
     relief:Literals.relief = "flat"
     #background = "blue"
     alignment:Literals.alignment = None
-    background_color: Color | str = None
 
 class Checkbox(Common,Common_Textual):
     key: any = None
     default_value: bool = False
-    fonttype: str = None
-    fontsize: int = None
-    font_bold: bool = None
-    font_italic: bool = None
-    font_underline: bool = None
-    font_overstrike: bool = None
     readonly: bool = None
     # borderwidth:int = None
     #
@@ -264,16 +250,11 @@ class Checkbox(Common,Common_Textual):
     padx: int = None
     pady: int = None
     #
-    cursor: Literals.cursor = None
-    takefocus: bool = None
     #
     underline: int = None
-    anchor: Literals.anchor = None
     justify: Literal["left", "right", "center"] = None
-    background_color: str | Color = None
     overrelief: Literals.relief = None
     offrelief: Literals.relief = None
-    text_color: str | Color = None
     relief: Literals.relief = None
     # hilightbackground_color: str | Color = None
     # highlightcolor: str | Color = None
@@ -296,30 +277,25 @@ class Window(DEFAULT_OPTIONS_CLASS):
 class Listbox(Common,Common_Textual):
     activestyle:Literals.activestyle = "none"
     default_list: Iterable[str] = None
-    fonttype: str = None
-    fontsize: int = None
-    font_bold: bool = None
-    font_italic: bool = None
-    font_underline: bool = None
-    font_overstrike: bool = None
     disabled: bool = None
     borderwidth: int = None
-    background_color: str | Color = None
     background_color_selected: str | Color = None
     selectborderwidth: int = None
-    text_color: str | Color = None
     text_color_selected: str | Color = None
     text_color_disabled: str | Color = None
     selectmode: Literals.selectmode_single = "browse"
     width: int = None
     height: int = None
-    cursor: Literals.cursor = None
-    takefocus: bool = False
     relief: Literals.relief = None
     highlightbackground_color: str | Color = None
     highlightcolor: str | Color = None
     highlightthickness: int = None
 
+class FileBrowseButton(Button):
+    file_browse_type: Literals.file_browse_types = "open_single"
+    file_browse_filetypes: Literals.file_browse_filetypes = (("All files","*"),)
+    dont_change_on_abort: bool = False
+
 def reset_all_options():
     """
     Reset everything done to the global options on runtime.

{swiftgui-0.2.0 → swiftgui-0.2.2}/src/SwiftGUI/Literals.py

@@ -1,3 +1,4 @@
+from collections.abc import Iterable
 from typing import Literal
 
 # Not only literals, but typehints in General...
@@ -24,3 +25,5 @@ activestyle = Literal["none","underline","dotbox"]
 selectmode_single = Literal["browse","single"]
 selectmode_multiple = Literal["browse","single","multiple","extended"]
 
+file_browse_types = Literal["open_single","open_multiple","open_directory","save_single"]
+file_browse_filetypes = Iterable[tuple[str, str | list[str] | tuple[str, ...]]]

{swiftgui-0.2.0 → swiftgui-0.2.2}/src/SwiftGUI/Widgets/Button.py

@@ -129,8 +129,8 @@ class Button(BaseWidget):
             "underline":underline,
             "justify":justify,
             "background_color":background_color,
-            "highlightbackground_color":"red",
-            "highlightthickness":5,
+            # "highlightbackground_color":"red",
+            # "highlightthickness":5,
             "highlightcolor":"purple",
             "relief":relief,
             "text_color":text_color,

swiftgui-0.2.2/src/SwiftGUI/WidgetsAdvanced/FileBrowseButton.py

@@ -0,0 +1,249 @@
+import inspect
+import tkinter as tk
+from os import PathLike
+from tkinter import filedialog as fd
+import tkinter.font as font
+from collections.abc import Iterable, Callable
+from typing import Literal
+
+from SwiftGUI import BaseElement, ElementFlag, BaseWidget, BaseWidgetContainer, GlobalOptions, Literals, Color
+from SwiftGUI.Widgets.Button import Button
+
+
+class FileBrowseButton(Button):
+    """
+    Copy this class ot create your own Widget
+
+    The following methods are to be overwritten if needed:
+    _get_value  (determines the value returned by this widget)
+    _init_widget_for_inherrit   (Initializes the widget)
+    """
+    tk_widget:tk.Button
+    _tk_widget_class:type = tk.Button # Class of the connected widget
+    defaults = GlobalOptions.FileBrowseButton
+
+    def __init__(
+            # https://anzeljg.github.io/rin2/book2/2405/docs/tkinter/button.html
+
+            self,
+            # Add here
+            text:str = "",
+            /,
+            key:any = None,
+            key_function:Callable|Iterable[Callable] = None,
+
+            file_browse_type:Literals.file_browse_types = None, #{"defaultextension","parent","title"}
+            file_browse_initial_dir: PathLike|str = None, # initialdir
+            file_browse_filetypes: Literals.file_browse_filetypes = None, # filetypes
+            file_browse_initial_file: str = None, # initialfile
+            file_browse_title: str = None,  # title
+            file_browse_save_defaultextension: str = None, # defaultextension
+            # Todo: parent
+            dont_change_on_abort: bool = None,
+
+            borderwidth:int = None,
+
+            bitmap:Literals.bitmap = None,
+            disabled:bool = None,
+            text_color_disabled: str | Color = None,
+            background_color_active: str | Color = None,
+            text_color_active: str | Color = None,
+
+            width: int = None,
+            height: int = None,
+            padx:int = None,
+            pady:int = None,
+
+            cursor: Literals.cursor = None,
+            takefocus: bool = None,
+
+            underline: int = None,
+            anchor: Literals.anchor = None,
+            justify: Literal["left", "right", "center"] = None,
+            background_color: str | Color = None,
+            overrelief: Literals.relief = None,
+            text_color: str | Color = None,
+            # Todo: image
+            relief: Literals.relief = None,
+
+            repeatdelay:int = None,
+            repeatinterval:int = None,
+
+            # # Mixed options
+            fonttype: str = None,
+            fontsize: int = None,
+            font_bold: bool = None,
+            font_italic: bool = None,
+            font_underline: bool = None,
+            font_overstrike: bool = None,
+
+            expand: bool = None,
+            tk_kwargs: dict[str:any] = None
+    ):
+        """
+        A button that throws an event every time it is pushed
+
+        :param text: Text the button displays
+        :param key: (See docs for more details)
+        :param key_function: (See docs for more details)
+
+        :param file_browse_type: Type of filebrowser (e.g. getting a single file, saving a file, etc.)
+        :param file_browse_initial_dir: Directory to start browsing in. "." to start in the working dir, ".." for the dir above.
+        :param file_browse_filetypes: Possible types when reading files. Format like this: (("Description1":".extension1"), ("Description2":".extension2"))
+        :param file_browse_initial_file: IT WON'T SELECT THE FILE, just put the filename inside the box on the bottom
+        :param file_browse_title: Title of the file-browse-window
+        :param file_browse_save_defaultextension: When saving, this extension will be added if the user doesn't provide an extension
+        :param dont_change_on_abort: If True, the value will not change when the user cancels/closes the file-browse
+
+        :param borderwidth: Border-Thickness in pixels. Default is 2
+        :param bitmap: The are a couple of icons builtin. If you are using PyCharm, they should be suggested when pressing "ctrl+space"
+        :param disabled: True, if this button should not be pressable
+        :param text_color_disabled: Text color, if disabled = True
+        :param background_color_active: Background color shown only when the button is held down
+        :param text_color_active: Text color only shown when the button is held down
+        :param width: Button-size in x-direction in text-characters
+        :param height: Button-height in text-rows
+        :param padx: Adds space to both sides not filled with text. Should not be combined with "width". The value is given in characters
+        :param pady: Adds space to the top and bottom not filled with text. Should not be combined with "height". The value is given in rows
+        :param cursor: How the cursor should look when hovering over this element.
+        :param takefocus: True, if this element should be able to get focus (e.g. by pressing tab)
+        :param underline: Underlines the single character at this index
+        :param anchor: Specifies, where the text in this element should be placed (See docs for more details)
+        :param justify: When the text is multiple rows long, this will specify where the new rows begin.
+        :param background_color: Background-color for the non-pressed state
+        :param overrelief: Relief when the mouse hovers over the element
+        :param text_color: Text-color in non-pressed state
+        :param relief: Relief in non-pressed state
+        :param repeatdelay: How long to hold the button until repeation starts (doesn't work without "repeatinterval")
+        :param repeatinterval: How long to wait between repetitions (doesn't work without "repeatdelay")
+        :param fonttype: Use sg.font_windows. ... to select some fancy font. Personally, I like sg.font_windows.Small_Fonts
+        :param fontsize: Size (height) of the font in pixels
+        :param font_bold: True, if thicc text
+        :param font_italic: True, if italic text
+        :param font_underline: True, if the text should be underlined
+        :param font_overstrike: True, if the text should be overstruck
+        :param tk_kwargs: (Only if you know tkinter) Pass more kwargs directly to the tk-widget
+        """
+        if callable(key_function):
+            key_function = (self._button_callback,key_function)
+        elif key_function:
+            key_function = (self._button_callback,*tuple(key_function))
+        else:
+            key_function = self._button_callback
+
+        super().__init__(
+            text,
+            key=key,
+            key_function=key_function,
+            borderwidth=borderwidth,
+            bitmap=bitmap,
+            disabled=disabled,
+            text_color_disabled=text_color_disabled,
+            background_color_active=background_color_active,
+            text_color_active=text_color_active,
+            width=width,
+            height=height,
+            padx=padx,
+            pady=pady,
+            cursor=cursor,
+            takefocus=takefocus,
+            underline=underline,
+            anchor=anchor,
+            justify=justify,
+            background_color=background_color,
+            overrelief=overrelief,
+            text_color=text_color,
+            relief=relief,
+            repeatdelay=repeatdelay,
+            repeatinterval=repeatinterval,
+            fonttype=fonttype,
+            fontsize=fontsize,
+            font_bold=font_bold,
+            font_italic=font_italic,
+            font_underline=font_underline,
+            font_overstrike=font_overstrike,
+            expand=expand,
+            tk_kwargs=tk_kwargs,
+        )
+
+        self._file_function_kwargs = dict()
+
+        self.update(
+            file_browse_type = file_browse_type,
+            file_browse_initial_dir = file_browse_initial_dir,
+            file_browse_filetypes = file_browse_filetypes,
+            file_browse_initial_file = file_browse_initial_file,
+            file_browse_title = file_browse_title,
+            file_browse_save_defaultextension = file_browse_save_defaultextension,
+
+            dont_change_on_abort=dont_change_on_abort,
+        )
+
+    _prev_val:str|tuple[str] = None
+    _file_function_wanted = None
+    _dont_change_on_abort = None    # If the value should be unchanged if the user just closes the window
+    def _button_callback(self):
+        if self._file_function is None:
+            return
+
+        # Only provide arguments the file-function actually wants
+        kwargs = self._file_function_kwargs
+        offers = kwargs.fromkeys(kwargs.keys() & self._file_function_wanted)
+        offers = {i:kwargs[i] for i in offers}
+
+        # Call the file-dialogue
+        temp = self._file_function(**offers)
+
+        if self._dont_change_on_abort and not temp:
+            return
+
+        self._prev_val = temp
+        return True # Refresh values for coming key_functions
+
+    def _get_value(self) -> any:
+        return self._prev_val
+
+    def set_value(self,val:any):
+        self._prev_val = val
+
+    _file_function: Callable = None
+    _file_function_kwargs: dict
+    def _update_special_key(self,key:str,new_val:any) -> bool|None:
+        if super()._update_special_key(key,new_val):
+            return True
+
+        match key:
+            case "file_browse_type":
+                self._file_function = {
+                    "open_single": fd.askopenfilename,
+                    "open_multiple": fd.askopenfilenames,
+                    "open_directory": fd.askdirectory,
+                    "save_single": fd.asksaveasfilename,
+                }[new_val]
+                self._file_function_wanted = {
+                    "open_single": {"defaultextension","filetypes","initialdir","initialfile","parent","title"},
+                    "open_multiple": {"defaultextension","filetypes","initialdir","initialfile","parent","title"},
+                    "open_directory": {"initialdir","mustexist","parent","title"},
+                    "save_single": {"defaultextension","filetypes","initialdir","initialfile","parent","title"},
+                }[new_val]
+
+            case "file_browse_initial_dir":
+                self._file_function_kwargs["initialdir"] = new_val
+            case "file_browse_filetypes":
+                self._file_function_kwargs["filetypes"] = new_val
+            case "file_browse_initial_file":
+                self._file_function_kwargs["initialfile"] = new_val
+            case "dont_change_on_abort":
+                self._dont_change_on_abort = new_val
+            case "file_browse_title":
+                self._file_function_kwargs["title"] = new_val
+            case "file_browse_save_defaultextension":
+                self._file_function_kwargs["file_browse_save_defaultextension"] = new_val
+            case _:
+                return False
+
+        return True
+
+    def _personal_init_inherit(self):
+        pass    # Avoid creating a target variable for this button, so the text can be changed with .update(text="...")
+

{swiftgui-0.2.0 → swiftgui-0.2.2}/src/SwiftGUI/Windows.py

@@ -279,9 +279,11 @@ class Window(BaseElement):
             key_function = (key_function,)
 
         def single_event(*_):
-            self.refresh_values()
+            did_refresh = False
 
             if key_function: # Call key-functions
+                self.refresh_values()
+
                 kwargs = {  # Possible parameters for function
                     "w": self,  # Reference to main window
                     "e": key,   # Event-key, if there is one
@@ -293,12 +295,21 @@ class Window(BaseElement):
                 for fkt in key_function:
                     wanted = set(inspect.signature(fkt).parameters.keys())
                     offers = kwargs.fromkeys(kwargs.keys() & wanted)
+                    did_refresh = False
 
-                    fkt(**{i:kwargs[i] for i in offers})
+                    if fkt(**{i:kwargs[i] for i in offers}) is not None:
+                        kwargs["val"] = me.value
+                        self.refresh_values()
+                        did_refresh = True
 
-                self.refresh_values() # In case you change values with the key-functions
+                if not did_refresh:
+                    self.refresh_values() # In case you change values with the key-functions
+                    did_refresh = True
 
             if key is not None: # Call named event
+                if not did_refresh: # Not redundant, keep it!
+                    self.refresh_values()
+
                 self._receive_event(key)
 
         return single_event

{swiftgui-0.2.0 → swiftgui-0.2.2}/src/SwiftGUI/__init__.py

@@ -18,6 +18,7 @@ from .Widgets.Spacer import Spacer
 from .Widgets.Listbox import Listbox
 
 from .WidgetsAdvanced.Form import Form
+from .WidgetsAdvanced.FileBrowseButton import FileBrowseButton
 
 T = Text
 
@@ -31,7 +32,7 @@ Check = Checkbox
 
 Column = Frame
 
-AnyElement = BaseElement | BaseWidget | Text | Button | Checkbox | Frame | Input | VerticalSeparator | HorizontalSeparator | Spacer | Form | Listbox
+AnyElement = BaseElement | BaseWidget | Text | Button | Checkbox | Frame | Input | VerticalSeparator | HorizontalSeparator | Spacer | Form | Listbox | FileBrowseButton
 
 from .Windows import Window