Add config button to bar and enhance notification timestamps

Author: Axenide

config/config.py

@@ -37,7 +37,9 @@
     'suffix_toggle': "B",
     'prefix_css': "SUPER SHIFT",
     'suffix_css': "B",
-    'wallpapers_dir': WALLPAPERS_DIR_DEFAULT
+    'wallpapers_dir': WALLPAPERS_DIR_DEFAULT,
+    'prefix_restart_inspector': "SUPER CTRL ALT",
+    'suffix_restart_inspector': "B",
 }
 
 
@@ -161,6 +163,7 @@ def generate_hyprconf() -> str:
 bind = {bind_vars['prefix_toggle']}, {bind_vars['suffix_toggle']}, exec, $fabricSend 'bar.toggle_hidden()' # Toggle Bar | Default: SUPER CTRL + B
 bind = {bind_vars['prefix_toggle']}, {bind_vars['suffix_toggle']}, exec, $fabricSend 'notch.toggle_hidden()' # Toggle Notch | Default: SUPER CTRL + B
 bind = {bind_vars['prefix_css']}, {bind_vars['suffix_css']}, exec, $fabricSend 'app.set_css()' # Reload CSS | Default: SUPER SHIFT + B
+bind = {bind_vars['prefix_restart_inspector']}, {bind_vars['suffix_restart_inspector']}, exec, killall ax-shell; GTK_DEBUG=interactive uwsm app -- python {home}/.config/Ax-Shell/main.py # Restart with inspector | Default: SUPER CTRL ALT + B
 
 # Wallpapers directory: {bind_vars['wallpapers_dir']}
 
@@ -263,6 +266,7 @@ def __init__(self, show_lock_checkbox: bool, show_idle_checkbox: bool):
             ("Power Menu", 'prefix_power', 'suffix_power'),
             ("Toggle Bar and Notch", 'prefix_toggle', 'suffix_toggle'),
             ("Reload CSS", 'prefix_css', 'suffix_css'),
+            ("Restart with inspector", 'prefix_restart_inspector', 'suffix_restart_inspector'),
         ]
 
         # Populate grid with key binding rows, starting at row 1

modules/bar.py

@@ -89,6 +89,15 @@ def __init__(self, **kwargs):
         self.button_color.connect("leave-notify-event", self.on_button_leave)
         self.button_color.connect("button-press-event", self.colorpicker)
 
+        self.button_config = Button(
+            name="button-bar",
+            on_clicked=lambda *_: exec_shell_command_async(f"python {data.HOME_DIR}/.config/Ax-Shell/config/config.py"),
+            child=Label(
+                name="button-bar-label",
+                markup=icons.config
+            )
+        )  
+
         self.control = ControlSmall()
         self.metrics = MetricsSmall()
 
@@ -137,8 +146,9 @@ def __init__(self, **kwargs):
                     self.boxed_revealer,
                     self.button_color,
                     self.systray,
-                    self.button_power,
+                    self.button_config,
                     self.date_time,
+                    self.button_power,
                 ],
             ),
         )

modules/notifications.py

@@ -2,7 +2,6 @@
 from gi.repository import GdkPixbuf, GLib, Gtk
 from loguru import logger
 from widgets.rounded_image import CustomImage
-
 from fabric.notifications.service import (
     Notification,
     NotificationAction,
@@ -16,6 +15,7 @@
 from fabric.widgets.label import Label
 from fabric.widgets.scrolledwindow import ScrolledWindow
 import modules.icons as icons
+from datetime import datetime, timedelta  # <-- Importamos para manejar fechas
 
 class ActionButton(Button):
     def __init__(self, action: NotificationAction, index: int, total: int, notification_box):
@@ -128,11 +128,10 @@ def create_content(self, notification):
                         Box(
                             name="notification-summary-box",
                             orientation="h",
-                            # spacing=4,
                             children=[
                                 Label(
                                     name="notification-summary",
-                                    markup=notification.summary.replace("\n", " "),
+                                    markup=notification.summary,
                                     h_align="start",
                                     ellipsization="end",
                                 ),
@@ -145,7 +144,7 @@ def create_content(self, notification):
                             ],
                         ),
                         Label(
-                            markup=notification.body.replace("\n", " "),
+                            markup=notification.body,
                             h_align="start",
                             ellipsization="end",
                         ) if notification.body else Box(),
@@ -234,6 +233,7 @@ def unhover_button(self, button):
         if self._container:
             self._container.resume_all_timeouts()
 
+
 # This is a ScrolledWindow that contains a Box with notifications added to it when they timeout from the NotificationContainer
 class NotificationHistory(ScrolledWindow):
     def __init__(self, **kwargs):
@@ -271,8 +271,10 @@ def add_notification(self, notification_box):
             oldest_notification = self.notifications_list.get_children()[0]
             self.notifications_list.remove(oldest_notification)
 
-        # Crear un método de destrucción personalizado
+        # Modificar el método de destrucción para remover el timer del timestamp
         def on_container_destroy(container):
+            if hasattr(container, "_timestamp_timer_id") and container._timestamp_timer_id:
+                GLib.source_remove(container._timestamp_timer_id)
             container.destroy()
             # Actualizar separadores después de la destrucción
             GLib.idle_add(self.update_separators)
@@ -285,15 +287,34 @@ def on_container_destroy(container):
             h_expand=True,
         )
 
