Notification History + Other tweaks

Author: Axenide

modules/cavalcade.py

@@ -235,8 +235,8 @@ def __init__(self, mode=None, **kwargs):
 
     def get_spectrum_box(self):
         # Get the spectrum box
-        box = Overlay(h_align='center', v_align='center')
-        box.set_size_request(150, 40)
+        box = Overlay(name="cavalcade", h_align='center', v_align='center')
+        box.set_size_request(180, 40)
         box.add_overlay(self.draw.area)
         return box
 

modules/icons.py

@@ -78,6 +78,8 @@
 night_off: str = ""
 notifications_off: str = ""
 
+notifications_clear: str = "";
+
 # Bluetooth
 bluetooth_connected: str = ""
 bluetooth_disconnected: str = ""

modules/notifications.py

@@ -381,15 +381,20 @@ def _update_switcher_for_player(self, player_name):
                         btn.add(new_label)
                         new_label.show_all()
         return False
-    
+
 
 class PlayerSmall(CenterBox):
     def __init__(self):
-        super().__init__(orientation="h", h_align="fill", v_align="center")
+        super().__init__(name="player-small", orientation="h", h_align="fill", v_align="center")
         self._show_artist = False  # toggle flag
+        self._display_options = ["cavalcade", "title", "artist"]
+        self._display_index = 0
+        self._current_display = "cavalcade"
 
         self.mpris_icon = Button(
             name="compact-mpris-icon",
+            h_align="center",
+            v_align="center",
             child=Label(name="compact-mpris-icon-label", markup=icons.disc)
         )
         # Remove scroll events; instead, add button press events.
@@ -405,10 +410,14 @@ def __init__(self):
         self.mpris_label = Label(
             name="compact-mpris-label",
             label="Nothing Playing",
-            ellipsization="end"
+            ellipsization="end",
+            max_chars_width=26,
+            h_align="center",
         )
         self.mpris_button = Button(
             name="compact-mpris-button",
+            h_align="center",
+            v_align="center",
             child=Label(name="compact-mpris-button-label", markup=icons.play)
         )
         self.mpris_button.add_events(Gdk.EventMask.BUTTON_PRESS_MASK)
@@ -426,12 +435,12 @@ def __init__(self):
             v_align="center",
             v_expand=False,
             children=[
-                self.mpris_label,
                 self.cavalcade_box,
+                self.mpris_label,
             ]
         )
-        self.center_stack.set_visible_child(self.cavalcade_box)
-     
+        self.center_stack.set_visible_child(self.cavalcade_box) # default to cavalcade
+
         # Create additional compact view.
         self.mpris_small = CenterBox(
             name="compact-mpris",
@@ -441,16 +450,11 @@ def __init__(self):
             v_align="center",
             v_expand=False,
             start_children=self.mpris_icon,
-            center_children=self.mpris_label,
+            center_children=self.center_stack, # Changed to center_stack to handle stack switching
             end_children=self.mpris_button,
         )
-        
-        self.mpris_small_overlay = Overlay()
-        self.mpris_small_overlay.add(self.center_stack)
-        self.mpris_small_overlay.add_overlay(self.mpris_small)
-        
-        
-        self.add(self.mpris_small_overlay)
+
+        self.add(self.mpris_small)
 
         self.mpris_manager = MprisPlayerManager()
         self.mpris_player = None
@@ -475,49 +479,57 @@ def _apply_mpris_properties(self):
             self.mpris_label.set_text("Nothing Playing")
             self.mpris_button.get_child().set_markup(icons.stop)
             self.mpris_icon.get_child().set_markup(icons.disc)
+            if self._current_display != "cavalcade":
+                self.center_stack.set_visible_child(self.mpris_label) # if was title or artist, keep showing label
+            else:
+                self.center_stack.set_visible_child(self.cavalcade_box) # default to cavalcade if no player
             return
 
         mp = self.mpris_player
 
