Custom Titlebar and Window design

bot/helpers/cmdhelper.py

@@ -149,7 +149,7 @@ async def send_message(ctx, embed_obj: dict, extra_title="", extra_message="", d
         msg_style = "codeblock"
 
     if msg_style == "codeblock":
-        description = re.sub(r"[*_~`]", "", codeblock_desc).lower()
+        description = re.sub(r"[*_~`]", "", codeblock_desc)
         if title == theme.title:
             title = f"{theme.emoji} {title}"
 
@@ -159,17 +159,17 @@ async def send_message(ctx, embed_obj: dict, extra_title="", extra_message="", d
 
         msg = await ctx.send(
             str(codeblock.Codeblock(
-                title=title.lower(),
-                description=description.lower(),
-                extra_title=extra_title.lower(),
-                # footer=footer.lower()
+                title=title,
+                description=description,
+                extra_title=extra_title,
+                # footer=footer
             )),
             delete_after=delete_after
         )
 
     elif msg_style == "image":
         title = remove_emojis(title.replace(theme.emoji, "").lstrip())
-        embed2 = imgembed.Embed(title=title.lower(), description=description.lower(), colour=colour)
+        embed2 = imgembed.Embed(title=title, description=description, colour=colour)
         embed2.set_footer(text=footer)
         embed2.set_thumbnail(url=thumbnail)
         embed_file = embed2.save()
@@ -181,8 +181,8 @@ async def send_message(ctx, embed_obj: dict, extra_title="", extra_message="", d
         if title == theme.title:
             title = f"{theme.emoji} {title}"
         embed = discord.Embed(
-            title=title.lower(),
-            description=description.lower(),
+            title=title,
+            description=description,
             colour=discord.Color.from_str(colour)
         )
         embed.set_footer(text=footer)

compile.py

@@ -1,18 +1,40 @@
 import os
-import sys
 import platform
 import subprocess
+import plistlib
+
+from utils.config import VERSION
+
+
+def patch_macos_plist(app_name):
+    plist_path = os.path.join("dist", f"{app_name}.app", "Contents", "Info.plist")
+
+    if not os.path.exists(plist_path):
+        print("Info.plist not found, skipping version patch")
+        return
+
+    with open(plist_path, "rb") as f:
+        plist = plistlib.load(f)
+
+    plist["CFBundleShortVersionString"] = VERSION  # About menu
+    plist["CFBundleVersion"] = VERSION              # build number
+
+    with open(plist_path, "wb") as f:
+        plistlib.dump(plist, f)
+
+    print(f"Patched Info.plist with version {VERSION}")
+
 
 def build():
     system = platform.system()
-    
+
     name = "Ghost"
     entry_script = "ghost.py"
     icon = "data/icon-win.png" if system == "Windows" else "data/icon.png"
 
-    common_args = [
+    args = [
         "pyinstaller",
-        "--name=" + name,
+        f"--name={name}",
         "--onefile",
         "--windowed",
         "--noconsole",
@@ -25,32 +47,28 @@ def build():
         entry_script
     ]
 
-    # Add paths to site-packages if needed
     if system == "Windows":
-        site_packages = ".venv\\Lib\\site-packages"
-        add_data = [
+        args += [
+            "--paths=.venv\\Lib\\site-packages",
             "--add-data=data\\*;data",
             "--add-data=data\\fonts\\*;data/fonts",
             "--add-data=data\\icons\\*;data/icons"
         ]
     else:
-        site_packages = ".venv/lib/python3.10/site-packages"
-        add_data = [
+        args += [
+            "--paths=.venv/lib/python3.10/site-packages",
             "--add-data=data/*:data",
             "--add-data=data/fonts/*:data/fonts",
-            "--add-data=data/icons/*:data/icons"
+            "--add-data=data/icons/*:data/icons",
+            "--osx-bundle-identifier=fun.benny.ghost"
         ]
-
-    common_args.append(f"--paths={site_packages}")
-    common_args += add_data
 
-    # macOS-specific option
+    print(f"🔨 Building Ghost {VERSION} for {system}...")
+    subprocess.run(args, check=True)
+
     if system == "Darwin":
-        common_args.append("--osx-bundle-identifier=fun.benny.ghost")
+        patch_macos_plist(name)
 
-    # Run the command
-    print(f"Building for {system}...")
-    subprocess.run(common_args)
 
 if __name__ == "__main__":
     build()

data/gui_theme.json

@@ -5,13 +5,13 @@
 				"type": "dark",
 				"colors": {
 		            "primary": "#433dfb",
-		            "secondary": "#222324",
+		            "secondary": "#1e1d1d",
 		            "success": "#0abf34",
 		            "info": "#2b6eff",
 		            "warning": "#f39c12",
 		            "danger": "#ff341f",
 		            "light": "#ADB5BD",
-		            "dark": "#1a1c1c",
+		            "dark": "#171616",
 		            "bg": "#121111",
 		            "fg": "#ffffff",
 		            "selectbg": "#555555",

gui/components/__init__.py

@@ -5,4 +5,5 @@
 from .settings_frame import SettingsFrame
 from .settings_panel import SettingsPanel
 from .titlebar import Titlebar
-from .tool_page import ToolPage
+from .tool_page import ToolPage
+from .dropdown_menu import DropdownMenu

gui/components/dropdown_menu.py

@@ -0,0 +1,111 @@
+import ttkbootstrap as ttk
+from gui.components import RoundedFrame
+
+class DropdownMenu:
+    def __init__(self, parent, options, command=None):
+        self.parent = parent
+        self.options = options
+        self.selected_option = ttk.StringVar(value=options[0] if options else "")
+        self.command = command
+
+    def _hover_enter(self, wrapper, label):
+        wrapper.set_background("#282828")
+        label.configure(background="#282828")
+
+    def _hover_leave(self, wrapper, label):
+        wrapper.set_background(self.parent.style.colors.get("secondary"))
+        label.configure(background=self.parent.style.colors.get("secondary"))
+
+    def _rearrange_options(self):
+        selected = self.selected_option.get()
+        self.options.remove(selected)
+        self.options.insert(0, selected)
+
+    def _open_menu(self, event):
+        if not self._alive():
+            return
+
+        for widget in self.frame.winfo_children():
+            widget.destroy()
+
+        self._rearrange_options()
+        index = 0
+        for option in self.options:
+            index += 1
+
+            wrapper = RoundedFrame(self.frame, radius=8, background=self.parent.style.colors.get("secondary"))
+            wrapper.pack(fill=ttk.X, padx=5, pady=(4, 5 if index == len(self.options) else 0))
+            wrapper.bind("<Button-1>", lambda e, opt=option: self._on_option_selected(opt))
+
+            label = ttk.Label(wrapper, text=option, background=self.parent.style.colors.get("secondary"), anchor="w")
+            label.pack(fill=ttk.X, padx=5, pady=2)
+            label.bind("<Button-1>", lambda e, opt=option: self._on_option_selected(opt))
+
+            label.bind("<Enter>", lambda e, w=wrapper, l=label: self._hover_enter(w, l))
+            label.bind("<Leave>", lambda e, w=wrapper, l=label: self._hover_leave(w, l))
+            wrapper.bind("<Enter>", lambda e, w=wrapper, l=label: self._hover_enter(w, l))
+            wrapper.bind("<Leave>", lambda e, w=wrapper, l=label: self._hover_leave(w, l))
+
+    def _close_menu(self):
+        if not self._alive():
+            return
+
+        for widget in self.frame.winfo_children():
+            widget.destroy()
+
+        label = ttk.Label(self.frame, textvariable=self.selected_option, anchor="w", background=self.parent.style.colors.get("secondary"))
+        label.pack(fill=ttk.X, padx=10, pady=5)
+        label.bind("<Button-1>", self._open_menu)
+        self.frame.bind("<Button-1>", self._open_menu)
+
+        self.down_arrow = ttk.Label(self.frame, text="▼", background=self.parent.style.colors.get("secondary"), font=("Host Grotesk", 10))
+        self.down_arrow.place(relx=1.0, rely=0.5, x=-10, y=0, anchor="e")
+        self.down_arrow.bind("<Button-1>", self._open_menu)
+
+    def _on_option_selected(self, option):
+        if not self._alive():
+            return
+
+        self.selected_option.set(option)
+        if self.command:
+            self.command(option)
+
+        if self._alive():
+            self._close_menu()
+
+    def _outside_click(self, event):
+        if not self._alive():
+            return
+        if not self.frame.winfo_containing(event.x_root, event.y_root):
+            self._close_menu()
+
+    def draw(self):
+        self.parent.bind("<Button-1>", self._outside_click, add="+")
+        self.frame = RoundedFrame(self.parent, radius=5, bootstyle="secondary.TFrame")
+
+        label = ttk.Label(self.frame, textvariable=self.selected_option, anchor="w", background=self.parent.style.colors.get("secondary"))
+        label.pack(fill=ttk.X, padx=10, pady=5)
+        label.bind("<Button-1>", self._open_menu)
+        self.frame.bind("<Button-1>", self._open_menu)
+
+        self.down_arrow = ttk.Label(self.frame, text="▼", background=self.parent.style.colors.get("secondary"), font=("Host Grotesk", 10))
+        self.down_arrow.place(relx=1.0, rely=0.5, x=-10, y=0, anchor="e")
+        self.down_arrow.bind("<Button-1>", self._open_menu)
+
+        return self.frame
+
+    def value(self):
+        return self.selected_option.get()
+
+    def set_selected(self, option):
+        if option in self.options:
+            self.selected_option.set(option)
+            if self._alive():
+                self._close_menu()
+
+    def destroy(self):
+        if self._alive():
+            self.frame.destroy()
+
+    def _alive(self):
+        return hasattr(self, "frame") and self.frame.winfo_exists()

gui/components/rounded_button.py

@@ -17,6 +17,8 @@ def __init__(self, parent, radius=(8, 8, 8, 8), text=None, image=None, command=N
         self.style = self.root.style
         self.padx = kwargs.get("padx", 2)
         self.pady = kwargs.get("pady", 0 if sys.platform != "darwin" else 1)
+        self.state = "normal"
+        self.command = command
 
         self.configure(background=self._get_parent_background())
 
@@ -66,11 +68,36 @@ def _darken_color(self, hex_color, factor=0.9):
 
     def _hover_enter(self, event=None):
         """ Apply hover effect """
+        if self.state == "disabled":
+            return
         hover_color = self._darken_color(self.original_bg, 0.9)
         self.frame.set_background(hover_color)
         self.button.configure(background=hover_color)
 
     def _hover_leave(self, event=None):
         """ Reset to original color """
+        if self.state == "disabled":
+            return
         self.frame.set_background(self.original_bg)
         self.button.configure(background=self.original_bg)
+
+    def set_state(self, state):
+        if state == "disabled":
+            self.state = "disabled"
+            self.button.state(["disabled"])
+            self.frame.set_background(self.style.colors.get("secondary"))
+            self.button.configure(background=self.style.colors.get("secondary"))
+            if self.command:
+                self.button.unbind("<Button-1>")
+                self.frame.unbind("<Button-1>")
+        else:
+            self.state = "normal"
+            self.button.state(["!disabled"])
+            self.frame.set_background(self.original_bg)
+            self.button.configure(background=self.original_bg)
+            if self.command:
+                self.button.bind("<Button-1>", self.command)
+                self.frame.bind("<Button-1>", self.command)
+
+    def set_text(self, text):
+        self.button.configure(text=text)

gui/components/rounded_frame.py

@@ -105,4 +105,7 @@ def set_width(self, width):
     def bind(self, sequence=None, func=None, add=None):
         if sequence == "<Configure>":
             return super().bind(sequence, self.on_resize, add=add)
-        return super().bind(sequence, func, add=add)
+        return super().bind(sequence, func, add=add)
+
+    def lift(self):
+        self.master.tk.call("raise", self._w)

gui/components/settings/apis.py

@@ -3,12 +3,12 @@
 from gui.components import SettingsPanel
 
 class APIsPanel(SettingsPanel):
-    def __init__(self, root, parent, images, config):
-        super().__init__(root, parent, "APIs", images.get("apis"))
+    def __init__(self, root, parent, images, config, width=None):
+        super().__init__(root, parent, "APIs", images.get("apis"), width=width, collapsed=False)
         self.cfg = config
         self.api_keys_tk_entries = {}
         self.api_keys_entries = {
-            "serpapi": "SerpAPI"
+            "serpapi": "SerpAPI Key"
         }
 
     def _save_api_keys(self):