chore(build): update versioning and refactor bar manager

This commit modifies the build process to use a dynamic version number sourced from the settings module instead of a hardcoded value. It also refactors the BarManager class to improve its configuration handling by replacing the previous close and initialize methods with a more efficient process that restarts the application when configuration changes are detected. Additionally, updates to the tray icon include new links for GitHub themes and adjustments to the styling in the CSS files for better visual consistency.

Author: amnweb

src/build.py

@@ -1,7 +1,7 @@
 import sys
 from cx_Freeze import setup, Executable
-
-version = "1.0.2"
+from settings import BUILD_VERSION
+ 
 #base = "console"
 base = "gui"
 build_options = {
@@ -123,7 +123,7 @@
 ]
 setup(
     name="yasb",
-    version=version,
+    version=BUILD_VERSION,
     author="AmN",
     description="Yet Another Status Bar",
     executables=executables,

src/core/bar_manager.py

@@ -1,5 +1,6 @@
-import asyncio
 import logging
+import os
+import sys
 import uuid
 from contextlib import suppress
 from PyQt6.QtWidgets import QApplication
@@ -11,14 +12,12 @@
 from core.event_service import EventService
 from core.config import get_stylesheet, get_config
 from copy import deepcopy
-
-from core.utils.win32.media import WindowsMedia
-
+from settings import DEBUG
 
 class BarManager(QObject):
     styles_modified = pyqtSignal()
     config_modified = pyqtSignal()
-    tray_reload = pyqtSignal()
+ 
 
     def __init__(self, config: dict, stylesheet: str):
         super().__init__()
@@ -58,10 +57,7 @@ def on_config_modified(self):
         if config and (config != self.config):
 
             if config['bars'] != self.config['bars'] or config['widgets'] != self.config['widgets'] or config['komorebi'] != self.config['komorebi']:
-                self.config = config
-                self.close_bars()
-                self.initialize_bars()
-                self.tray_reload.emit()
+                os.execl(sys.executable, sys.executable, *sys.argv)
             else:
                 self.config = config
 
@@ -70,12 +66,12 @@ def on_config_modified(self):
     @pyqtSlot(QScreen)
     def on_screens_update(self, _screen: QScreen) -> None:
         logging.info("Screens updated. Re-initialising all bars.")
-        self.close_bars()
-        self.initialize_bars()
+        os.execl(sys.executable, sys.executable, *sys.argv)
 
     def run_listeners_in_threads(self):
         for listener in self.widget_event_listeners:
-            logging.info(f"Starting {listener.__name__}...")
+            if DEBUG:
+                logging.info(f"Starting {listener.__name__}...")
             thread = listener()
             thread.start()
             self._threads[listener] = thread
@@ -89,21 +85,7 @@ def stop_listener_threads(self):
                 self._threads[listener].wait(500)
         self._threads.clear()
         self.widget_event_listeners.clear()
-
-    def close_bars(self):
-        self.stop_listener_threads()
-        tasks = asyncio.all_tasks()
-        for t in tasks:
-            t.cancel()
-
-        if WindowsMedia.has_instance():
-            WindowsMedia().stop()
-
-        for bar in self.bars:
-            bar.close()
-
-        self.event_service.clear()
-        self.bars.clear()
+ 
 
     def initialize_bars(self, init=False) -> None:
         self._widget_builder = WidgetBuilder(self.config['widgets'])

src/core/tray.py

@@ -10,7 +10,7 @@
 from PyQt6.QtGui import QIcon
 from PyQt6.QtCore import QCoreApplication, QSize, Qt
 from core.bar_manager import BarManager
-from settings import GITHUB_URL, SCRIPT_PATH, APP_NAME, APP_NAME_FULL, DEFAULT_CONFIG_DIRECTORY, VERSION
+from settings import GITHUB_URL, SCRIPT_PATH, APP_NAME, APP_NAME_FULL, DEFAULT_CONFIG_DIRECTORY, GITHUB_THEME_URL, BUILD_VERSION
 from core.config import get_config
 
 OS_STARTUP_FOLDER = os.path.join(os.environ['APPDATA'], r'Microsoft\Windows\Start Menu\Programs\Startup')
@@ -33,7 +33,7 @@ def __init__(self, bar_manager: BarManager):
         self._load_context_menu()
         self.setToolTip(f"{APP_NAME}")
         self._load_config()
-        self._bar_manager.tray_reload.connect(self._reload_tray)
+ 
 
     def _load_config(self):
         try:
@@ -52,9 +52,7 @@ def _load_favicon(self):
         self._icon.addFile(os.path.join(parent_directory, 'assets', 'images', 'app_icon.png'), QSize(48, 48))
         self.setIcon(self._icon)
 
-    def _reload_tray(self):
-        self._load_config()
-        self._load_context_menu()
+ 
 
     def _load_context_menu(self):
         menu = QMenu()
@@ -87,7 +85,7 @@ def _load_context_menu(self):
         QMenu::right-arrow {
             width: 8px;
             height: 8px;
-            padding-right: 18px;
+            padding-right:16px;
         }
         """
         menu.setStyleSheet(style_sheet)
@@ -196,22 +194,20 @@ def _reload_application(self):
         os.execl(sys.executable, sys.executable, *sys.argv)
 
     def _exit_application(self):
-        self._bar_manager.close_bars()
-        logging.info("Exiting Application...")
+        logging.info("Exiting Application from tray...")
         QCoreApplication.exit(0)
 
     def _open_docs_in_browser(self):
         webbrowser.open(self._docs_url)
 
-
-
     def _show_about_dialog(self):
         about_text = f"""
-        <div style="font-family:'Segoe UI',sans-serif;"> 
-        <div style="font-size:24px;font-weight:700;">{APP_NAME} REBORN</div>
+        <div style="font-family:'Segoe UI',sans-serif;">
+        <div style="font-size:20px;font-weight:700;">{APP_NAME} REBORN</div><br/>
         <div style="font-size:14px;font-weight:500">{APP_NAME_FULL}</div>
-        <div style="font-size:12px;">Version: {VERSION}</div><br>
-        <div><a href="{GITHUB_URL}" style="margin:0;padding:0;">{GITHUB_URL}</a></div>
+        <div style="font-size:12px;">Version: {BUILD_VERSION}</div><br>
+        <div><a href="{GITHUB_URL}">{GITHUB_URL}</a></div>
+        <div><a href="{GITHUB_THEME_URL}">{GITHUB_THEME_URL}</a></div>
         </div>
         """
         # Create a QMessageBox instance

src/styles.css

@@ -41,7 +41,7 @@
 	padding: 1px 8px 1px 8px;
 }
 .active-window-widget {
-	border-radius: 16px;
+	border-radius: 18px;
 	margin-left: 8px
 }
 .container-left,
@@ -52,18 +52,18 @@
 }
 
 .clock-widget {
-	border-top-left-radius: 16px;
-	border-bottom-left-radius: 16px;
+	border-top-left-radius: 18px;
+	border-bottom-left-radius: 18px;
 }
 
 .apps-widget {
 	padding: 0 2px;
-	border-top-right-radius: 16px;
-	border-bottom-right-radius: 16px;
+	border-top-right-radius: 18px;
+	border-bottom-right-radius: 18px;
 }
 .komorebi-active-layout {
-	border-top-right-radius: 16px;
-	border-bottom-right-radius: 16px;
+	border-top-right-radius: 18px;
+	border-bottom-right-radius: 18px;
 	padding: 0 4px 0 0;
 }
 
@@ -73,18 +73,21 @@
 }
 .wifi-widget {
 	padding: 0 4px 0 4px;
-	border-top-left-radius: 16px;
-	border-bottom-left-radius: 16px;
+	border-top-left-radius: 18px;
+	border-bottom-left-radius: 18px;
 }
 
 .apps-widget .widget-container,
 .komorebi-workspaces .widget-container,
 .wifi-widget .widget-container,
 .komorebi-active-layout .widget-container {
 	background-color: #313244;
-	margin: 4px 0 4px 0;
+	margin: 4px 0px 4px 0;
 	border-radius: 14px;
 }
+.apps-widget .widget-container {
+    margin-right: 2px;
+}
 .komorebi-workspaces .ws-btn {
 	font-size: 16px;
     background-color: transparent;