data: Add "System" default folder

The "Utilities" folder is potentially getting quite crowded,
so set up an additional "System" folder. It will be populated
in a follow-up commit.

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3642>
This commit is contained in:
Florian Müllner 2025-02-24 21:36:28 +01:00 committed by Marge Bot
parent 0c3e5adbf3
commit c0e3dfd166
7 changed files with 29 additions and 11 deletions

View File

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

View File

View File

@ -32,7 +32,11 @@ foreach desktop_file : desktop_files
)
endforeach
desktop_directory = 'X-GNOME-Shell-Utilities.directory'
desktop_directories = [
'X-GNOME-Shell-Utilities.directory',
'X-GNOME-Shell-System.directory',
]
foreach desktop_directory : desktop_directories
i18n.merge_file(
input: f'@desktop_directory@.desktop.in',
output: desktop_directory,
@ -41,6 +45,7 @@ i18n.merge_file(
install_dir: join_paths(datadir, 'desktop-directories'),
type: 'desktop',
)
endforeach
serviceconf = configuration_data()
serviceconf.set('libexecdir', libexecdir)

View File

@ -22,3 +22,4 @@ export const HAVE_BLUETOOTH = pkg.checkSymbol('GnomeBluetooth', '3.0',
'Client.default_adapter_state');
export const UTILITIES_FOLDER_APPS = @UTILS_FOLDER_APPS@;
export const SYSTEM_FOLDER_APPS = @SYSTEM_FOLDER_APPS@;

View File

@ -9,6 +9,10 @@ jsconf.set('UTILS_FOLDER_APPS', run_command(
generate_app_list, '../../data/default-apps/utilities-folder.txt',
check: true,
).stdout())
jsconf.set('SYSTEM_FOLDER_APPS', run_command(
generate_app_list, '../../data/default-apps/system-folder.txt',
check: true,
).stdout())
jsconf.set('datadir', datadir)
jsconf.set('libexecdir', libexecdir)

View File

@ -24,7 +24,7 @@ import * as SystemActions from '../misc/systemActions.js';
import * as Main from './main.js';
import {UTILITIES_FOLDER_APPS} from '../misc/config.js';
import * as Config from '../misc/config.js';
const MENU_POPUP_TIMEOUT = 600;
const POPDOWN_DIALOG_TIMEOUT = 500;
@ -59,9 +59,13 @@ const DIALOG_SHADE_NORMAL = new Cogl.Color({red: 0, green: 0, blue: 0, alpha: 20
const DIALOG_SHADE_HIGHLIGHT = new Cogl.Color({red: 0, green: 0, blue: 0, alpha: 85});
const DEFAULT_FOLDERS = {
'System': {
name: 'X-GNOME-Shell-System.directory',
apps: Config.SYSTEM_FOLDER_APPS,
},
'Utilities': {
name: 'X-GNOME-Shell-Utilities.directory',
apps: UTILITIES_FOLDER_APPS,
apps: Config.UTILITIES_FOLDER_APPS,
},
'YaST': {
name: 'suse-yast.directory',

View File

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