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

appDisplay: Make AlphabeticalView an abstract base class of AllView

Browse Source 
We are going to introduce app folders, which will also present an
alphabetical list of applications, but use a different UI. In
preparation for that, split out the item logic into an abstract
base class.

https://bugzilla.gnome.org/show_bug.cgi?id=694192
This commit is contained in:
Florian Müllner 2013-02-19 23:23:41 +01:00
parent 2fbd9b95a7
commit 426b227f03
1 changed files with 59 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
js/ui/appDisplay.js
View File

@ -50,13 +50,55 @@ function _loadCategory(dir, view) {
const AlphabeticalView = new Lang.Class({
Name: 'AlphabeticalView',
Abstract: true,
_init: function() {
this._grid = new IconGrid.IconGrid({ xAlign: St.Align.MIDDLE,
columnLimit: MAX_COLUMNS });
this._appIcons = {}; // desktop file id
this._allApps = [];
this._items = {};
this._allItems = [];
},
removeAll: function() {
this._grid.removeAll();
this._items = {};
this._allItems = [];
},
_getItemId: function(item) {
throw new Error('Not implemented');
},
_createItemIcon: function(item) {
throw new Error('Not implemented');
},
_compareItems: function(a, b) {
throw new Error('Not implemented');
},
_addItem: function(item) {
let id = this._getItemId(item);
if (this._items[id] !== undefined)
return null;
let itemIcon = this._createItemIcon(item);
let pos = Util.insertSorted(this._allItems, item, this._compareItems);
this._grid.addItem(itemIcon.actor, pos);
this._items[id] = itemIcon;
return itemIcon;
}
});
const AllView = new Lang.Class({
Name: 'AllView',
Extends: AlphabeticalView,
_init: function() {
this.parent();
let box = new St.BoxLayout({ vertical: true });
box.add(this._grid.actor, { y_align: St.Align.START, expand: true });
@ -80,25 +122,23 @@ const AlphabeticalView = new Lang.Class({
return false;
},
removeAll: function() {
this._grid.removeAll();
this._appIcons = {};
this._allApps = [];
_getItemId: function(item) {
return item.get_id();
},
_createItemIcon: function(item) {
return new AppIcon(item);
},
_compareItems: function(a, b) {
return a.compare_by_name(b);
},
addApp: function(app) {
var id = app.get_id();
if (this._appIcons[id] !== undefined)
return;
let appIcon = new AppIcon(app);
let pos = Util.insertSorted(this._allApps, app, function(a, b) {
return a.compare_by_name(b);
});
this._grid.addItem(appIcon.actor, pos);
appIcon.actor.connect('key-focus-in', Lang.bind(this, this._ensureIconVisible));
this._appIcons[id] = appIcon;
let appIcon = this._addItem(app);
if (appIcon)
appIcon.actor.connect('key-focus-in',
Lang.bind(this, this._ensureIconVisible));
},
_ensureIconVisible: function(icon) {
@ -142,7 +182,7 @@ const AppDisplay = new Lang.Class({
style_class: 'app-display',
x_fill: true, y_fill: true });
this._view = new AlphabeticalView();
this._view = new AllView();
box.add(this._view.actor, { expand: true });
// We need a dummy actor to catch the keyboard focus if the