-        # Toggle between title and artist.
-        text = (mp.artist if self._show_artist and mp.artist
-                else (mp.title if mp.title and mp.title.strip()
-                      else "Nothing Playing"))
-        self.mpris_label.set_text(text)
-
         # Choose icon based on player name.
         player_name = mp.player_name.lower() if hasattr(mp, "player_name") and mp.player_name else ""
         icon_markup = get_player_icon_markup_by_name(player_name)
         self.mpris_icon.get_child().set_markup(icon_markup)
         self.update_play_pause_icon()
 
+        if self._current_display == "title":
+            text = (mp.title if mp.title and mp.title.strip() else "Nothing Playing")
+            self.mpris_label.set_text(text)
+            self.center_stack.set_visible_child(self.mpris_label)
+        elif self._current_display == "artist":
+            text = (mp.artist if mp.artist else "Nothing Playing")
+            self.mpris_label.set_text(text)
+            self.center_stack.set_visible_child(self.mpris_label)
+        else: # default cavalcade
+            self.center_stack.set_visible_child(self.cavalcade_box)
+
+
     def _on_icon_button_press(self, widget, event):
         from gi.repository import Gdk
         if event.type == Gdk.EventType.BUTTON_PRESS:
-            if event.button == 3:
-                self.center_stack.set_visible_child(self.cavalcade_box)
-            if event.button == 2:
-                self.center_stack.set_visible_child(self.mpris_label)
             players = self.mpris_manager.players
             if not players:
                 return True
 
+            if event.button == 2:  # Middle-click: cycle display
+                self._display_index = (self._display_index + 1) % len(self._display_options)
+                self._current_display = self._display_options[self._display_index]
+                self._apply_mpris_properties() # Re-apply to update label/cavalcade
+                return True
+
             # Cambiar de reproductor según el botón presionado.
-            if event.button == 1:  # Left-click: reproductor anterior
+            if event.button == 1:  # Left-click: next player
                 self.current_index = (self.current_index + 1) % len(players)
-            elif event.button == 3:  # Right-click: reproductor siguiente
-                #self.current_index = (self.current_index + 1) % len(players)
-                self.center_stack.set_visible_child(self.cavalcade_box)
-            elif event.button == 2:  # Middle-click: toggle entre title y artist
-                self._on_icon_clicked(widget)
-                self.center_stack.set_visible_child(self.mpris_label)
-                return True
+            elif event.button == 3:  # Right-click: previous player
+                self.current_index = (self.current_index - 1) % len(players)
+                if self.current_index < 0:
+                    self.current_index = len(players) - 1
 
             mp_new = MprisPlayer(players[self.current_index])
             self.mpris_player = mp_new
-            # Conectar el evento "changed" para que se actualice el botón de play/pausa
+            # Conectar el evento "changed" para que se actualice
             self.mpris_player.connect("changed", self._on_mpris_changed)
-            # Se remueve el reinicio de self._show_artist para que la selección (artist/title) persista
             self._apply_mpris_properties()
             return True  # Se consume el evento
         return True
@@ -545,17 +557,8 @@ def _restore_play_pause_icon(self):
         self.update_play_pause_icon()
         return False
 
-    def _on_icon_clicked(self, widget):
-        if not self.mpris_player:
-            return
-        # Toggle between showing title and artist.
-        self._show_artist = not self._show_artist
-        text = (self.mpris_player.artist if self._show_artist and self.mpris_player.artist
-                else (self.mpris_player.title if self.mpris_player.title and self.mpris_player.title.strip()
-                      else "Nothing Playing"))
-        self.mpris_label.set_text(text)
-
-        self.center_stack.set_visible_child(self.mpris_label)
+    def _on_icon_clicked(self, widget): # No longer used, logic moved to _on_icon_button_press
+        pass
 
     def update_play_pause_icon(self):
         if self.mpris_player and self.mpris_player.playback_status == "playing":
@@ -583,10 +586,13 @@ def on_player_appeared(self, manager, player):
     def on_player_vanished(self, manager, player_name):
         players = self.mpris_manager.players
         if players and self.mpris_player and self.mpris_player.player_name == player_name:
