fix: Various UI tweaks, improvements

tomlin7 · Oct 7, 2024 · 0ca0777 · 0ca0777
1 parent 404235f
commit 0ca0777
Show file tree

Hide file tree

Showing 9 changed files with 28 additions and 119 deletions.
diff --git a/src/biscuit/views/ai/ai.py b/src/biscuit/views/ai/ai.py
@@ -48,6 +48,8 @@ def __init__(self, master, *args, **kwargs) -> None:
         self.chat = None
         self.api_key = ""
 
+        self.title.grid_forget()
+
         self.api_providers = {
             "Gemini 1.5 Flash": Gemini1p5Flash,
         }
@@ -60,8 +62,8 @@ def __init__(self, master, *args, **kwargs) -> None:
             callback=self.set_current_provider,
         )
         self.top.grid_columnconfigure(self.column, weight=1)
-        self.dropdown.grid(row=0, column=self.column, sticky=tk.NSEW, padx=(0, 10))
-        self.column += 1
+
+        self.dropdown.grid(row=0, column=0, sticky=tk.NSEW, padx=(0, 10))
 
         self.menu = AIMenu(self)
         self.menu.add_command("New Chat", self.new_chat)

diff --git a/src/biscuit/views/debug/debug.py b/src/biscuit/views/debug/debug.py
@@ -28,18 +28,18 @@ def __init__(self, master, *args, **kwargs) -> None:
         self.running = False
         self.manager = self.base.debugger_manager
 
+        self.top.pack_forget()
+
         self.dropdown = Dropdown(
-            self.top,
+            self,
             icon=Icons.PLAY,
             callback=self.set_config,
             iconfg="#87d282",
             iconhfg="#87d282",
             empty_message=EMPTY_MESSAGE,
         )
         self.dropdown.icon_label.bind("<Button-1>", self.run_config)
-        self.top.grid_columnconfigure(self.column, weight=1)
-        self.dropdown.grid(row=0, column=self.column, sticky=tk.NSEW, padx=(0, 10))
-        self.column += 1
+        self.dropdown.pack(fill=tk.X, padx=10, pady=10)
 
         self.configs = {}
         self.selected_config = ""

diff --git a/src/biscuit/views/explorer/explorer.py b/src/biscuit/views/explorer/explorer.py
@@ -7,7 +7,6 @@
 from ..sidebar_view import SideBarView
 from .directorytree import DirectoryTree
 from .menu import ExplorerMenu
-from .open_editors import OpenEditors
 
 
 class Explorer(SideBarView):
@@ -24,17 +23,12 @@ def __init__(self, master, *args, **kwargs) -> None:
         self.__icon__ = Icons.HOME
         self.name = "Explorer"
 
-        self.menu = ExplorerMenu(self, "files")
-        self.menu.add_checkable(
-            "Open Editors", self.toggle_active_editors, checked=True
-        )
-        self.menu.add_separator(10)
-        self.menu.add_command("Search", self.base.commands.search_files)
-        self.add_action(Icons.ELLIPSIS, self.menu.show)
+        # self.menu = ExplorerMenu(self, "files")
+        # self.menu.add_command("Search", self.base.commands.search_files)
+        # self.add_action(Icons.ELLIPSIS, self.menu.show)
+
+        self.top.pack_forget()
 
-        self.active_editors_visible = True
-        self.open_editors = OpenEditors(self)
-        self.open_editors.pack(fill=tk.X)
         self.directory = DirectoryTree(self, observe_changes=True)
         self.add_item(self.directory)
 
@@ -76,13 +70,6 @@ def __init__(self, master, *args, **kwargs) -> None:
         )
         self.base.palette.register_actionset(lambda: self.rename_actionset)
 
-    def toggle_active_editors(self):
-        if self.active_editors_visible:
-            self.open_editors.pack_forget()
-        else:
-            self.open_editors.pack(fill=tk.X, before=self.directory)
-        self.active_editors_visible = not self.active_editors_visible
-
     def get_actionset(self, term: str) -> ActionSet:
         self.filesearch_actionset.update(self.filesearch(term))
         return self.filesearch_actionset

