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

appDisplay: Create default folders on start

Browse Source 
The default folders used to be created by gnome-software, as that was
where folder management used to be implemented. Since then, folder
management via drag and drop was implemented in the shell, and the
gnome-software code was removed.

The only bit that still involves gnome-software are the default folders
that are created on first run. Given that everything else has moved to
the shell, it makes sense to take over that part as well.

https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/4948

Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2110>
This commit is contained in:
Florian Müllner 2022-03-02 14:33:11 +01:00 committed by Marge Bot
parent a595fc6d47
commit 919039e266
1 changed files with 52 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
js/ui/appDisplay.js
View File

@ -54,6 +54,35 @@ const DELAYED_MOVE_TIMEOUT = 200;
const DIALOG_SHADE_NORMAL = Clutter.Color.from_pixel(0x000000cc); const DIALOG_SHADE_NORMAL = Clutter.Color.from_pixel(0x000000cc);
const DIALOG_SHADE_HIGHLIGHT = Clutter.Color.from_pixel(0x00000055); const DIALOG_SHADE_HIGHLIGHT = Clutter.Color.from_pixel(0x00000055);
const DEFAULT_FOLDERS = {
'Utilities': {
name: 'X-GNOME-Utilities.directory',
categories: ['X-GNOME-Utilities'],
apps: [
'gnome-abrt.desktop',
'gnome-system-log.desktop',
'nm-connection-editor.desktop',
'org.gnome.baobab.desktop',
'org.gnome.Connections.desktop',
'org.gnome.DejaDup.desktop',
'org.gnome.Dictionary.desktop',
'org.gnome.DiskUtility.desktop',
'org.gnome.eog.desktop',
'org.gnome.Evince.desktop',
'org.gnome.FileRoller.desktop',
'org.gnome.fonts.desktop',
'org.gnome.seahorse.Application.desktop',
'org.gnome.tweaks.desktop',
'org.gnome.Usage.desktop',
'vinagre.desktop',
],
},
'YaST': {
name: 'suse-yast.directory',
categegories: ['X-SuSE-YaST'],
},
};
var SidePages = { var SidePages = {
NONE: 0, NONE: 0,
PREVIOUS: 1 << 0, PREVIOUS: 1 << 0,
@ -1386,6 +1415,7 @@ class AppDisplay extends BaseAppView {
Main.queueDeferredWork(this._redisplayWorkId); Main.queueDeferredWork(this._redisplayWorkId);
}); });
this._folderSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.app-folders' }); this._folderSettings = new Gio.Settings({ schema_id: 'org.gnome.desktop.app-folders' });
this._ensureDefaultFolders();
this._folderSettings.connect('changed::folder-children', () => { this._folderSettings.connect('changed::folder-children', () => {
Main.queueDeferredWork(this._redisplayWorkId); Main.queueDeferredWork(this._redisplayWorkId);
}); });
@ -1450,6 +1480,28 @@ class AppDisplay extends BaseAppView {
this._pageManager.pages = pages; this._pageManager.pages = pages;
} }
_ensureDefaultFolders() {
if (this._folderSettings.get_strv('folder-children').length > 0)
return;
const folders = Object.keys(DEFAULT_FOLDERS);
this._folderSettings.set_strv('folder-children', folders);
const { path } = this._folderSettings;
for (const folder in folders) {
const { name, categories, apps } = DEFAULT_FOLDERS[folder];
const child = new Gio.Settings({
schema_id: 'org.gnome.desktop.app-folders.folder',
path: `${path}/folders/${folder}/`,
});
child.set_string('name', name);
child.set_boolean('translate', true);
child.set_strv('categories', categories);
if (apps)
child.set_strv('apps', apps);
}
}
_ensurePlaceholder(source) { _ensurePlaceholder(source) {
if (this._placeholder) if (this._placeholder)
return; return;