-        # Crear el hist_box sin los botones
-        hist_box = Box(
-            name="notification-box-hist",
-            orientation="v",
-            h_align="fill",
-            h_expand=True,
-        )
-
-        # Creamos el contenido principal
+        # Guardamos el momento de llegada de la notificación
+        container.arrival_time = datetime.now()
+
+        # Función para calcular el texto del label según el tiempo transcurrido
+        def compute_time_label(arrival_time):
+            now = datetime.now()
+            if arrival_time.date() != now.date():
+                if arrival_time.date() == (now - timedelta(days=1)).date():
+                    return " | Yesterday " + arrival_time.strftime("%H:%M")
+                else:
+                    return arrival_time.strftime("| %d/%m/%Y %H:%M")
+            
+            # Para el mismo día, aplicamos las reglas de tiempo transcurrido.
+            delta = now - arrival_time
+            seconds = delta.total_seconds()
+            if seconds < 60:
+                return " | Now"
+            elif seconds < 3600:
+                minutes = int(seconds // 60)
+                return f" | {minutes} min" if minutes == 1 else f" | {minutes} mins"
+            else:
+                return arrival_time.strftime(" | %H:%M")
+
+
+        # Creamos el label de timestamp usando la hora de llegada
+        time_label = Label(name="notification-timestamp", markup=compute_time_label(container.arrival_time))
+
+        # Creamos el contenido principal, insertando el label de timestamp en la sección de texto
         content_box = Box(
             name="notification-content",
             spacing=8,
@@ -313,14 +334,15 @@ def on_container_destroy(container):
                     name="notification-text",
                     orientation="v",
                     v_align="center",
+                    h_expand=True,
                     children=[
                         Box(
                             name="notification-summary-box",
                             orientation="h",
                             children=[
                                 Label(
                                     name="notification-summary",
-                                    markup=notification_box.notification.summary.replace("\n", " "),
+                                    markup=notification_box.notification.summary,
                                     h_align="start",
                                     ellipsization="end",
                                 ),
@@ -330,17 +352,17 @@ def on_container_destroy(container):
                                     h_align="start",
                                     ellipsization="end",
                                 ),
+                                time_label,
                             ],
                         ),
                         Label(
                             name="notification-body",
-                            markup=notification_box.notification.body.replace("\n", " "),
+                            markup=notification_box.notification.body,
                             h_align="start",
                             ellipsization="end",
                         ) if notification_box.notification.body else Box(),
                     ],
                 ),
-                Box(h_expand=True),
                 Box(
                     orientation="v",
                     children=[
@@ -355,11 +377,24 @@ def on_container_destroy(container):
             ],
         )
 
+        # Programamos la actualización asíncrona del label cada 10 segundos
+        def update_timestamp():
+            time_label.set_markup(compute_time_label(container.arrival_time))
+            return True  # seguir llamando
+
+        container._timestamp_timer_id = GLib.timeout_add_seconds(10, update_timestamp)
+
         # Agregamos el contenido principal al hist_box
+        hist_box = Box(
+            name="notification-box-hist",
+            orientation="v",
+            h_align="fill",
+            h_expand=True,
+        )
         hist_box.add(content_box)
 
         # Modificar el botón de cerrar para que use nuestro método personalizado
-        content_box.get_children()[3].get_children()[0].connect(  # Box con botón de cerrar
+        content_box.get_children()[2].get_children()[0].connect(
             "clicked", 
             lambda *_: on_container_destroy(container)
         )

styles/notifications.css

@@ -145,4 +145,8 @@
     border-radius: 16px;
     background-color: var(--surface);
     margin: 0 16px;
+}
+
+#notification-timestamp {
+    color: var(--surface-bright);
 }