From 3c1bb0933bf12ee41acdf52e511599eb45b65399 Mon Sep 17 00:00:00 2001 From: lenemter Date: Fri, 18 Sep 2026 21:56:19 +0300 Subject: [PATCH 1/2] Remove outdated indicator names --- lib/Indicator.vala | 5 ----- src/Widgets/IndicatorEntry.vala | 34 +++++++++++---------------------- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/lib/Indicator.vala b/lib/Indicator.vala index 52858ab9..1aea4ddb 100644 --- a/lib/Indicator.vala +++ b/lib/Indicator.vala @@ -19,19 +19,14 @@ public abstract class Wingpanel.Indicator : GLib.Object { public const string APP_LAUNCHER = "app-launcher"; - public const string SESSION = "session"; public const string DATETIME = "datetime"; public const string NETWORK = "network"; public const string MESSAGES = "messages"; public const string SOUND = "sound"; public const string POWER = "power"; - public const string SYNC = "sync"; - public const string PRINTER = "printer"; public const string BLUETOOTH = "bluetooth"; public const string KEYBOARD = "keyboard"; public const string NIGHT_LIGHT = "nightlight"; - public const string PRIVACY = "privacy"; - public const string ACCESSIBILITY = "a11y"; public const string QUICKSETTINGS = "quick-settings"; /** diff --git a/src/Widgets/IndicatorEntry.vala b/src/Widgets/IndicatorEntry.vala index e1e9bde5..e99ee373 100644 --- a/src/Widgets/IndicatorEntry.vala +++ b/src/Widgets/IndicatorEntry.vala @@ -18,8 +18,7 @@ */ public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin { - private const string UNKNOWN_INDICATOR = "xxx-unknown"; - private const string AYATANA_INDICATOR = "xxx-ayatana"; + private const int UNKNOWN_INDICATOR_ORDER = 0; public Indicator base_indicator { get; construct; } public Services.PopoverManager popover_manager { get; construct; } @@ -56,21 +55,15 @@ public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin { } static construct { - indicator_order[AYATANA_INDICATOR] = 0; - indicator_order[UNKNOWN_INDICATOR] = 1; - indicator_order[Indicator.ACCESSIBILITY] = 2; - indicator_order[Indicator.NIGHT_LIGHT] = 3; - indicator_order[Indicator.PRIVACY] = 4; - indicator_order[Indicator.KEYBOARD] = 5; - indicator_order[Indicator.SOUND] = 6; - indicator_order[Indicator.NETWORK] = 7; - indicator_order[Indicator.BLUETOOTH] = 8; - indicator_order[Indicator.PRINTER] = 9; - indicator_order[Indicator.SYNC] = 10; - indicator_order[Indicator.POWER] = 11; - indicator_order[Indicator.MESSAGES] = 12; - indicator_order[Indicator.QUICKSETTINGS] = 13; - indicator_order[Indicator.SESSION] = 14; + // 0 is reserved for UNKNOWN_INDICATOR_ORDER + indicator_order[Indicator.NIGHT_LIGHT] = 1; + indicator_order[Indicator.KEYBOARD] = 2; + indicator_order[Indicator.SOUND] = 3; + indicator_order[Indicator.NETWORK] = 4; + indicator_order[Indicator.BLUETOOTH] = 5; + indicator_order[Indicator.POWER] = 6; + indicator_order[Indicator.MESSAGES] = 7; + indicator_order[Indicator.QUICKSETTINGS] = 8; } class construct { @@ -170,15 +163,10 @@ public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin { } private static int get_order (Wingpanel.Widgets.IndicatorEntry node) { - /* ayatana application indicators on the left of the native indicators */ - if (node.base_indicator.code_name.has_prefix ("ayatana-")) { - return indicator_order[AYATANA_INDICATOR]; - } - if (indicator_order.has_key (node.base_indicator.code_name)) { return indicator_order[node.base_indicator.code_name]; } - return indicator_order[UNKNOWN_INDICATOR]; + return UNKNOWN_INDICATOR_ORDER; } } From 7523483a95ca6d915e6f5de6f53a0c7ca9d589bd Mon Sep 17 00:00:00 2001 From: lenemter Date: Fri, 18 Sep 2026 22:01:35 +0300 Subject: [PATCH 2/2] Replace indicator order HashMap with a switch --- src/Widgets/IndicatorEntry.vala | 31 ++++++++++--------------------- 1 file changed, 10 insertions(+), 21 deletions(-) diff --git a/src/Widgets/IndicatorEntry.vala b/src/Widgets/IndicatorEntry.vala index e99ee373..e25c71ff 100644 --- a/src/Widgets/IndicatorEntry.vala +++ b/src/Widgets/IndicatorEntry.vala @@ -18,8 +18,6 @@ */ public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin { - private const int UNKNOWN_INDICATOR_ORDER = 0; - public Indicator base_indicator { get; construct; } public Services.PopoverManager popover_manager { get; construct; } @@ -42,9 +40,6 @@ public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin { } } - /* The order in which the indicators are shown from left to right. */ - private static Gee.HashMap indicator_order = new Gee.HashMap (); - private Gtk.Revealer revealer; public IndicatorEntry (Indicator base_indicator, Services.PopoverManager popover_manager) { @@ -54,18 +49,6 @@ public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin { ); } - static construct { - // 0 is reserved for UNKNOWN_INDICATOR_ORDER - indicator_order[Indicator.NIGHT_LIGHT] = 1; - indicator_order[Indicator.KEYBOARD] = 2; - indicator_order[Indicator.SOUND] = 3; - indicator_order[Indicator.NETWORK] = 4; - indicator_order[Indicator.BLUETOOTH] = 5; - indicator_order[Indicator.POWER] = 6; - indicator_order[Indicator.MESSAGES] = 7; - indicator_order[Indicator.QUICKSETTINGS] = 8; - } - class construct { set_css_name ("indicator"); } @@ -163,10 +146,16 @@ public class Wingpanel.Widgets.IndicatorEntry : Granite.Bin { } private static int get_order (Wingpanel.Widgets.IndicatorEntry node) { - if (indicator_order.has_key (node.base_indicator.code_name)) { - return indicator_order[node.base_indicator.code_name]; + switch (node.base_indicator.code_name) { + case Indicator.NIGHT_LIGHT: return 1; + case Indicator.KEYBOARD: return 2; + case Indicator.SOUND: return 3; + case Indicator.NETWORK: return 4; + case Indicator.BLUETOOTH: return 5; + case Indicator.POWER: return 6; + case Indicator.MESSAGES: return 7; + case Indicator.QUICKSETTINGS: return 8; + default: return 0; } - - return UNKNOWN_INDICATOR_ORDER; } }