10dcc100e9
This dramatically thins down and sanitizes the application code.
The ShellAppSystem changes in a number of ways:
* Preferences are special cased more explicitly; they aren't apps,
they're shortcuts for an app), and we don't have many of them, so
don't need e.g. the optimizations in ShellAppSystem for searching.
* get_app() changes to lookup_app() and returns null if an app isn't
found. The semantics where it tried to find the .desktop file
if we didn't know about it were just broken; I am pretty sure no
caller needs this, and if they do we'll fix them.
* ShellAppSystem maintains two indexes on apps (by desktop file id
and by GMenuTreeEntry), but is no longer in the business of
dealing with GMenuTree as far as hierarchy and categories go. That
is moved up into js/ui/appDisplay.js. Actually, it flattens both
apps and settings.
Also, ShellWindowTracker is now the sole reference-owner for
window-backed apps. We still do the weird "window:0x1234beef" id
for these apps, but a reference is not stored in ShellAppSystem.
The js/ui/appDisplay.js code is rewritten, and sucks a lot less.
Variable names are clearer:
_apps -> _appIcons
_filterApp -> _visibleApps
_filters -> _categoryBox
Similarly for function names. We no longer call (for every app) a
recursive lookup in GMenuTree to see if it's in a particular section
on every category switch; it's all cached.
NOTE - this intentionally reverts the incremental loading code from
commit 7813c5b93f. It's fast enough
here without that.
https://bugzilla.gnome.org/show_bug.cgi?id=648149
134 lines
3.5 KiB
JavaScript
134 lines
3.5 KiB
JavaScript
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
|
|
|
const Shell = imports.gi.Shell;
|
|
const Lang = imports.lang;
|
|
const Signals = imports.signals;
|
|
|
|
const Main = imports.ui.main;
|
|
|
|
function AppFavorites() {
|
|
this._init();
|
|
}
|
|
|
|
AppFavorites.prototype = {
|
|
FAVORITE_APPS_KEY: 'favorite-apps',
|
|
|
|
_init: function() {
|
|
this._favorites = {};
|
|
global.settings.connect('changed::' + this.FAVORITE_APPS_KEY, Lang.bind(this, this._onFavsChanged));
|
|
this._reload();
|
|
},
|
|
|
|
_onFavsChanged: function() {
|
|
this._reload();
|
|
this.emit('changed');
|
|
},
|
|
|
|
_reload: function() {
|
|
let ids = global.settings.get_strv(this.FAVORITE_APPS_KEY);
|
|
let appSys = Shell.AppSystem.get_default();
|
|
let apps = ids.map(function (id) {
|
|
return appSys.lookup_app(id);
|
|
}).filter(function (app) {
|
|
return app != null;
|
|
});
|
|
this._favorites = {};
|
|
for (let i = 0; i < apps.length; i++) {
|
|
let app = apps[i];
|
|
this._favorites[app.get_id()] = app;
|
|
}
|
|
},
|
|
|
|
_getIds: function() {
|
|
let ret = [];
|
|
for (let id in this._favorites)
|
|
ret.push(id);
|
|
return ret;
|
|
},
|
|
|
|
getFavoriteMap: function() {
|
|
return this._favorites;
|
|
},
|
|
|
|
getFavorites: function() {
|
|
let ret = [];
|
|
for (let id in this._favorites)
|
|
ret.push(this._favorites[id]);
|
|
return ret;
|
|
},
|
|
|
|
isFavorite: function(appId) {
|
|
return appId in this._favorites;
|
|
},
|
|
|
|
_addFavorite: function(appId, pos) {
|
|
if (appId in this._favorites)
|
|
return false;
|
|
|
|
let app = Shell.AppSystem.get_default().lookup_app(appId);
|
|
|
|
if (!app)
|
|
return false;
|
|
|
|
let ids = this._getIds();
|
|
if (pos == -1)
|
|
ids.push(appId);
|
|
else
|
|
ids.splice(pos, 0, appId);
|
|
global.settings.set_strv(this.FAVORITE_APPS_KEY, ids);
|
|
this._favorites[appId] = app;
|
|
return true;
|
|
},
|
|
|
|
addFavoriteAtPos: function(appId, pos) {
|
|
if (!this._addFavorite(appId, pos))
|
|
return;
|
|
|
|
let app = Shell.AppSystem.get_default().lookup_app(appId);
|
|
|
|
Main.overview.shellInfo.setMessage(_("%s has been added to your favorites.").format(app.get_name()), Lang.bind(this, function () {
|
|
this._removeFavorite(appId);
|
|
}));
|
|
},
|
|
|
|
addFavorite: function(appId) {
|
|
this.addFavoriteAtPos(appId, -1);
|
|
},
|
|
|
|
moveFavoriteToPos: function(appId, pos) {
|
|
this._removeFavorite(appId);
|
|
this._addFavorite(appId, pos);
|
|
},
|
|
|
|
_removeFavorite: function(appId) {
|
|
if (!appId in this._favorites)
|
|
return false;
|
|
|
|
let ids = this._getIds().filter(function (id) { return id != appId; });
|
|
global.settings.set_strv(this.FAVORITE_APPS_KEY, ids);
|
|
return true;
|
|
},
|
|
|
|
removeFavorite: function(appId) {
|
|
let ids = this._getIds();
|
|
let pos = ids.indexOf(appId);
|
|
|
|
let app = this._favorites[appId];
|
|
if (!this._removeFavorite(appId))
|
|
return;
|
|
|
|
Main.overview.shellInfo.setMessage(_("%s has been removed from your favorites.").format(app.get_name()),
|
|
Lang.bind(this, function () {
|
|
this._addFavorite(appId, pos);
|
|
}));
|
|
}
|
|
};
|
|
Signals.addSignalMethods(AppFavorites.prototype);
|
|
|
|
var appFavoritesInstance = null;
|
|
function getAppFavorites() {
|
|
if (appFavoritesInstance == null)
|
|
appFavoritesInstance = new AppFavorites();
|
|
return appFavoritesInstance;
|
|
}
|