Skip to content
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

Jump to bottom

Add System Monitor to right click panel when one is found #12134

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add System Monitor to right click panel when one is found #12134

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: 43 additions & 7 deletions js/ui/panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1681,19 +1681,19 @@ PanelCorner.prototype = {
}
}; // end of panel corner

function SettingsLauncher(label, keyword, icon) {
this._init(label, keyword, icon);
function SettingsLauncher(label, keyword, icon, command) {
this._init(label, keyword, icon, command);
}

SettingsLauncher.prototype = {
__proto__: PopupMenu.PopupIconMenuItem.prototype,

_init: function (label, keyword, icon) {
_init: function (label, keyword, icon, command) {
PopupMenu.PopupIconMenuItem.prototype._init.call(this, label, icon, St.IconType.SYMBOLIC);

this._keyword = keyword;
this.connect('activate', Lang.bind(this, function() {
Util.spawnCommandLine("cinnamon-settings " + this._keyword);
Util.spawnCommandLine(command + " " + this._keyword);
}));
},
};
Expand All @@ -1711,12 +1711,13 @@ PanelContextMenu.prototype = {
this.actor.hide();
this.panelId = panelId;

let moreSettingsMenuItem = new SettingsLauncher(_("Panel settings"), "panel " + panelId, "emblem-system");
let moreSettingsMenuItem = new SettingsLauncher(_("Panel settings"), "panel " + panelId, "emblem-system", "cinnamon-settings");
this.addMenuItem(moreSettingsMenuItem);

let applet_settings_item = new SettingsLauncher(_("Applets"), "applets panel" + panelId, "application-x-addon");
let applet_settings_item = new SettingsLauncher(_("Applets"), "applets panel" + panelId, "application-x-addon", "cinnamon-settings");
this.addMenuItem(applet_settings_item);


let menu = this;

menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); // separator line
Expand Down Expand Up @@ -1816,10 +1817,45 @@ PanelContextMenu.prototype = {
confirm.open();
});

menu.troubleshootItem.menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem());

// Add the System Monitor launcher to the troubleshoot menu
let systemMonitorInfo = this._findFirstSystemMonitor();
if (systemMonitorInfo) {
menu.troubleshootItem.menu.addAction(_(systemMonitorInfo.name), function(event) {
let settingsLauncher = new SettingsLauncher(systemMonitorInfo.name, "", "", systemMonitorInfo.command);
settingsLauncher.activate();
});
}

menu.addMenuItem(new PopupMenu.PopupSeparatorMenuItem()); // separator line
menu.addMenuItem(menu.troubleshootItem);

this.addMenuItem(new SettingsLauncher(_("System Settings"), "", "preferences-desktop"));
this.addMenuItem(new SettingsLauncher(_("System Settings"), "", "system-run", "cinnamon-settings"));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Although working with the other icon themes I tested, the system-run icon presents something like a play icon for the breeze icon theme, so it might not be the best suited for System Settings there.

},

_findFirstSystemMonitor: function() {
let appInfoList = Gio.AppInfo.get_all();
const requiredCategories = ['System', 'Monitor'];
const excludedCategories = ['Utility', 'TerminalEmulator', 'RemoteAccess', 'Development', 'Office', 'Network'];
for (let appInfo of appInfoList) {
if (appInfo.should_show()) {
let categories = appInfo.get_categories();
//Finds the first available system monitor based on category filters
if (
categories &&
requiredCategories.every(cat => categories.includes(cat)) &&
!excludedCategories.some(cat => categories.includes(cat))) {
// Return the app name, icon, and executable command
return {
name: appInfo.get_display_name(),
icon: appInfo.get_icon().to_string(),
command: appInfo.get_executable()
};
}
}
}
return null;
},

open: function(animate) {
Expand Down
Loading