From 9cb8eeb80b541c8d0c60ad355e9323b338155b00 Mon Sep 17 00:00:00 2001 From: Kevin Alberts Date: Fri, 25 Jul 2025 17:00:02 +0200 Subject: [PATCH] Latest changes --- config_debug.py | 2 +- kuro/base.py | 2 +- kuro/config.py | 6 +++--- kuro/theme.py | 42 +++++++++++++++++++++--------------------- kuro/utils/widgets.py | 15 +++++++++------ 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/config_debug.py b/config_debug.py index 8dbfaff..3aa6617 100644 --- a/config_debug.py +++ b/config_debug.py @@ -25,7 +25,7 @@ # SOFTWARE. from libqtile.config import Key, Screen, Group, Drag, Click -from libqtile.command import lazy +from libqtile.lazy import lazy from libqtile import layout, bar, widget diff --git a/kuro/base.py b/kuro/base.py index 370c02f..221d1fd 100644 --- a/kuro/base.py +++ b/kuro/base.py @@ -1,5 +1,5 @@ from libqtile import layout as libqtile_layout, layout, bar, widget -from libqtile.command import lazy +from libqtile.lazy import lazy from libqtile.config import Key, Group, Screen, Drag, Click, Match diff --git a/kuro/config.py b/kuro/config.py index f0320fb..61a29d4 100644 --- a/kuro/config.py +++ b/kuro/config.py @@ -20,11 +20,11 @@ class Config(BaseConfig): web_browser = "firefox" file_manager = "thunar" app_chat = "/usr/bin/rambox" - app_irc = "quasselclient" + app_irc = "true" app_mail = "thunderbird" app_music = "spotify" - cmd_brightness_up = "sudo /usr/bin/xbacklight -inc 10" - cmd_brightness_down = "sudo /usr/bin/xbacklight -dec 10" + cmd_brightness_up = "true" + cmd_brightness_down = "true" lock_command = "bash /home/kevin/bin/lock.sh" visualizer_app = "glava" cmd_screenshot = "xfce4-screenshooter -r -c -d 1" diff --git a/kuro/theme.py b/kuro/theme.py index 7e15e82..1a40d36 100644 --- a/kuro/theme.py +++ b/kuro/theme.py @@ -8,7 +8,7 @@ from libqtile.log_utils import logger logger.error("Importing qtile theme requirements...") from libqtile.config import Key, Screen, Group, Drag, Click, Match -from libqtile.command import lazy +from libqtile.lazy import lazy from libqtile import layout, bar, widget, qtile logger.error("Importing theme util functions...") @@ -371,18 +371,18 @@ class Kuro(BaseTheme): kuro.utils.widgets.BatteryInfoWidget(fontsize_left=16, fontsize_right=11), ]) widgets.extend([ - kuro.utils.widgets.VolumeInfoWidget( - pulse_sink=Config.get('volume_pulse_sink', None), - fontsize_left=18, - fontsize_right=11, - font_left=Config.get('font_groupbox', None), - ), - kuro.utils.widgets.VolumeInfoWidget( - pulse_sink=Config.get('volume_pulse_sink2', None), - fontsize_left=18, - fontsize_right=11, - font_left=Config.get('font_groupbox', None), - ), + # kuro.utils.widgets.VolumeInfoWidget( + # pulse_sink=Config.get('volume_pulse_sink', None), + # fontsize_left=18, + # fontsize_right=11, + # font_left=Config.get('font_groupbox', None), + # ), + # kuro.utils.widgets.VolumeInfoWidget( + # pulse_sink=Config.get('volume_pulse_sink2', None), + # fontsize_left=18, + # fontsize_right=11, + # font_left=Config.get('font_groupbox', None), + # ), kuro.utils.widgets.TextSpacerWidget(fontsize=14), kuro.utils.widgets.NetworkInfoWidget(fontsize_left=16, fontsize_right=14), ]) @@ -405,14 +405,14 @@ class Kuro(BaseTheme): widgets.extend([ kuro.utils.widgets.KuroCurrentLayoutIcon(custom_icon_paths=Config.get('custom_layout_icon_paths', [])), widget.Clock(format="%a %d %b, %H:%M", **self.widget_defaults), - kuro.utils.widgets.CheckUpdatesYay( - colour_no_updates=Config.get('updates_colour_none', '#ffffff'), - colour_have_updates=Config.get('updates_colour_available', '#ff0000'), - display_format=Config.get('updates_display_format', 'Updates: {updates}'), - execute=Config.get('updates_execute_command', None), - update_interval=Config.get('updates_interval', 600), - **self.widget_defaults - ), + # kuro.utils.widgets.CheckUpdatesYay( + # colour_no_updates=Config.get('updates_colour_none', '#ffffff'), + # colour_have_updates=Config.get('updates_colour_available', '#ff0000'), + # display_format=Config.get('updates_display_format', 'Updates: {updates}'), + # execute=Config.get('updates_execute_command', None), + # update_interval=Config.get('updates_interval', 600), + # **self.widget_defaults + # ), widget.TextBox("#{}".format(x), name="default", **self.widget_defaults), ]) diff --git a/kuro/utils/widgets.py b/kuro/utils/widgets.py index c1b2f32..463583a 100644 --- a/kuro/utils/widgets.py +++ b/kuro/utils/widgets.py @@ -242,18 +242,18 @@ class DualPaneTextboxBase(base._Widget): self.bar.draw() self.changed = False - def cmd_set_font(self, font=base.UNSPECIFIED, fontsize_left=base.UNSPECIFIED, fontsize_right=base.UNSPECIFIED, fontshadow=base.UNSPECIFIED): + def cmd_set_font(self, font=None, fontsize_left=0, fontsize_right=0, fontshadow=""): """ Change the font used by this widget. If font is None, the current font is used. """ - if font is not base.UNSPECIFIED: + if font is not None: self.font = font - if fontsize_left is not base.UNSPECIFIED: + if fontsize_left != 0: self.fontsize_left = fontsize_left - if fontsize_right is not base.UNSPECIFIED: + if fontsize_right != 0: self.fontsize_right = fontsize_right - if fontshadow is not base.UNSPECIFIED: + if fontshadow != "": self.fontshadow = fontshadow self.bar.draw() @@ -548,7 +548,10 @@ class KuroCurrentLayoutIcon(CurrentLayoutIcon): in map(lambda x: (getattr(kuro_layouts, x), x), dir(kuro_layouts)) if isinstance(layout_class, six.class_types) and issubclass(layout_class, Layout) ] - names.extend(klayouts) + if isinstance(names, set): + names.update(klayouts) + else: + names.extend(klayouts) return list(set(names))