Padding updates for new flet version. Cancel button for installer

Author: baebranch

installer/src/main.py

@@ -71,6 +71,8 @@ def download_latest_release(download_dir, pb):
     for chunk in download_response.iter_content(chunk_size=8192):
       file.write(chunk)
       downloaded_size += len(chunk)
+      pb.value = (downloaded_size / total_size)/2
+      pb.update()
   return file_path
 
 
@@ -95,6 +97,7 @@ def main(page: ft.Page):
 
   # UI Config
   done = ft.TextButton("Done", on_click=lambda _: page.window.close(), style=ft.ButtonStyle(shape=ft.RoundedRectangleBorder(radius=5)), visible=False)
+  cancel = ft.TextButton("Cancel", on_click=lambda _: page.window.close(), style=ft.ButtonStyle(shape=ft.RoundedRectangleBorder(radius=5)), visible=True)
   step = ft.Text("Downloading...", size=15)
   pb = ft.ProgressBar(width=430, bar_height=5, height=5)
 
@@ -108,6 +111,7 @@ def main(page: ft.Page):
       step,
       pb,
       ft.Row([
+        cancel,
         done
       ], expand=True)
     ],
@@ -124,12 +128,12 @@ def main(page: ft.Page):
       step.value = "Downloading..."
       pb.value = 0.0
       page.update()
-      zip_path = download_latest_release(temp_dir, pb, step)
+      zip_path = download_latest_release(temp_dir, pb)
 
       # Define the Program Files directory
       # program_files_dir = os.path.join(os.environ['ProgramFiles'], 'Subconscious')
       program_files_dir = "./"
-      step.value = f"Installing to {program_files_dir}..."
+      step.value = f"Installing to {os.path.abspath(program_files_dir)}..."
       pb.value = 0.50
       page.update()
 
@@ -143,6 +147,7 @@ def main(page: ft.Page):
       extract_to_program_files(zip_path, program_files_dir)
       # create_shortcut(os.path.join(program_files_dir, "subconscious.exe"), "Subconscious")
       done.visible = True
+      cancel.visible = False
       step.value = "Installation completed successfully!"
       pb.value = 1.0
       page.update()

src/components/main_window.py

@@ -47,6 +47,7 @@ def __init__(self, lang, settings, update_llms, llm_configured):
 
     self.message_form = ft.TextField(
       hint_text=self.l.chatwindow.hint,
+      hint_style=ft.TextStyle(weight=ft.FontWeight.NORMAL),
       autofocus=True,
       shift_enter=True,
       min_lines=1,
@@ -247,7 +248,7 @@ def render_settings(title, key, val):
       ft.Text(spans=[
         ft.TextSpan("Visit us at: "),
         ft.TextSpan(
-            "subconscious.chat",
+            "Subconscious.chat",
             ft.TextStyle(decoration=ft.TextDecoration.UNDERLINE),
             url="https://subconscious.chat/",
             on_enter=self.highlight_link,
@@ -392,7 +393,7 @@ def new_llm_config(self, event, slug=None, provider=None, model=None, api_key=No
                 border=ft.InputBorder.NONE, border_color=ft.colors.TRANSPARENT,
                 bgcolor=ft.colors.TRANSPARENT, border_radius=5, multiline=False, 
                 clip_behavior=ft.ClipBehavior.HARD_EDGE, 
-                content_padding=ft.padding.only(10, -14, 2, 2),
+                content_padding=ft.padding.only(10, 0, 2, 2),
                 dense=True, hint_text="Enter the LLM model name",
                 hint_style=ft.TextStyle(color=ft.colors.SECONDARY, weight=ft.FontWeight.NORMAL),
               ),
@@ -419,7 +420,7 @@ def new_llm_config(self, event, slug=None, provider=None, model=None, api_key=No
                 border=ft.InputBorder.NONE, border_color=ft.colors.TRANSPARENT,
                 bgcolor=ft.colors.TRANSPARENT, border_radius=5, multiline=False, 
                 clip_behavior=ft.ClipBehavior.HARD_EDGE, 
-                content_padding=ft.padding.only(10, -14, 2, 2),
+                content_padding=ft.padding.only(10, 0, 2, 2),
                 dense=True, password=True, hint_text="Enter the LLM API key if required",
                 hint_style=ft.TextStyle(color=ft.colors.SECONDARY, weight=ft.FontWeight.NORMAL)
               ),
@@ -464,7 +465,7 @@ def new_llm_config(self, event, slug=None, provider=None, model=None, api_key=No
                         border=ft.InputBorder.NONE, border_color=ft.colors.TRANSPARENT,
                         bgcolor=ft.colors.TRANSPARENT, border_radius=5, multiline=False, 
                         clip_behavior=ft.ClipBehavior.HARD_EDGE, 
-                        content_padding=ft.padding.only(10, -14, 2, 2),
+                        content_padding=ft.padding.only(10, 0, 2, 2),
                         dense=True, hint_text="Alias for this model configuration",
                         hint_style=ft.TextStyle(color=ft.colors.SECONDARY, weight=ft.FontWeight.NORMAL),
                       ),
@@ -544,7 +545,7 @@ def chatwindow(self):
                 content=ft.Column([
                   ft.Container(
                     border_radius=ft.BorderRadius(5, 5, 5, 5),
-                    padding=ft.padding.only(4, -15, 4, 0),
+                    padding=ft.padding.only(4, -5, 4, 0),
                     margin=ft.margin.only(0, 0, 0, 0),
                     bgcolor=ft.colors.SECONDARY_CONTAINER,
                     content=ft.Column(

src/subconscious.py

@@ -77,6 +77,7 @@ def main(page: ft.Page):
       self.page = page
       page.padding = 0
       page.spacing = 0
+      page.title = "Subconscious"
       page.locale_configuration
       page.window.min_width = 500
       page.bgcolor = ft.colors.BACKGROUND
@@ -189,7 +190,7 @@ def __initialize_tray_icon(self):
 
     self.__tray_icon = pystray.Icon(
       name="Subconscious",
-      icon=Image.open("./assets/logo.png"),
+      icon=Image.open("./assets/favicon.ico"),
       title="Subconscious",
       menu=pystray.Menu(
         pystray.MenuItem("Open Subconscious", self.__default_tray_option, default=True),