Merge pull request #256 from sparkmicro/dev

GUI improvements

kintree/gui/gui.py

@@ -1,5 +1,8 @@
+import os
 import flet as ft
 
+from ..config import settings
+
 from .views.common import update_theme, handle_transition
 from .views.main import (
     PartSearchView,
@@ -21,6 +24,10 @@ def init_gui(page: ft.Page):
     page.horizontal_alignment = ft.CrossAxisAlignment.CENTER
     page.vertical_alignment = ft.MainAxisAlignment.CENTER
     page.scroll = ft.ScrollMode.ALWAYS
+
+    # Window Icon
+    page.window.icon = os.path.join(settings.PROJECT_DIR, 'gui', 'logo.ico')
+    page.window.title_bar_hidden = True
 
     # Theme
     update_theme(page)

kintree/gui/views/main.py

@@ -24,16 +24,19 @@
 
 # Main AppBar
 main_appbar = ft.AppBar(
-    leading=ft.Container(
-        content=ft.Image(
-            src=os.path.join(settings.PROJECT_DIR, 'gui', 'logo.png'),
-            fit=ft.ImageFit.CONTAIN,
+    leading=ft.WindowDragArea(
+        ft.Container(
+            content=ft.Image(
+                src=os.path.join(settings.PROJECT_DIR, 'gui', 'logo.ico'),
+                fit=ft.ImageFit.CONTAIN,
+            ),
+            padding=ft.padding.only(left=10),
+            expand=True,
         ),
-        padding=ft.padding.only(left=10),
-        expand=True,
+        maximizable=True,
     ),
     leading_width=40,
-    title=ft.Text(f'Ki-nTree | {__version__}'),
+    title=ft.WindowDragArea(ft.Text(f'Ki-nTree | {__version__}'), maximizable=True),
     center_title=False,
     bgcolor=ft.colors.SURFACE_VARIANT,
     actions=[],
@@ -116,11 +119,17 @@ def __init__(self, page: ft.Page):
 
         # Update application bar
         if not self.appbar.actions:
-            self.appbar.actions.append(
-                ft.IconButton(
-                    ft.icons.SETTINGS,
-                    on_click=self.call_settings,
-                )
+            self.appbar.actions.extend(
+                [
+                    ft.IconButton(
+                        ft.icons.SETTINGS,
+                        on_click=self.call_settings,
+                    ),
+                    ft.IconButton(
+                        ft.icons.CLOSE,
+                        on_click=lambda _: page.window.close(),
+                    ),
+                ]
             )
         else:
             self.appbar.actions[0].on_click = self.call_settings

kintree/kintree_gui.py

@@ -5,6 +5,6 @@
 
 def main(view='flet_app'):
     if view == 'browser':
-        ft.app(target=kintree_gui, view=ft.WEB_BROWSER)
+        ft.app(target=kintree_gui, view=ft.AppView.WEB_BROWSER)
         return
-    ft.app(target=kintree_gui, view=ft.FLET_APP)
+    ft.app(target=kintree_gui, view=ft.AppView.FLET_APP)

kintree/search/element14_api.py

@@ -330,7 +330,7 @@ def test_api(store_url=None) -> bool:
             'store_url': 'www.newark.com',
             'part_number': 'BLM18AG601SN1D',
             'expected': {
-                'displayName': 'Ferrite Bead, 0603 [1608 Metric], 600 ohm, 500 mA, BLM18A Series, 0.38 ohm, ± 25%',
+                'displayName': 'Ferrite Bead, 0603 [1608 Metric], 600 ohm, 500 mA, EMIFIL BLM18AG Series, 0.38 ohm, ± 25%',
                 'brandName': 'MURATA',
                 'translatedManufacturerPartNumber': 'BLM18AG601SN1D',
             }

pyproject.toml

@@ -14,7 +14,7 @@ keywords = ["inventree", "kicad", "digikey", "mouser", "component", "part", "cre
 python = ">=3.9,<3.12"
 digikey-api = "^1.0.0"
 # digikey-api = { git = "https://github.com/hurricaneJoef/digikey-api.git", branch = "master" }
-flet = "^0.23.0"
+flet = "^0.24.1"
 thefuzz = "^0.19.0"
 inventree = "^0.14.0"
 kiutils = "^1.4.0"