From 15bf16d9d8832907e3f3802d903e1e42f70b6149 Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Sat, 4 Jul 2026 01:24:23 +0545 Subject: [PATCH] refactor(window): rename titles to prefixed modus- names --- src/window/controlcenter/main.py | 2 +- src/window/desktop/widget.py | 8 ++++---- src/window/dock.py | 8 +++++--- src/window/notification/notification_center.py | 4 ++-- src/window/osd/main.py | 5 +++-- src/window/switcher.py | 3 +-- 6 files changed, 16 insertions(+), 14 deletions(-) diff --git a/src/window/controlcenter/main.py b/src/window/controlcenter/main.py index 3b8a267..3f858b9 100644 --- a/src/window/controlcenter/main.py +++ b/src/window/controlcenter/main.py @@ -33,7 +33,7 @@ class ModusControlCenter(AppletWindow): parent=parent, pointing_to=pointing_to, layer="top", - title="modus", + title="modus-controlcenter", anchor="top right", margin="2px 10px 0px 0px", exclusivity="auto", diff --git a/src/window/desktop/widget.py b/src/window/desktop/widget.py index 18ca0fd..836b0d8 100644 --- a/src/window/desktop/widget.py +++ b/src/window/desktop/widget.py @@ -1,12 +1,12 @@ import calendar import datetime import urllib.parse -import httpx from concurrent.futures import ThreadPoolExecutor from typing import Any, Dict, List, Optional, Tuple +import httpx import psutil -from fabric.utils import GLib, invoke_repeater, time, logger +from fabric.utils import GLib, invoke_repeater, logger, time from fabric.widgets.box import Box from fabric.widgets.circularprogressbar import CircularProgressBar from fabric.widgets.datetime import DateTime @@ -661,7 +661,7 @@ class Deskwidgets: # Create separate independent windows as attributes self.top_left = Window( anchor="top left", - title="modus-widgets-topleft", + title="modus-widgets", exclusivity="none", orientation="h", layer="bottom", @@ -678,7 +678,7 @@ class Deskwidgets: self.bottom_left = Window( anchor="bottom right", - title="modus-widgets-bottomright", + title="modus-widgets", orientation="h", layer="bottom", exclusivity="none", diff --git a/src/window/dock.py b/src/window/dock.py index 6c28072..e22413d 100644 --- a/src/window/dock.py +++ b/src/window/dock.py @@ -4,13 +4,13 @@ import subprocess from fabric.utils import ( GLib, Gtk, + exec_shell_command_async, get_desktop_applications, get_relative_path, logger, os, random, re, - exec_shell_command_async, ) from fabric.widgets.box import Box from fabric.widgets.button import Button @@ -47,7 +47,7 @@ class AppBar(Box): super().__init__( spacing=0, - name="dock", + name="modus-dock", orientation="horizontal", children=[], ) @@ -823,7 +823,9 @@ class AppBar(Box): class Dock(Window): def __init__(self): - super().__init__(layer="top", anchor="bottom center", title="modus-dock") + super().__init__( + layer="top", anchor="bottom center", title="modus-dock", name="dock" + ) self.app_bar = AppBar(self) self.revealer = Revealer( diff --git a/src/window/notification/notification_center.py b/src/window/notification/notification_center.py index b900b8f..34b49ea 100644 --- a/src/window/notification/notification_center.py +++ b/src/window/notification/notification_center.py @@ -13,8 +13,8 @@ from fabric.widgets.scrolledwindow import ScrolledWindow import shared.data as data from services.modus import notification_service from shared.widgets.clipping_box import ClippingBox -from shared.window.applet_window import AppletWindow from shared.widgets.custom_image import CustomImage +from shared.window.applet_window import AppletWindow from utils.functions import escape_markup_text from window.notification.notification import ( NotificationWidget, @@ -599,7 +599,7 @@ class NotificationCenter(AppletWindow): layer="overlay", anchor="top right", visible=False, - title="modus", + title="modus-notificationcenter", ) NOTIFICATION_CENTER_WIDTH = 410 diff --git a/src/window/osd/main.py b/src/window/osd/main.py index 9c1fa4b..f4e2ad4 100644 --- a/src/window/osd/main.py +++ b/src/window/osd/main.py @@ -1,18 +1,19 @@ from fabric.widgets.box import Box from fabric.widgets.revealer import Revealer from fabric.widgets.wayland import WaylandWindow as Window + from .components import ( AudioOSDContainer, BrightnessOSDContainer, - MicrophoneOSDContainer, CapsLockOSDContainer, KeyboardLayoutOSDContainer, + MicrophoneOSDContainer, ) class OSD(Box): def __init__(self, window: Window, **kwargs): - super().__init__(name="osd", **kwargs) + super().__init__(title="modus-osd", name="osd", **kwargs) self.window = window self.revealer = Revealer( diff --git a/src/window/switcher.py b/src/window/switcher.py index 13597c3..49545aa 100644 --- a/src/window/switcher.py +++ b/src/window/switcher.py @@ -1,8 +1,7 @@ -from fabric.utils import logger import json from fabric.hyprland.widgets import get_hyprland_connection -from fabric.utils import Gdk, GLib +from fabric.utils import Gdk, GLib, logger from fabric.widgets.box import Box from fabric.widgets.eventbox import EventBox from fabric.widgets.image import Image