diff --git a/src/biscuit/views/explorer/open_editors.py b/src/biscuit/views/explorer/open_editors.py
diff --git a/src/biscuit/views/explorer/placeholder.py b/src/biscuit/views/explorer/placeholder.py
@@ -18,39 +18,27 @@ def __init__(self, master, *args, **kwargs) -> None:
 
         WrappingLabel(
             self,
-            text="You have not yet opened a folder.",
+            text="No folder opened",
             font=self.base.settings.uifont,
             anchor=tk.W,
             **self.base.theme.views.sidebar.item.content
         ).grid(row=0, sticky=tk.EW)
 
-        open_btn = IconLabelButton(
+        open_btn = Button(
             self,
             text="Open Folder",
-            icon=Icons.FOLDER,
-            callback=self.open_folder,
+            command=self.open_folder,
             pady=2,
-            highlighted=True,
         )
         open_btn.grid(row=1, pady=5, sticky=tk.EW)
 
-        WrappingLabel(
-            self,
-            text="You can clone a repository locally.",
-            font=self.base.settings.uifont,
-            anchor=tk.W,
-            **self.base.theme.views.sidebar.item.content
-        ).grid(row=2, sticky=tk.EW)
-
-        clone_btn = IconLabelButton(
+        clone_btn = Button(
             self,
-            text="Clone Repository",
-            icon=Icons.REPO_CLONE,
-            callback=self.clone_repo,
+            text="Clone Repo",
+            command=self.clone_repo,
             pady=2,
-            highlighted=True,
         )
-        clone_btn.grid(row=3, pady=5, sticky=tk.EW)
+        clone_btn.grid(row=3, sticky=tk.EW)
 
     def open_folder(self, *_) -> None:
         self.base.commands.open_directory()

diff --git a/src/biscuit/views/outline/outline.py b/src/biscuit/views/outline/outline.py
@@ -31,6 +31,8 @@ def __init__(self, master, *args, **kwargs) -> None:
         self.__icon__ = Icons.SYMBOL_CLASS
         self.name = "Outline"
 
+        self.top.pack_forget()
+
         self.tree = OutlineTree(self)
         self.add_item(self.tree)
 

diff --git a/src/biscuit/views/search/search.py b/src/biscuit/views/search/search.py
@@ -27,6 +27,8 @@ def __init__(self, master, *args, **kwargs) -> None:
         self.name = "Search"
         self.searchterm = tk.StringVar(self)
 
+        self.top.pack_forget()
+
         self.results = Results(self, **self.base.theme.views.sidebar.item)
 
         self.container = Frame(self, **self.base.theme.views.sidebar)

diff --git a/src/biscuit/views/sidebar_item_toolbar.py b/src/biscuit/views/sidebar_item_toolbar.py
@@ -24,7 +24,7 @@ def __init__(self, master, title: str, buttons=(), *args, **kwargs) -> None:
             self,
             anchor=tk.W,
             textvariable=self.title,
-            font=self.base.settings.uifont_bold,
+            font=self.base.settings.uifont,
             **self.base.theme.views.sidebar.itembar.title
         )
         self.label_title.grid(row=0, column=1, sticky=tk.EW)

diff --git a/src/biscuit/views/sidebar_view.py b/src/biscuit/views/sidebar_view.py
@@ -27,13 +27,14 @@ def __init__(
         self.top.pack(fill=tk.X, padx=(15, 10), pady=7)
         self.top.grid_columnconfigure(0, weight=1)
 
-        tk.Label(
+        self.title = tk.Label(
             self.top,
             text=name.upper() if name else self.__class__.__name__.upper(),
             anchor=tk.W,
             font=self.base.settings.uifont,
             **self.base.theme.views.sidebar.title
-        ).grid(row=0, column=0, sticky=tk.EW)
+        )
+        self.title.grid(row=0, column=0, sticky=tk.EW)
 
         self.column = 1
         if not self.__actions__: