Skip to content

Remove unused actions and command line options #716

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lenemter merged 1 commit into from
Sep 1, 2026
Merged

Remove unused actions and command line options #716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
50 changes: 2 additions & 48 deletions src/Application.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,21 +18,16 @@
*/

public class Wingpanel.Application : Gtk.Application {
private const string LIST_INDICATORS_ACTION_NAME = "list-indicators";
private const string OPEN_INDICATOR_ACTION_NAME = "open-indicator";
private const string CLOSE_INDICATOR_ACTION_NAME = "close-indicator";
private const string SERVER_TYPE_ACTION_NAME = "greeter";
public const string TOGGLE_INDICATOR_ACTION_NAME = "toggle-indicator";
private const string TOGGLE_INDICATOR_ACTION_NAME = "toggle-indicator";

private const OptionEntry[] OPTIONS = {
{ OPEN_INDICATOR_ACTION_NAME, 'o', 0, OptionArg.STRING, null, "Open an indicator", "code_name" },
{ CLOSE_INDICATOR_ACTION_NAME, 'c', 0, OptionArg.STRING, null, "Close an indicator", "code_name" },
{ SERVER_TYPE_ACTION_NAME, 'g', 0, OptionArg.NONE, null, "Server is a greeter", null },
{ TOGGLE_INDICATOR_ACTION_NAME, 't', 0, OptionArg.STRING, null, "Toggle an indicator", "code_name" },
{ null }
};

private PanelWindow? panel_window = null;
private PanelWindow panel_window;

construct {
flags = ApplicationFlags.HANDLES_COMMAND_LINE;
Expand All @@ -50,14 +45,6 @@ public class Wingpanel.Application : Gtk.Application {
IndicatorManager.get_default ().initialize (IndicatorManager.ServerType.SESSION);
}

if (options.contains (OPEN_INDICATOR_ACTION_NAME)) {
activate_action (OPEN_INDICATOR_ACTION_NAME, options.lookup_value (OPEN_INDICATOR_ACTION_NAME, VariantType.STRING));
}

if (options.contains (CLOSE_INDICATOR_ACTION_NAME)) {
activate_action (CLOSE_INDICATOR_ACTION_NAME, options.lookup_value (CLOSE_INDICATOR_ACTION_NAME, VariantType.STRING));
}

if (options.contains (TOGGLE_INDICATOR_ACTION_NAME)) {
activate_action (TOGGLE_INDICATOR_ACTION_NAME, options.lookup_value (TOGGLE_INDICATOR_ACTION_NAME, VariantType.STRING));
}
Expand All @@ -73,34 +60,11 @@ public class Wingpanel.Application : Gtk.Application {
panel_window = new PanelWindow (this);
panel_window.present ();

var list_indicators_action = new SimpleAction.stateful (LIST_INDICATORS_ACTION_NAME, null, new Variant.strv (list_indicators ()));

var indicator_manager = IndicatorManager.get_default ();
indicator_manager.indicator_added.connect (() => {
list_indicators_action.set_state (new Variant.strv (list_indicators ()));
});
indicator_manager.indicator_removed.connect (() => {
list_indicators_action.set_state (new Variant.strv (list_indicators ()));
});

var open_indicator_action = new SimpleAction (OPEN_INDICATOR_ACTION_NAME, VariantType.STRING);
open_indicator_action.activate.connect ((parameter) => {
panel_window.popover_manager.set_popover_visible (parameter.get_string (), true);
});

var close_indicator_action = new SimpleAction (CLOSE_INDICATOR_ACTION_NAME, VariantType.STRING);
close_indicator_action.activate.connect ((parameter) => {
panel_window.popover_manager.set_popover_visible (parameter.get_string (), false);
});

var toggle_indicator_action = new SimpleAction (TOGGLE_INDICATOR_ACTION_NAME, VariantType.STRING);
toggle_indicator_action.activate.connect ((parameter) => {
panel_window.toggle_indicator (parameter.get_string ());
});

add_action (list_indicators_action);
add_action (open_indicator_action);
add_action (close_indicator_action);
add_action (toggle_indicator_action);

var keybinding_settings = new Settings ("io.elementary.panel.keybindings");
Expand All @@ -117,16 +81,6 @@ public class Wingpanel.Application : Gtk.Application {
/* Do nothing */
}

private string[] list_indicators () {
string[] code_names = {};

foreach (Indicator indicator in IndicatorManager.get_default ().get_indicators ()) {
code_names += indicator.code_name;
}

return code_names;
}

public static int main (string[] args) {
return new Wingpanel.Application ().run (args);
}
Expand Down
3 changes: 1 addition & 2 deletions src/PanelWindow.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,7 @@ public class Wingpanel.PanelWindow : Gtk.Window {
}
}

public Services.PopoverManager popover_manager;

private Services.PopoverManager popover_manager;
private Widgets.Panel panel;

private Pantheon.Desktop.Shell? desktop_shell;
Expand Down
12 changes: 0 additions & 12 deletions src/Services/PopoverManager.vala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,18 +83,6 @@ public class Wingpanel.Services.PopoverManager : Object {
});
}

public void set_popover_visible (string code_name, bool visible) {
if (registered_indicators.has_key (code_name)) {
var new_indicator = registered_indicators.get (code_name);

if (visible && (current_indicator == null || current_indicator.base_indicator.code_name != new_indicator.base_indicator.code_name)) {
current_indicator = new_indicator;
} else if (current_indicator.base_indicator.code_name == new_indicator.base_indicator.code_name && !visible) {
current_indicator = null;
}
}
}

public void toggle_popover_visible (string code_name) {
if (registered_indicators.has_key (code_name)) {
current_indicator = registered_indicators.get (code_name);
Expand Down