-            self.current_index = self.current_index % len(players)
-            new_player = MprisPlayer(players[self.current_index])
-            self.mpris_player = new_player
-            self.mpris_player.connect("changed", self._on_mpris_changed)
+            if players: # Check if players is not empty after vanishing
+                self.current_index = self.current_index % len(players)
+                new_player = MprisPlayer(players[self.current_index])
+                self.mpris_player = new_player
+                self.mpris_player.connect("changed", self._on_mpris_changed)
+            else:
+                self.mpris_player = None # No players left
         elif not players:
             self.mpris_player = None
-        self._apply_mpris_properties()
+        self._apply_mpris_properties()

modules/player.py

@@ -31,4 +31,4 @@ OUTPUT_FILE="$SAVE_DIR/$(date +%Y-%m-%d-%H-%M-%S).mp4"
 
 # Iniciar la grabación
 notify-send -a "Ax-Shell" "🔴 Recording started"
-gpu-screen-recorder -w portal -q ultra -ac opus -cr full -f 60 -o "$OUTPUT_FILE"
+gpu-screen-recorder -w portal -q ultra -a default_output -ac opus -cr full -f 60 -o "$OUTPUT_FILE"

scripts/screenrecord.sh

@@ -84,7 +84,7 @@
 #notch-compact {
   font-weight: bold;
   transition: all 0.5s cubic-bezier(0.5, 0.25, 0, 1.25);
-  padding: 0 10px;
+  padding: 10px;
 }
 
 #notch-corner-left {

styles/notch.css

@@ -1,21 +1,18 @@
-#notification-action-buttons button.start-action {
+#action-button {
     border-radius: 20px;
-}
-
-#notification-action-buttons button {
     background-color: var(--surface);
     padding: 8px;
 }
 
-#notification-action-buttons button:hover {
+#action-button:hover {
     background-color: var(--surface-bright);
 }
 
-#notification-action-buttons button:active {
+#action-button:active {
     background-color: var(--primary);
 }
 
-#notification-action-buttons button:active #button-label {
+#action-button:active #button-label {
     color: var(--shadow);
 }
 
@@ -149,4 +146,35 @@
 
 #notification-timestamp {
     color: var(--surface-bright);
+}
+
+#notification-history-header {
+    border-radius: 12px;
+    border: 2px solid var(--surface);
+    padding: 4px;
+}
+
+#nhh {
+    font-weight: bold;
+}
+
+#nhh-button {
+    border-radius: 8px;
+    background-color: var(--surface);
+    padding: 4px;
+}
+
+#nhh-button-label {
+    color: var(--error-dim);
+    font-size: 20px;
+}
+
+#dnd-label {
+    font-size: 20px;
+    margin-left: 4px;
+}
+
+#no-notifications-label {
+    font-size: 96px;
+    color: var(--surface);
 }

styles/notifications.css

@@ -88,4 +88,4 @@
 #player-switcher.stack-switcher > *:checked:hover label {
   font-size: 24px;
   color: var(--foreground);
-}
+}

styles/player.css

@@ -26,7 +26,7 @@
 }
 
 /* Customize the overall switch appearance */
-#matugen-switcher {
+#matugen-switcher, #dnd-switch {
   min-width: 40px;
   min-height: 20px;
   background-color: var(--surface);
@@ -36,7 +36,7 @@
 }
 
 /* Style the switch's slider */
-#matugen-switcher slider {
+#matugen-switcher slider, #dnd-switch slider {
   background-color: var(--primary);
   border-radius: 16px;
   min-width: 20px;
@@ -45,15 +45,19 @@
 }
 
 /* When the switch is active (checked) */
-#matugen-switcher:checked {
+#matugen-switcher:checked, #dnd-switch:checked {
   background-color: var(--primary);
 }
 
 /* Optional: additional styling for the slider when active */
-#matugen-switcher:checked slider {
+#matugen-switcher:checked slider, #dnd-switch:checked slider {
   background-color: var(--shadow);
 }
 
+#matugen-switcher:checked image, #dnd-switch:checked image {
+  color: var(--shadow);
+}
+
 #mat-label {
   font-size: 24px;
   margin-left: 4px;