Skip to content

NEW: menu: Add option to hide categories icons #13470

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

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

NEW: menu: Add option to hide categories icons #13470

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
51 changes: 27 additions & 24 deletions files/usr/share/cinnamon/applets/menu@cinnamon.org/applet.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,32 +838,34 @@ class CategoryButton extends SimpleMenuItem {
categoryId: categoryId,
});

let size = applet.categoryIconSize;
if (applet.symbolicCategoryIcons) {
symbolic = true;
if (typeof icon !== 'string')
if (icon?.get_names)
icon = icon.get_names()[0];
if (applet.showCategoryIcons) {
let size = applet.categoryIconSize;
if (applet.symbolicCategoryIcons) {
symbolic = true;
if (typeof icon !== 'string')
if (icon?.get_names)
icon = icon.get_names()[0];
else
icon = "";
if (icon.startsWith("applications-") || icon === "folder-recent")
icon = "xsi-" + icon;
else if (icon == "xapp-user-favorites")
icon = "xsi-user-favorites-symbolic";
else if (icon == "preferences-system")
icon = "xsi-applications-administration";
else if (icon == "preferences-desktop")
icon = "xsi-applications-preferences";
else if (icon == "wine")
icon = "xsi-applications-wine";
else
icon = "";
if (icon.startsWith("applications-") || icon === "folder-recent")
icon = "xsi-" + icon;
else if (icon == "xapp-user-favorites")
icon = "xsi-user-favorites-symbolic";
else if (icon == "preferences-system")
icon = "xsi-applications-administration";
else if (icon == "preferences-desktop")
icon = "xsi-applications-preferences";
else if (icon == "wine")
icon = "xsi-applications-wine";
else
icon = "xsi-applications-other";
}
icon = "xsi-applications-other";
}

if (typeof icon === 'string')
this.addIcon(size, icon, null, symbolic);
else if (icon)
this.addIcon(size, null, icon, symbolic);
if (typeof icon === 'string')
this.addIcon(size, icon, null, symbolic);
else if (icon)
this.addIcon(size, null, icon, symbolic);
}

this.addLabel(this.name, 'appmenu-category-button-label');

Expand Down Expand Up @@ -1175,6 +1177,7 @@ class CinnamonMenuApplet extends Applet.TextIconApplet {
this.settings.bind("menu-icon-size", "menuIconSize", this._updateIconAndLabel);
this.settings.bind("menu-label", "menuLabel", this._updateIconAndLabel);
this.settings.bind("overlay-key", "overlayKey", this._updateKeybinding);
this.settings.bind("show-category-icons", "showCategoryIcons", () => this.queueRefresh(REFRESH_ALL_MASK));
this.settings.bind("symbolic-category-icons", "symbolicCategoryIcons", () => this.queueRefresh(REFRESH_ALL_MASK));
this.settings.bind("category-icon-size", "categoryIconSize", () => this.queueRefresh(REFRESH_ALL_MASK));
this.settings.bind("category-hover", "categoryHover", this._updateCategoryHover);
Expand Down
13 changes: 10 additions & 3 deletions files/usr/share/cinnamon/applets/menu@cinnamon.org/settings-schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
"appearance-menu" : {
"type" : "section",
"title" : "Options",
"keys" : ["search-position", "system-position", "show-description", "symbolic-category-icons", "category-icon-size",
"keys" : ["search-position", "system-position", "show-description", "show-category-icons", "symbolic-category-icons", "category-icon-size",
"application-icon-size", "sidebar-icon-size", "sidebar-max-width",
"reset-menu-size-button"]
},
Expand Down Expand Up @@ -83,10 +83,16 @@
"description" : "Text",
"dependency" : "menu-custom"
},
"show-category-icons" : {
"type" : "switch",
"default" : true,
"description" : "Show categories icons"
},
"symbolic-category-icons" : {
"type" : "switch",
"default" : true,
"description" : "Use symbolic icons for categories"
"description" : "Use symbolic icons for categories",
"dependency" : "show-category-icons"
},
"category-icon-size" : {
"type": "spinbutton",
Expand All @@ -95,7 +101,8 @@
"max" : 48,
"step" : 1,
"units" : "px",
"description" : "Categories icon size"
"description" : "Categories icon size",
"dependency" : "show-category-icons"
},
"application-icon-size" : {
"type": "spinbutton",
Expand Down