brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

data: Add X-GNOME-Shell-Utilities.directory file to allow showing real name

Browse Source 
Instead of having the name of the directory be X-GNOME-Utilities. This
also allows translating the name to the user's language. The name is
chose to be different to X-GNOME-Utilities from GNOME Menus.

In the process, also remove the categories. The menu definition from
gnome-menus is not used, and it's not a category that apps list
themselves, so it's completely unused anyway.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3526>
This commit is contained in:
Pablo Correa Gómez 2024-10-23 17:35:21 +02:00 committed by Pablo Correa Gómez
parent 6f280c8d7f
commit 152faae6f9
4 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
data/X-GNOME-Shell-Utilities.directory.desktop.in Normal file
View File

@ -0,0 +1,3 @@
[Desktop Entry]
Name=Utilities
Type=Directory

9
data/meson.build
View File

@ -32,6 +32,15 @@ foreach desktop_file : desktop_files
) )
endforeach endforeach
i18n.merge_file(
input: 'X-GNOME-Shell-Utilities.directory.desktop.in',
output: '@BASENAME@',
po_dir: po_dir,
install: true,
install_dir: join_paths(datadir, 'desktop-directories'),
type: 'desktop',
)
serviceconf = configuration_data() serviceconf = configuration_data()
serviceconf.set('libexecdir', libexecdir) serviceconf.set('libexecdir', libexecdir)
foreach service_file : service_files foreach service_file : service_files

6
js/ui/appDisplay.js
View File

@ -58,8 +58,7 @@ const DIALOG_SHADE_HIGHLIGHT = new Cogl.Color({red: 0, green: 0, blue: 0, alpha:
const DEFAULT_FOLDERS = { const DEFAULT_FOLDERS = {
'Utilities': { 'Utilities': {
name: 'X-GNOME-Utilities.directory', name: 'X-GNOME-Shell-Utilities.directory',
categories: ['X-GNOME-Utilities'],
apps: [ apps: [
'gnome-abrt.desktop', 'gnome-abrt.desktop',
'gnome-system-log.desktop', 'gnome-system-log.desktop',
@ -1446,7 +1445,8 @@ class AppDisplay extends BaseAppView {
}); });
child.set_string('name', name); child.set_string('name', name);
child.set_boolean('translate', true); child.set_boolean('translate', true);
child.set_strv('categories', categories); if (categories)
child.set_strv('categories', categories);
if (apps) if (apps)
child.set_strv('apps', apps); child.set_strv('apps', apps);
} }

1
po/POTFILES.in
View File

@ -7,6 +7,7 @@ data/org.gnome.Shell.desktop.in.in
data/org.gnome.shell.gschema.xml.in data/org.gnome.shell.gschema.xml.in
data/org.gnome.Shell.Extensions.desktop.in.in data/org.gnome.Shell.Extensions.desktop.in.in
data/org.gnome.Shell.PortalHelper.desktop.in.in data/org.gnome.Shell.PortalHelper.desktop.in.in
data/X-GNOME-Shell-Utilities.directory.desktop.in
js/dbusServices/extensions/ui/extension-error-page.ui js/dbusServices/extensions/ui/extension-error-page.ui
js/gdm/authPrompt.js js/gdm/authPrompt.js
js/gdm/loginDialog.js js/gdm/loginDialog.js