2008-12-01 19:51:43 +00:00
|
|
|
/* -*- mode: js2; js2-basic-offset: 4; indent-tabs-mode: nil -*- */
|
2008-11-21 00:53:11 +00:00
|
|
|
|
2009-04-01 19:51:17 +00:00
|
|
|
const Big = imports.gi.Big;
|
2008-11-21 00:53:11 +00:00
|
|
|
const Clutter = imports.gi.Clutter;
|
2009-04-01 19:51:17 +00:00
|
|
|
const Pango = imports.gi.Pango;
|
2009-07-07 20:08:41 +00:00
|
|
|
const GLib = imports.gi.GLib;
|
2008-11-21 00:53:11 +00:00
|
|
|
const Gio = imports.gi.Gio;
|
|
|
|
const Gtk = imports.gi.Gtk;
|
|
|
|
const Shell = imports.gi.Shell;
|
2009-04-01 19:51:17 +00:00
|
|
|
const Lang = imports.lang;
|
2009-02-02 23:02:16 +00:00
|
|
|
const Signals = imports.signals;
|
2009-06-30 20:35:39 +00:00
|
|
|
const Mainloop = imports.mainloop;
|
2009-08-14 13:30:48 +00:00
|
|
|
const Gettext = imports.gettext.domain('gnome-shell');
|
|
|
|
const _ = Gettext.gettext;
|
2008-11-21 00:53:11 +00:00
|
|
|
|
2009-10-15 23:28:29 +00:00
|
|
|
const AppFavorites = imports.ui.appFavorites;
|
2009-08-13 16:21:01 +00:00
|
|
|
const AppIcon = imports.ui.appIcon;
|
2009-06-30 20:35:39 +00:00
|
|
|
const DND = imports.ui.dnd;
|
2008-12-20 04:27:57 +00:00
|
|
|
const GenericDisplay = imports.ui.genericDisplay;
|
2009-07-31 21:20:26 +00:00
|
|
|
const Main = imports.ui.main;
|
2009-07-02 09:04:33 +00:00
|
|
|
const Workspaces = imports.ui.workspaces;
|
2009-04-01 19:51:17 +00:00
|
|
|
|
|
|
|
const ENTERED_MENU_COLOR = new Clutter.Color();
|
|
|
|
ENTERED_MENU_COLOR.from_pixel(0x00ff0022);
|
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
const WELL_DEFAULT_COLUMNS = 4;
|
2009-09-24 04:01:57 +00:00
|
|
|
const WELL_ITEM_MIN_HSPACING = 4;
|
2009-08-06 19:39:09 +00:00
|
|
|
const WELL_ITEM_VSPACING = 4;
|
2009-06-30 20:35:39 +00:00
|
|
|
|
2009-09-26 18:53:54 +00:00
|
|
|
const MENU_ARROW_SIZE = 12;
|
|
|
|
const MENU_SPACING = 7;
|
2008-12-20 04:27:57 +00:00
|
|
|
|
2009-04-23 14:41:24 +00:00
|
|
|
const MAX_ITEMS = 30;
|
|
|
|
|
2008-12-20 04:27:57 +00:00
|
|
|
/* This class represents a single display item containing information about an application.
|
|
|
|
*
|
2009-06-16 16:20:12 +00:00
|
|
|
* appInfo - AppInfo object containing information about the application
|
2008-12-20 04:27:57 +00:00
|
|
|
*/
|
Rewrite Dash, remove hardcoded width/height from GenericDisplay
This patch is a near-total rewrite of the Dash. First, the dash
code moves into a separate file, dash.js.
Inside dash.js, the components are more broken up into separate
classes; in particular there's now a Pane class and a MoreLink
class. Instead of each section of the dash, when activated,
attempting to close all N-1 other sections, instead there
is the concept of a single "active pane", and when e.g. activating
the More link for documents, if we know there's an active pane
which happens to be the apps, close it.
Many redundant containers were removed from the dash, and all
manual width, height and x/y offsets are entirely gone. We move
the visual apperance closer to the design by using the view-more.svg,
etc.
To complete the removal of height/width calculations from the dash,
we also had to do the same for GenericDisplay. Also clean up
the positioning inside overlay.js so calculation of children's
positioning is inside a single function that flows from screen.width
and screen.height, so in the future we can stop passing the width
into the Dash constructor and call this once and work on screen
resizing.
2009-08-01 02:12:01 +00:00
|
|
|
function AppDisplayItem(appInfo) {
|
|
|
|
this._init(appInfo);
|
2008-11-21 00:53:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
AppDisplayItem.prototype = {
|
2008-12-20 04:27:57 +00:00
|
|
|
__proto__: GenericDisplay.GenericDisplayItem.prototype,
|
|
|
|
|
Rewrite Dash, remove hardcoded width/height from GenericDisplay
This patch is a near-total rewrite of the Dash. First, the dash
code moves into a separate file, dash.js.
Inside dash.js, the components are more broken up into separate
classes; in particular there's now a Pane class and a MoreLink
class. Instead of each section of the dash, when activated,
attempting to close all N-1 other sections, instead there
is the concept of a single "active pane", and when e.g. activating
the More link for documents, if we know there's an active pane
which happens to be the apps, close it.
Many redundant containers were removed from the dash, and all
manual width, height and x/y offsets are entirely gone. We move
the visual apperance closer to the design by using the view-more.svg,
etc.
To complete the removal of height/width calculations from the dash,
we also had to do the same for GenericDisplay. Also clean up
the positioning inside overlay.js so calculation of children's
positioning is inside a single function that flows from screen.width
and screen.height, so in the future we can stop passing the width
into the Dash constructor and call this once and work on screen
resizing.
2009-08-01 02:12:01 +00:00
|
|
|
_init : function(appInfo) {
|
|
|
|
GenericDisplay.GenericDisplayItem.prototype._init.call(this);
|
2008-12-09 22:10:43 +00:00
|
|
|
this._appInfo = appInfo;
|
2008-12-01 19:51:43 +00:00
|
|
|
|
2009-07-07 20:08:41 +00:00
|
|
|
this._setItemInfo(appInfo.get_name(), appInfo.get_description());
|
2008-12-01 19:51:43 +00:00
|
|
|
},
|
2008-12-20 04:27:57 +00:00
|
|
|
|
2009-07-02 04:35:26 +00:00
|
|
|
getId: function() {
|
2009-07-07 20:08:41 +00:00
|
|
|
return this._appInfo.get_id();
|
2009-07-02 04:35:26 +00:00
|
|
|
},
|
|
|
|
|
2008-12-20 04:27:57 +00:00
|
|
|
//// Public method overrides ////
|
|
|
|
|
|
|
|
// Opens an application represented by this display item.
|
|
|
|
launch : function() {
|
2009-10-15 23:28:29 +00:00
|
|
|
let appSys = Shell.AppSystem.get_default();
|
|
|
|
let app = appSys.get_app(this._appInfo.get_id());
|
|
|
|
let windows = app.get_windows();
|
2009-09-09 20:43:29 +00:00
|
|
|
if (windows.length > 0) {
|
|
|
|
let mostRecentWindow = windows[0];
|
2009-09-23 14:13:36 +00:00
|
|
|
Main.overview.activateWindow(mostRecentWindow, Main.currentTime());
|
2009-09-09 20:43:29 +00:00
|
|
|
} else {
|
|
|
|
this._appInfo.launch();
|
|
|
|
}
|
2009-03-20 16:06:34 +00:00
|
|
|
},
|
|
|
|
|
|
|
|
//// Protected method overrides ////
|
|
|
|
|
2009-06-29 19:08:48 +00:00
|
|
|
// Returns an icon for the item.
|
|
|
|
_createIcon : function() {
|
2009-07-07 20:08:41 +00:00
|
|
|
return this._appInfo.create_icon_texture(GenericDisplay.ITEM_DISPLAY_ICON_SIZE);
|
2009-06-29 19:08:48 +00:00
|
|
|
},
|
|
|
|
|
2009-07-29 21:47:50 +00:00
|
|
|
// Returns a preview icon for the item.
|
|
|
|
_createPreviewIcon : function() {
|
|
|
|
return this._appInfo.create_icon_texture(GenericDisplay.PREVIEW_ICON_SIZE);
|
2009-08-18 00:29:54 +00:00
|
|
|
},
|
|
|
|
|
|
|
|
shellWorkspaceLaunch: function() {
|
|
|
|
this.launch();
|
2009-03-20 16:06:34 +00:00
|
|
|
}
|
2008-12-20 04:27:57 +00:00
|
|
|
};
|
2008-11-21 00:53:11 +00:00
|
|
|
|
2009-04-01 19:51:17 +00:00
|
|
|
const MENU_UNSELECTED = 0;
|
|
|
|
const MENU_SELECTED = 1;
|
|
|
|
const MENU_ENTERED = 2;
|
|
|
|
|
2009-09-26 18:53:54 +00:00
|
|
|
function MenuItem(name, id) {
|
|
|
|
this._init(name, id);
|
2009-04-01 19:51:17 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* MenuItem:
|
|
|
|
* Shows the list of menus in the sidebar.
|
|
|
|
*/
|
|
|
|
MenuItem.prototype = {
|
2009-09-26 18:53:54 +00:00
|
|
|
_init: function(name, id) {
|
2009-04-01 19:51:17 +00:00
|
|
|
this.id = id;
|
|
|
|
|
|
|
|
this.actor = new Big.Box({ orientation: Big.BoxOrientation.HORIZONTAL,
|
|
|
|
spacing: 4,
|
|
|
|
corner_radius: 4,
|
|
|
|
padding_right: 4,
|
2009-09-26 18:53:54 +00:00
|
|
|
padding_left: 4,
|
2009-04-01 19:51:17 +00:00
|
|
|
reactive: true });
|
|
|
|
this.actor.connect('button-press-event', Lang.bind(this, function (a, e) {
|
|
|
|
this.setState(MENU_SELECTED);
|
|
|
|
}));
|
|
|
|
|
|
|
|
this._text = new Clutter.Text({ color: GenericDisplay.ITEM_DISPLAY_NAME_COLOR,
|
|
|
|
font_name: "Sans 14px",
|
|
|
|
text: name });
|
|
|
|
|
2009-07-27 22:59:26 +00:00
|
|
|
// We use individual boxes for the label and the arrow to ensure that they
|
|
|
|
// are aligned vertically. Just setting y_align: Big.BoxAlignment.CENTER
|
|
|
|
// on this.actor does not seem to achieve that.
|
2009-09-26 18:53:54 +00:00
|
|
|
let labelBox = new Big.Box({ y_align: Big.BoxAlignment.CENTER,
|
|
|
|
padding: 4 });
|
2009-04-01 19:51:17 +00:00
|
|
|
|
2009-07-27 22:59:26 +00:00
|
|
|
labelBox.append(this._text, Big.BoxPackFlags.NONE);
|
|
|
|
|
|
|
|
this.actor.append(labelBox, Big.BoxPackFlags.EXPAND);
|
|
|
|
|
|
|
|
let arrowBox = new Big.Box({ y_align: Big.BoxAlignment.CENTER });
|
|
|
|
|
2009-09-26 18:53:54 +00:00
|
|
|
this._arrow = new Shell.Arrow({ surface_width: MENU_ARROW_SIZE,
|
|
|
|
surface_height: MENU_ARROW_SIZE,
|
2009-04-01 19:51:17 +00:00
|
|
|
direction: Gtk.ArrowType.RIGHT,
|
2009-07-27 22:59:26 +00:00
|
|
|
opacity: 0 });
|
|
|
|
arrowBox.append(this._arrow, Big.BoxPackFlags.NONE);
|
|
|
|
this.actor.append(arrowBox, Big.BoxPackFlags.NONE);
|
2009-04-01 19:51:17 +00:00
|
|
|
},
|
|
|
|
|
|
|
|
getState: function() {
|
|
|
|
return this._state;
|
|
|
|
},
|
|
|
|
|
|
|
|
setState: function (state) {
|
|
|
|
if (state == this._state)
|
|
|
|
return;
|
|
|
|
this._state = state;
|
|
|
|
if (this._state == MENU_UNSELECTED) {
|
|
|
|
this.actor.background_color = null;
|
|
|
|
this._arrow.set_opacity(0);
|
|
|
|
} else if (this._state == MENU_ENTERED) {
|
|
|
|
this.actor.background_color = ENTERED_MENU_COLOR;
|
|
|
|
this._arrow.set_opacity(0xFF/2);
|
|
|
|
} else {
|
|
|
|
this.actor.background_color = GenericDisplay.ITEM_DISPLAY_SELECTED_BACKGROUND_COLOR;
|
|
|
|
this._arrow.set_opacity(0xFF);
|
|
|
|
}
|
|
|
|
this.emit('state-changed')
|
|
|
|
}
|
|
|
|
}
|
|
|
|
Signals.addSignalMethods(MenuItem.prototype);
|
|
|
|
|
2008-12-20 04:27:57 +00:00
|
|
|
/* This class represents a display containing a collection of application items.
|
|
|
|
* The applications are sorted based on their popularity by default, and based on
|
|
|
|
* their name if some search filter is applied.
|
2009-09-11 21:48:02 +00:00
|
|
|
*
|
|
|
|
* showPrefs - a boolean indicating if this AppDisplay should contain preference
|
|
|
|
* applets, rather than applications
|
2008-12-20 04:27:57 +00:00
|
|
|
*/
|
2009-09-11 21:48:02 +00:00
|
|
|
function AppDisplay(showPrefs) {
|
|
|
|
this._init(showPrefs);
|
2008-11-21 00:53:11 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
AppDisplay.prototype = {
|
2008-12-20 04:27:57 +00:00
|
|
|
__proto__: GenericDisplay.GenericDisplay.prototype,
|
|
|
|
|
2009-09-11 21:48:02 +00:00
|
|
|
_init : function(showPrefs) {
|
Rewrite Dash, remove hardcoded width/height from GenericDisplay
This patch is a near-total rewrite of the Dash. First, the dash
code moves into a separate file, dash.js.
Inside dash.js, the components are more broken up into separate
classes; in particular there's now a Pane class and a MoreLink
class. Instead of each section of the dash, when activated,
attempting to close all N-1 other sections, instead there
is the concept of a single "active pane", and when e.g. activating
the More link for documents, if we know there's an active pane
which happens to be the apps, close it.
Many redundant containers were removed from the dash, and all
manual width, height and x/y offsets are entirely gone. We move
the visual apperance closer to the design by using the view-more.svg,
etc.
To complete the removal of height/width calculations from the dash,
we also had to do the same for GenericDisplay. Also clean up
the positioning inside overlay.js so calculation of children's
positioning is inside a single function that flows from screen.width
and screen.height, so in the future we can stop passing the width
into the Dash constructor and call this once and work on screen
resizing.
2009-08-01 02:12:01 +00:00
|
|
|
GenericDisplay.GenericDisplay.prototype._init.call(this);
|
2009-01-21 21:50:57 +00:00
|
|
|
|
2009-09-11 21:48:02 +00:00
|
|
|
this._showPrefs = showPrefs;
|
|
|
|
|
2009-04-01 19:51:17 +00:00
|
|
|
this._menus = [];
|
|
|
|
this._menuDisplays = [];
|
2009-10-07 05:41:28 +00:00
|
|
|
// map<search term, map<appId, true>>
|
|
|
|
// We use a map of appIds instead of an array to ensure that we don't have duplicates and for easier lookup.
|
|
|
|
this._menuSearchAppMatches = {};
|
2009-04-23 14:41:24 +00:00
|
|
|
|
2009-06-18 16:27:19 +00:00
|
|
|
this._appSystem = Shell.AppSystem.get_default();
|
2008-12-01 19:51:43 +00:00
|
|
|
this._appsStale = true;
|
2009-06-30 20:35:39 +00:00
|
|
|
this._appSystem.connect('installed-changed', Lang.bind(this, function(appSys) {
|
2009-04-23 14:41:24 +00:00
|
|
|
this._appsStale = true;
|
2009-10-01 21:41:17 +00:00
|
|
|
this._redisplay(GenericDisplay.RedisplayFlags.NONE);
|
2009-04-23 14:41:24 +00:00
|
|
|
}));
|
2009-01-13 20:45:54 +00:00
|
|
|
|
2009-04-01 19:51:17 +00:00
|
|
|
this._focusInMenus = true;
|
|
|
|
this._activeMenuIndex = -1;
|
|
|
|
this._activeMenu = null;
|
|
|
|
this._activeMenuApps = null;
|
|
|
|
this._menuDisplay = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
|
|
|
|
spacing: MENU_SPACING
|
|
|
|
});
|
|
|
|
|
|
|
|
this.connect('expanded', Lang.bind(this, function (self) {
|
|
|
|
this._filterReset();
|
|
|
|
}));
|
2009-07-04 16:46:35 +00:00
|
|
|
this._filterReset();
|
2009-04-01 19:51:17 +00:00
|
|
|
},
|
|
|
|
|
|
|
|
moveRight: function() {
|
|
|
|
if (this._expanded && this._focusInMenu) {
|
|
|
|
this._focusInMenu = false;
|
|
|
|
this._activeMenu.setState(MENU_ENTERED);
|
|
|
|
this.selectFirstItem();
|
|
|
|
}
|
|
|
|
},
|
|
|
|
|
|
|
|
moveLeft: function() {
|
|
|
|
if (this._expanded && !this._focusInMenu) {
|
|
|
|
this._activeMenu.setState(MENU_SELECTED);
|
|
|
|
this.unsetSelected();
|
|
|
|
this._focusInMenu = true;
|
|
|
|
}
|
|
|
|
},
|
|
|
|
|
|
|
|
// Override genericDisplay.js
|
2009-07-04 16:46:35 +00:00
|
|
|
getNavigationArea: function() {
|
2009-04-01 19:51:17 +00:00
|
|
|
return this._menuDisplay;
|
|
|
|
},
|
|
|
|
|
|
|
|
selectUp: function() {
|
|
|
|
if (!(this._expanded && this._focusInMenu))
|
|
|
|
return GenericDisplay.GenericDisplay.prototype.selectUp.call(this);
|
|
|
|
this._selectMenuIndex(this._activeMenuIndex - 1);
|
|
|
|
return true;
|
|
|
|
},
|
|
|
|
|
|
|
|
selectDown: function() {
|
|
|
|
if (!(this._expanded && this._focusInMenu))
|
|
|
|
return GenericDisplay.GenericDisplay.prototype.selectDown.call(this);
|
|
|
|
this._selectMenuIndex(this._activeMenuIndex+1);
|
|
|
|
return true;
|
|
|
|
},
|
|
|
|
|
2009-10-07 05:41:28 +00:00
|
|
|
setSearch: function(text) {
|
|
|
|
let lowertext = text.toLowerCase();
|
|
|
|
if (lowertext == this._search)
|
|
|
|
return;
|
|
|
|
|
|
|
|
// We prepare menu matches up-front, so that we don't
|
|
|
|
// need to go over all menu items for each application
|
|
|
|
// and then get all applications for a matching menu
|
|
|
|
// to see if a particular application passed to
|
|
|
|
// _isInfoMatching() is a match.
|
|
|
|
let terms = lowertext.split(/\s+/);
|
|
|
|
this._menuSearchAppMatches = {};
|
|
|
|
for (let i = 0; i < terms.length; i++) {
|
|
|
|
let term = terms[i];
|
|
|
|
this._menuSearchAppMatches[term] = {};
|
|
|
|
for (let j = 0; j < this._menus.length; j++) {
|
|
|
|
let menuItem = this._menus[j];
|
|
|
|
// Match only on the beginning of the words in category names,
|
|
|
|
// because otherwise it introduces unnecessary noise in the results.
|
|
|
|
if (menuItem.name.toLowerCase().indexOf(term) == 0 ||
|
|
|
|
menuItem.name.toLowerCase().indexOf(" " + term) > 0) {
|
|
|
|
let menuApps = this._appSystem.get_applications_for_menu(menuItem.id);
|
|
|
|
for (let k = 0; k < menuApps.length; k++) {
|
|
|
|
let menuApp = menuApps[k];
|
|
|
|
this._menuSearchAppMatches[term][menuApp.get_id()] = true;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
GenericDisplay.GenericDisplay.prototype.setSearch.call(this, text);
|
|
|
|
},
|
|
|
|
|
2009-04-01 19:51:17 +00:00
|
|
|
// Protected overrides
|
|
|
|
|
|
|
|
_filterActive: function() {
|
2009-07-07 20:08:41 +00:00
|
|
|
// We always have a filter now since a menu must be selected
|
|
|
|
return true;
|
2009-04-01 19:51:17 +00:00
|
|
|
},
|
|
|
|
|
|
|
|
_filterReset: function() {
|
|
|
|
GenericDisplay.GenericDisplay.prototype._filterReset.call(this);
|
2009-07-04 16:46:35 +00:00
|
|
|
this._selectMenuIndex(0);
|
2009-04-01 19:51:17 +00:00
|
|
|
},
|
|
|
|
|
|
|
|
//// Private ////
|
|
|
|
|
|
|
|
_emitStateChange: function() {
|
|
|
|
this.emit('state-changed');
|
|
|
|
},
|
|
|
|
|
|
|
|
_selectMenuIndex: function(index) {
|
|
|
|
if (index < 0 || index >= this._menus.length)
|
|
|
|
return;
|
2009-04-13 19:41:13 +00:00
|
|
|
this._menuDisplays[index].setState(MENU_SELECTED);
|
2009-04-01 19:51:17 +00:00
|
|
|
},
|
|
|
|
|
2009-07-07 20:08:41 +00:00
|
|
|
_getMostUsed: function() {
|
2009-07-30 19:40:26 +00:00
|
|
|
let context = "";
|
2009-10-15 23:28:29 +00:00
|
|
|
let usage = Shell.AppUsage.get_default();
|
|
|
|
return usage.get_most_used(context, 30);
|
2009-07-07 20:08:41 +00:00
|
|
|
},
|
|
|
|
|
2009-09-26 18:53:54 +00:00
|
|
|
_addMenuItem: function(name, id, index) {
|
|
|
|
let display = new MenuItem(name, id);
|
2009-07-04 16:46:35 +00:00
|
|
|
this._menuDisplays.push(display);
|
|
|
|
display.connect('state-changed', Lang.bind(this, function (display) {
|
|
|
|
let activated = display.getState() != MENU_UNSELECTED;
|
|
|
|
if (!activated && display == this._activeMenu) {
|
|
|
|
this._activeMenuIndex = -1;
|
|
|
|
this._activeMenu = null;
|
|
|
|
} else if (activated) {
|
|
|
|
if (display != this._activeMenu && this._activeMenu != null)
|
|
|
|
this._activeMenu.setState(MENU_UNSELECTED);
|
|
|
|
this._activeMenuIndex = index;
|
|
|
|
this._activeMenu = display;
|
|
|
|
if (id == null) {
|
2009-07-07 20:08:41 +00:00
|
|
|
this._activeMenuApps = this._getMostUsed();
|
2009-07-04 16:46:35 +00:00
|
|
|
} else {
|
|
|
|
this._activeMenuApps = this._appSystem.get_applications_for_menu(id);
|
|
|
|
}
|
|
|
|
}
|
2009-10-01 21:41:17 +00:00
|
|
|
this._redisplay(GenericDisplay.RedisplayFlags.FULL);
|
2009-07-04 16:46:35 +00:00
|
|
|
}));
|
|
|
|
this._menuDisplay.append(display.actor, 0);
|
|
|
|
},
|
|
|
|
|
2009-04-01 19:51:17 +00:00
|
|
|
_redisplayMenus: function() {
|
|
|
|
this._menuDisplay.remove_all();
|
2009-08-14 13:30:48 +00:00
|
|
|
this._addMenuItem(_("Frequent"), null, 'gtk-select-all');
|
2009-09-26 18:53:54 +00:00
|
|
|
// Adding an empty box here results in double spacing between
|
|
|
|
// "Frequent" and the other items.
|
|
|
|
let separator_actor = new Big.Box();
|
|
|
|
this._menuDisplay.append(separator_actor, 0);
|
2009-04-01 19:51:17 +00:00
|
|
|
for (let i = 0; i < this._menus.length; i++) {
|
|
|
|
let menu = this._menus[i];
|
2009-09-26 18:53:54 +00:00
|
|
|
this._addMenuItem(menu.name, menu.id, i+1);
|
2009-04-01 19:51:17 +00:00
|
|
|
}
|
2008-12-01 19:51:43 +00:00
|
|
|
},
|
|
|
|
|
2009-06-17 22:42:05 +00:00
|
|
|
_addApp: function(appInfo) {
|
2009-07-07 20:08:41 +00:00
|
|
|
let appId = appInfo.get_id();
|
2009-06-17 22:42:05 +00:00
|
|
|
this._allItems[appId] = appInfo;
|
|
|
|
},
|
|
|
|
|
2009-07-07 20:08:41 +00:00
|
|
|
//// Protected method overrides ////
|
2008-12-01 19:51:43 +00:00
|
|
|
|
2008-12-20 04:27:57 +00:00
|
|
|
// Gets information about all applications by calling Gio.app_info_get_all().
|
|
|
|
_refreshCache : function() {
|
2008-12-01 19:51:43 +00:00
|
|
|
if (!this._appsStale)
|
2009-09-24 22:36:36 +00:00
|
|
|
return true;
|
2008-12-20 04:27:57 +00:00
|
|
|
this._allItems = {};
|
2009-04-01 19:51:17 +00:00
|
|
|
|
2009-09-11 21:48:02 +00:00
|
|
|
if (this._showPrefs) {
|
|
|
|
// Get the desktop file ids for settings/preferences.
|
|
|
|
// These are used for search results, but not in the app menus.
|
|
|
|
let settings = this._appSystem.get_all_settings();
|
|
|
|
for (let i = 0; i < settings.length; i++) {
|
|
|
|
let app = settings[i];
|
2009-07-07 20:08:41 +00:00
|
|
|
this._addApp(app);
|
2009-05-14 18:14:18 +00:00
|
|
|
}
|
2009-09-11 21:48:02 +00:00
|
|
|
} else {
|
|
|
|
// Loop over the toplevel menu items, load the set of desktop file ids
|
|
|
|
// associated with each one, skipping empty menus
|
|
|
|
let allMenus = this._appSystem.get_menus();
|
|
|
|
this._menus = [];
|
|
|
|
for (let i = 0; i < allMenus.length; i++) {
|
|
|
|
let menu = allMenus[i];
|
|
|
|
let menuApps = this._appSystem.get_applications_for_menu(menu.id);
|
|
|
|
let hasVisibleApps = menuApps.some(function (app) { return !app.get_is_nodisplay(); });
|
|
|
|
if (!hasVisibleApps) {
|
|
|
|
continue;
|
|
|
|
}
|
|
|
|
this._menus.push(menu);
|
|
|
|
for (let j = 0; j < menuApps.length; j++) {
|
|
|
|
let app = menuApps[j];
|
|
|
|
this._addApp(app);
|
|
|
|
}
|
|
|
|
}
|
2009-10-01 21:41:17 +00:00
|
|
|
this._redisplayMenus();
|
2009-05-14 18:14:18 +00:00
|
|
|
}
|
|
|
|
|
2008-12-01 19:51:43 +00:00
|
|
|
this._appsStale = false;
|
2009-09-24 22:36:36 +00:00
|
|
|
return false;
|
2008-12-01 19:51:43 +00:00
|
|
|
},
|
|
|
|
|
2009-07-07 20:08:41 +00:00
|
|
|
// Stub this out; the app display always has a category selected
|
2008-12-20 04:27:57 +00:00
|
|
|
_setDefaultList : function() {
|
2009-09-24 22:36:36 +00:00
|
|
|
this._matchedItems = {};
|
|
|
|
this._matchedItemKeys = [];
|
2008-12-01 19:51:43 +00:00
|
|
|
},
|
|
|
|
|
2009-02-10 19:12:13 +00:00
|
|
|
// Compares items associated with the item ids based on the alphabetical order
|
|
|
|
// of the item names.
|
|
|
|
// Returns an integer value indicating the result of the comparison.
|
|
|
|
_compareItems : function(itemIdA, itemIdB) {
|
|
|
|
let appA = this._allItems[itemIdA];
|
|
|
|
let appB = this._allItems[itemIdB];
|
2009-07-07 20:08:41 +00:00
|
|
|
return appA.get_name().localeCompare(appB.get_name());
|
2008-12-01 19:51:43 +00:00
|
|
|
},
|
|
|
|
|
2008-12-20 04:27:57 +00:00
|
|
|
// Checks if the item info can be a match for the search string by checking
|
2009-10-07 05:41:28 +00:00
|
|
|
// the name, description, execution command, and category for the application.
|
2009-07-07 20:08:41 +00:00
|
|
|
// Item info is expected to be Shell.AppInfo.
|
2008-12-20 04:27:57 +00:00
|
|
|
// Returns a boolean flag indicating if itemInfo is a match.
|
|
|
|
_isInfoMatching : function(itemInfo, search) {
|
2009-07-07 20:08:41 +00:00
|
|
|
// Don't show nodisplay items here
|
|
|
|
if (itemInfo.get_is_nodisplay())
|
|
|
|
return false;
|
2009-04-01 19:51:17 +00:00
|
|
|
// Search takes precedence; not typically useful to search within a
|
|
|
|
// menu
|
|
|
|
if (this._activeMenu == null || search != "")
|
|
|
|
return this._isInfoMatchingSearch(itemInfo, search);
|
|
|
|
else
|
2009-10-07 05:41:28 +00:00
|
|
|
return this._isInfoMatchingMenu(itemInfo);
|
2009-04-01 19:51:17 +00:00
|
|
|
},
|
|
|
|
|
2009-10-07 05:41:28 +00:00
|
|
|
_isInfoMatchingMenu: function(itemInfo) {
|
2009-07-07 20:08:41 +00:00
|
|
|
let id = itemInfo.get_id();
|
2009-04-01 19:51:17 +00:00
|
|
|
for (let i = 0; i < this._activeMenuApps.length; i++) {
|
2009-07-07 20:08:41 +00:00
|
|
|
let activeApp = this._activeMenuApps[i];
|
|
|
|
if (activeApp.get_id() == id)
|
2009-04-01 19:51:17 +00:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
},
|
|
|
|
|
|
|
|
_isInfoMatchingSearch: function(itemInfo, search) {
|
2008-12-01 19:51:43 +00:00
|
|
|
if (search == null || search == '')
|
|
|
|
return true;
|
2009-01-21 21:50:57 +00:00
|
|
|
|
2009-07-07 20:08:41 +00:00
|
|
|
let fold = function(s) {
|
|
|
|
if (!s)
|
|
|
|
return s;
|
|
|
|
return GLib.utf8_casefold(GLib.utf8_normalize(s, -1,
|
|
|
|
GLib.NormalizeMode.ALL), -1);
|
|
|
|
};
|
|
|
|
let name = fold(itemInfo.get_name());
|
2008-12-01 19:51:43 +00:00
|
|
|
if (name.indexOf(search) >= 0)
|
|
|
|
return true;
|
2009-01-21 21:50:57 +00:00
|
|
|
|
2009-07-07 20:08:41 +00:00
|
|
|
let description = fold(itemInfo.get_description());
|
2008-12-01 19:51:43 +00:00
|
|
|
if (description) {
|
|
|
|
if (description.indexOf(search) >= 0)
|
|
|
|
return true;
|
|
|
|
}
|
2009-01-21 21:50:57 +00:00
|
|
|
|
2009-07-07 20:08:41 +00:00
|
|
|
let exec = fold(itemInfo.get_executable());
|
|
|
|
if (exec == null) {
|
2009-06-17 16:37:54 +00:00
|
|
|
log("Missing an executable for " + itemInfo.name);
|
2009-01-22 21:28:19 +00:00
|
|
|
} else {
|
|
|
|
if (exec.indexOf(search) >= 0)
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2009-10-07 05:41:28 +00:00
|
|
|
if (this._menuSearchAppMatches[search]) {
|
|
|
|
if (this._menuSearchAppMatches[search].hasOwnProperty(itemInfo.get_id()))
|
2009-05-26 16:56:38 +00:00
|
|
|
return true;
|
2009-10-07 05:41:28 +00:00
|
|
|
} else {
|
|
|
|
log("Missing an entry for search term " + search + " in this._menuSearchAppMatches");
|
2009-01-21 21:50:57 +00:00
|
|
|
}
|
2009-08-05 23:54:22 +00:00
|
|
|
|
2008-12-01 19:51:43 +00:00
|
|
|
return false;
|
|
|
|
},
|
|
|
|
|
2009-07-07 20:08:41 +00:00
|
|
|
// Creates an AppDisplayItem based on itemInfo, which is expected be an Shell.AppInfo object.
|
Rewrite Dash, remove hardcoded width/height from GenericDisplay
This patch is a near-total rewrite of the Dash. First, the dash
code moves into a separate file, dash.js.
Inside dash.js, the components are more broken up into separate
classes; in particular there's now a Pane class and a MoreLink
class. Instead of each section of the dash, when activated,
attempting to close all N-1 other sections, instead there
is the concept of a single "active pane", and when e.g. activating
the More link for documents, if we know there's an active pane
which happens to be the apps, close it.
Many redundant containers were removed from the dash, and all
manual width, height and x/y offsets are entirely gone. We move
the visual apperance closer to the design by using the view-more.svg,
etc.
To complete the removal of height/width calculations from the dash,
we also had to do the same for GenericDisplay. Also clean up
the positioning inside overlay.js so calculation of children's
positioning is inside a single function that flows from screen.width
and screen.height, so in the future we can stop passing the width
into the Dash constructor and call this once and work on screen
resizing.
2009-08-01 02:12:01 +00:00
|
|
|
_createDisplayItem: function(itemInfo) {
|
|
|
|
return new AppDisplayItem(itemInfo);
|
2009-04-01 19:51:17 +00:00
|
|
|
}
|
2008-12-01 19:51:43 +00:00
|
|
|
};
|
2008-11-21 00:53:11 +00:00
|
|
|
|
2008-12-01 19:51:43 +00:00
|
|
|
Signals.addSignalMethods(AppDisplay.prototype);
|
2009-06-30 20:35:39 +00:00
|
|
|
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 20:40:00 +00:00
|
|
|
function BaseWellItem(app, isFavorite, hasMenu) {
|
|
|
|
this._init(app, isFavorite, hasMenu);
|
2009-09-01 18:15:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
BaseWellItem.prototype = {
|
2009-09-11 21:13:50 +00:00
|
|
|
__proto__: AppIcon.AppIcon.prototype,
|
|
|
|
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 20:40:00 +00:00
|
|
|
_init: function(app, isFavorite) {
|
|
|
|
AppIcon.AppIcon.prototype._init.call(this, { app: app,
|
2009-10-05 23:33:38 +00:00
|
|
|
menuType: AppIcon.MenuType.ON_RIGHT,
|
|
|
|
glow: true });
|
2009-09-11 21:13:50 +00:00
|
|
|
|
2009-09-01 18:15:29 +00:00
|
|
|
this.isFavorite = isFavorite;
|
2009-09-11 21:13:50 +00:00
|
|
|
|
|
|
|
this._draggable = DND.makeDraggable(this.actor, true);
|
2009-09-08 19:53:49 +00:00
|
|
|
|
|
|
|
// Do these as anonymous functions to avoid conflict with handlers in subclasses
|
|
|
|
this.actor.connect('button-press-event', Lang.bind(this, function(actor, event) {
|
|
|
|
let [stageX, stageY] = event.get_coords();
|
|
|
|
this._dragStartX = stageX;
|
|
|
|
this._dragStartY = stageY;
|
|
|
|
return false;
|
|
|
|
}));
|
|
|
|
this.actor.connect('notify::hover', Lang.bind(this, function () {
|
|
|
|
let hover = this.actor.hover;
|
|
|
|
if (!hover) {
|
|
|
|
if (this.actor.pressed && this._dragStartX != null) {
|
|
|
|
this.actor.fake_release();
|
2009-09-22 20:15:28 +00:00
|
|
|
this._draggable.startDrag(this._dragStartX, this._dragStartY,
|
2009-09-23 14:13:36 +00:00
|
|
|
Main.currentTime());
|
2009-09-08 19:53:49 +00:00
|
|
|
} else {
|
|
|
|
this._dragStartX = null;
|
|
|
|
this._dragStartY = null;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}));
|
2009-09-01 18:15:29 +00:00
|
|
|
},
|
|
|
|
|
2009-08-18 00:29:54 +00:00
|
|
|
shellWorkspaceLaunch : function() {
|
2009-08-21 00:03:28 +00:00
|
|
|
// Here we just always launch the application again, even if we know
|
|
|
|
// it was already running. For most applications this
|
|
|
|
// should have the effect of creating a new window, whether that's
|
|
|
|
// a second process (in the case of Calculator) or IPC to existing
|
|
|
|
// instance (Firefox). There are a few less-sensical cases such
|
|
|
|
// as say Pidgin, but ideally what we do there is have the app
|
|
|
|
// express to us that it doesn't do relaunch=new-window in the
|
|
|
|
// .desktop file.
|
2009-10-15 23:28:29 +00:00
|
|
|
this.app.launch();
|
2009-08-18 00:29:54 +00:00
|
|
|
},
|
|
|
|
|
2009-09-11 21:13:50 +00:00
|
|
|
getDragActor: function() {
|
|
|
|
return this.createDragActor();
|
2009-06-30 20:35:39 +00:00
|
|
|
},
|
|
|
|
|
|
|
|
// Returns the original icon that is being used as a source for the cloned texture
|
|
|
|
// that represents the item as it is being dragged.
|
|
|
|
getDragActorSource: function() {
|
2009-09-11 21:13:50 +00:00
|
|
|
return this.actor;
|
2009-09-01 18:15:29 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 20:40:00 +00:00
|
|
|
function RunningWellItem(app, isFavorite) {
|
|
|
|
this._init(app, isFavorite);
|
2009-09-01 18:15:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
RunningWellItem.prototype = {
|
|
|
|
__proto__: BaseWellItem.prototype,
|
|
|
|
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 20:40:00 +00:00
|
|
|
_init: function(app, isFavorite) {
|
|
|
|
BaseWellItem.prototype._init.call(this, app, isFavorite);
|
2009-09-01 18:15:29 +00:00
|
|
|
|
|
|
|
this._dragStartX = 0;
|
|
|
|
this._dragStartY = 0;
|
|
|
|
|
2009-09-08 21:29:22 +00:00
|
|
|
this.actor.connect('activate', Lang.bind(this, this._onActivate));
|
|
|
|
},
|
|
|
|
|
|
|
|
_onActivate: function (actor, event) {
|
2009-10-07 21:20:33 +00:00
|
|
|
let modifiers = Shell.get_event_state(event);
|
2009-09-08 21:29:22 +00:00
|
|
|
|
|
|
|
if (modifiers & Clutter.ModifierType.CONTROL_MASK) {
|
2009-10-15 23:28:29 +00:00
|
|
|
this.app.launch();
|
2009-09-08 21:29:22 +00:00
|
|
|
} else {
|
|
|
|
this.activateMostRecentWindow();
|
|
|
|
}
|
2009-09-01 18:15:29 +00:00
|
|
|
},
|
|
|
|
|
|
|
|
activateMostRecentWindow: function () {
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 20:40:00 +00:00
|
|
|
let mostRecentWindow = this.app.get_windows()[0];
|
2009-09-23 14:13:36 +00:00
|
|
|
Main.overview.activateWindow(mostRecentWindow, Main.currentTime());
|
2009-09-01 18:15:29 +00:00
|
|
|
},
|
|
|
|
|
2009-09-18 13:12:25 +00:00
|
|
|
highlightWindow: function(metaWindow) {
|
|
|
|
Main.overview.getWorkspacesForWindow(metaWindow).setHighlightWindow(metaWindow);
|
2009-07-04 21:28:34 +00:00
|
|
|
},
|
|
|
|
|
2009-09-18 13:12:25 +00:00
|
|
|
activateWindow: function(metaWindow) {
|
|
|
|
if (metaWindow) {
|
|
|
|
this._didActivateWindow = true;
|
2009-09-23 14:13:36 +00:00
|
|
|
Main.overview.activateWindow(metaWindow, Main.currentTime());
|
2009-09-18 13:12:25 +00:00
|
|
|
} else
|
|
|
|
Main.overview.hide();
|
2009-09-01 18:15:29 +00:00
|
|
|
},
|
|
|
|
|
2009-09-18 13:12:25 +00:00
|
|
|
menuPoppedUp: function() {
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 20:40:00 +00:00
|
|
|
Main.overview.getWorkspacesForWindow(null).setApplicationWindowSelection(this.app.get_id());
|
2009-09-18 13:12:25 +00:00
|
|
|
},
|
2009-09-01 18:15:29 +00:00
|
|
|
|
2009-09-18 13:12:25 +00:00
|
|
|
menuPoppedDown: function() {
|
|
|
|
if (this._didActivateWindow)
|
|
|
|
return;
|
2009-09-01 18:15:29 +00:00
|
|
|
|
2009-09-18 13:12:25 +00:00
|
|
|
Main.overview.getWorkspacesForWindow(null).setApplicationWindowSelection(null);
|
2009-09-01 18:15:29 +00:00
|
|
|
}
|
2009-09-18 13:12:25 +00:00
|
|
|
};
|
2009-09-01 18:15:29 +00:00
|
|
|
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 20:40:00 +00:00
|
|
|
function InactiveWellItem(app, isFavorite) {
|
|
|
|
this._init(app, isFavorite);
|
2009-09-01 18:15:29 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
InactiveWellItem.prototype = {
|
|
|
|
__proto__: BaseWellItem.prototype,
|
|
|
|
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 20:40:00 +00:00
|
|
|
_init : function(app, isFavorite) {
|
|
|
|
BaseWellItem.prototype._init.call(this, app, isFavorite);
|
2009-09-01 18:15:29 +00:00
|
|
|
|
|
|
|
this.actor.connect('notify::pressed', Lang.bind(this, this._onPressedChanged));
|
|
|
|
this.actor.connect('activate', Lang.bind(this, this._onActivate));
|
|
|
|
},
|
|
|
|
|
|
|
|
_onPressedChanged: function() {
|
2009-09-11 21:13:50 +00:00
|
|
|
this.setHighlight(this.actor.pressed);
|
2009-09-01 18:15:29 +00:00
|
|
|
},
|
|
|
|
|
|
|
|
_onActivate: function() {
|
2009-10-15 23:28:29 +00:00
|
|
|
this.app.launch();
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 20:40:00 +00:00
|
|
|
Main.overview.hide();
|
|
|
|
return true;
|
2009-09-25 20:20:43 +00:00
|
|
|
},
|
|
|
|
|
|
|
|
menuPoppedUp: function() {
|
|
|
|
},
|
|
|
|
|
|
|
|
menuPoppedDown: function() {
|
2009-06-30 20:35:39 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
function WellGrid() {
|
|
|
|
this._init();
|
2009-06-30 20:35:39 +00:00
|
|
|
}
|
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
WellGrid.prototype = {
|
|
|
|
_init: function() {
|
|
|
|
this.actor = new Shell.GenericContainer();
|
2009-06-30 20:35:39 +00:00
|
|
|
|
2009-08-09 23:48:54 +00:00
|
|
|
this._separator = new Big.Box({ height: 1 });
|
2009-08-06 19:39:09 +00:00
|
|
|
this.actor.add_actor(this._separator);
|
|
|
|
this._separatorIndex = 0;
|
|
|
|
this._cachedSeparatorY = 0;
|
2009-07-02 04:35:26 +00:00
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
this.actor.connect('get-preferred-width', Lang.bind(this, this._getPreferredWidth));
|
|
|
|
this.actor.connect('get-preferred-height', Lang.bind(this, this._getPreferredHeight));
|
|
|
|
this.actor.connect('allocate', Lang.bind(this, this._allocate));
|
2009-06-30 20:35:39 +00:00
|
|
|
},
|
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
_getPreferredWidth: function (grid, forHeight, alloc) {
|
|
|
|
let [itemMin, itemNatural] = this._getItemPreferredWidth();
|
|
|
|
let children = this._getItemChildren();
|
|
|
|
let nColumns;
|
|
|
|
if (children.length < WELL_DEFAULT_COLUMNS)
|
|
|
|
nColumns = children.length;
|
|
|
|
else
|
|
|
|
nColumns = WELL_DEFAULT_COLUMNS;
|
2009-09-24 04:01:57 +00:00
|
|
|
alloc.min_size = itemMin;
|
|
|
|
alloc.natural_size = itemNatural * nColumns;
|
2009-08-06 19:39:09 +00:00
|
|
|
},
|
2009-06-30 20:35:39 +00:00
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
_getPreferredHeight: function (grid, forWidth, alloc) {
|
|
|
|
let [rows, columns, itemWidth, itemHeight] = this._computeLayout(forWidth);
|
|
|
|
let totalVerticalSpacing = Math.max(rows - 1, 0) * WELL_ITEM_VSPACING;
|
2009-06-30 20:35:39 +00:00
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
let [separatorMin, separatorNatural] = this._separator.get_preferred_height(forWidth);
|
|
|
|
alloc.min_size = alloc.natural_size = rows * itemHeight + totalVerticalSpacing + separatorNatural;
|
|
|
|
},
|
|
|
|
|
|
|
|
_allocate: function (grid, box, flags) {
|
|
|
|
let children = this._getItemChildren();
|
|
|
|
let availWidth = box.x2 - box.x1;
|
|
|
|
let availHeight = box.y2 - box.y1;
|
|
|
|
|
|
|
|
let [rows, columns, itemWidth, itemHeight] = this._computeLayout(availWidth);
|
|
|
|
|
|
|
|
let [separatorMin, separatorNatural] = this._separator.get_preferred_height(-1);
|
|
|
|
|
|
|
|
let x = box.x1;
|
|
|
|
let y = box.y1;
|
|
|
|
let columnIndex = 0;
|
|
|
|
for (let i = 0; i < children.length; i++) {
|
2009-08-14 08:35:48 +00:00
|
|
|
let [childMinWidth, childNaturalWidth] = children[i].get_preferred_width(-1);
|
2009-08-06 19:39:09 +00:00
|
|
|
|
2009-08-14 08:35:48 +00:00
|
|
|
/* Center the item in its allocation horizontally */
|
2009-08-06 19:39:09 +00:00
|
|
|
let width = Math.min(itemWidth, childNaturalWidth);
|
|
|
|
let horizSpacing = (itemWidth - width) / 2;
|
|
|
|
|
|
|
|
let childBox = new Clutter.ActorBox();
|
|
|
|
childBox.x1 = Math.floor(x + horizSpacing);
|
2009-08-14 08:35:48 +00:00
|
|
|
childBox.y1 = y;
|
2009-08-06 19:39:09 +00:00
|
|
|
childBox.x2 = childBox.x1 + width;
|
2009-08-14 08:35:48 +00:00
|
|
|
childBox.y2 = childBox.y1 + itemHeight;
|
2009-08-06 19:39:09 +00:00
|
|
|
children[i].allocate(childBox, flags);
|
|
|
|
|
|
|
|
columnIndex++;
|
2009-09-25 20:20:43 +00:00
|
|
|
if (columnIndex == columns) {
|
2009-08-06 19:39:09 +00:00
|
|
|
columnIndex = 0;
|
|
|
|
}
|
|
|
|
|
|
|
|
if (columnIndex == 0) {
|
|
|
|
y += itemHeight + WELL_ITEM_VSPACING;
|
|
|
|
x = box.x1;
|
|
|
|
} else {
|
2009-09-24 04:01:57 +00:00
|
|
|
x += itemWidth;
|
2009-08-06 19:39:09 +00:00
|
|
|
}
|
2009-07-07 20:08:41 +00:00
|
|
|
}
|
2009-07-04 21:28:34 +00:00
|
|
|
},
|
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
removeAll: function () {
|
|
|
|
let itemChildren = this._getItemChildren();
|
|
|
|
for (let i = 0; i < itemChildren.length; i++) {
|
|
|
|
itemChildren[i].destroy();
|
2009-07-04 21:28:34 +00:00
|
|
|
}
|
2009-08-06 19:39:09 +00:00
|
|
|
},
|
2009-06-30 20:35:39 +00:00
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
_getItemChildren: function () {
|
|
|
|
let children = this.actor.get_children();
|
|
|
|
children.shift();
|
|
|
|
return children;
|
|
|
|
},
|
|
|
|
|
|
|
|
_computeLayout: function (forWidth) {
|
|
|
|
let [itemMinWidth, itemNaturalWidth] = this._getItemPreferredWidth();
|
|
|
|
let columnsNatural;
|
|
|
|
let i;
|
|
|
|
let children = this._getItemChildren();
|
2009-08-09 01:34:35 +00:00
|
|
|
if (children.length == 0)
|
|
|
|
return [0, WELL_DEFAULT_COLUMNS, 0, 0];
|
2009-09-24 04:01:57 +00:00
|
|
|
let nColumns = 0;
|
|
|
|
let usedWidth = 0;
|
2009-10-06 18:07:40 +00:00
|
|
|
// Big.Box will allocate us at 0x0 if we are not visible; this is probably a
|
|
|
|
// Big.Box bug but it can't be fixed because if children are skipped in allocate()
|
|
|
|
// Clutter gets confused (see http://bugzilla.openedhand.com/show_bug.cgi?id=1831)
|
|
|
|
if (forWidth <= 0) {
|
2009-08-06 19:39:09 +00:00
|
|
|
nColumns = WELL_DEFAULT_COLUMNS;
|
2009-09-24 04:01:57 +00:00
|
|
|
} else {
|
|
|
|
while (nColumns < WELL_DEFAULT_COLUMNS &&
|
|
|
|
nColumns < children.length &&
|
|
|
|
usedWidth + itemMinWidth <= forWidth) {
|
|
|
|
// By including WELL_ITEM_MIN_HSPACING in usedWidth, we are ensuring
|
|
|
|
// that the number of columns we end up with will allow the spacing
|
|
|
|
// between the columns to be at least that value.
|
|
|
|
usedWidth += itemMinWidth + WELL_ITEM_MIN_HSPACING;
|
|
|
|
nColumns++;
|
|
|
|
}
|
|
|
|
}
|
2009-08-06 19:39:09 +00:00
|
|
|
|
2009-09-24 04:01:57 +00:00
|
|
|
if (nColumns == 0) {
|
|
|
|
log("WellGrid: couldn't fit a column in width " + forWidth);
|
|
|
|
/* FIXME - fall back to smaller icon size */
|
2009-06-30 20:35:39 +00:00
|
|
|
}
|
|
|
|
|
2009-09-24 04:01:57 +00:00
|
|
|
let minWidth = itemMinWidth * nColumns;
|
2009-07-02 04:35:26 +00:00
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
let lastColumnIndex = nColumns - 1;
|
2009-09-25 20:20:43 +00:00
|
|
|
let rows = Math.ceil(children.length / nColumns);
|
2009-08-06 19:39:09 +00:00
|
|
|
|
|
|
|
let itemWidth;
|
2009-10-06 18:07:40 +00:00
|
|
|
if (forWidth <= 0) {
|
2009-08-06 19:39:09 +00:00
|
|
|
itemWidth = itemNaturalWidth;
|
2009-06-30 20:35:39 +00:00
|
|
|
} else {
|
2009-09-24 04:01:57 +00:00
|
|
|
itemWidth = Math.floor(forWidth / nColumns);
|
2009-06-30 20:35:39 +00:00
|
|
|
}
|
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
let itemNaturalHeight = 0;
|
|
|
|
for (let i = 0; i < children.length; i++) {
|
|
|
|
let [childMin, childNatural] = children[i].get_preferred_height(itemWidth);
|
|
|
|
if (childNatural > itemNaturalHeight)
|
|
|
|
itemNaturalHeight = childNatural;
|
|
|
|
}
|
|
|
|
|
2009-09-24 04:01:57 +00:00
|
|
|
return [rows, nColumns, itemWidth, itemNaturalHeight];
|
2009-08-06 19:39:09 +00:00
|
|
|
},
|
|
|
|
|
|
|
|
_getItemPreferredWidth: function () {
|
|
|
|
let children = this._getItemChildren();
|
|
|
|
let minWidth = 0;
|
|
|
|
let naturalWidth = 0;
|
|
|
|
for (let i = 0; i < children.length; i++) {
|
|
|
|
let [childMin, childNatural] = children[i].get_preferred_width(-1);
|
|
|
|
if (childMin > minWidth)
|
|
|
|
minWidth = childMin;
|
|
|
|
if (childNatural > naturalWidth)
|
|
|
|
naturalWidth = childNatural;
|
|
|
|
}
|
|
|
|
return [minWidth, naturalWidth];
|
2009-06-30 20:35:39 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
function AppWell() {
|
|
|
|
this._init();
|
2009-06-30 20:35:39 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
AppWell.prototype = {
|
2009-08-06 19:39:09 +00:00
|
|
|
_init : function() {
|
2009-06-30 20:35:39 +00:00
|
|
|
this._menus = [];
|
|
|
|
this._menuDisplays = [];
|
|
|
|
|
2009-10-15 23:28:29 +00:00
|
|
|
this._favorites = [];
|
|
|
|
|
2009-06-30 20:35:39 +00:00
|
|
|
this.actor = new Big.Box({ orientation: Big.BoxOrientation.VERTICAL,
|
2009-08-06 19:39:09 +00:00
|
|
|
x_align: Big.BoxAlignment.CENTER });
|
|
|
|
this.actor._delegate = this;
|
|
|
|
|
2009-10-03 00:17:34 +00:00
|
|
|
this._pendingRedisplay = false;
|
|
|
|
this.actor.connect('notify::mapped', Lang.bind(this, this._onMappedNotify));
|
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
this._grid = new WellGrid();
|
|
|
|
this.actor.append(this._grid.actor, Big.BoxPackFlags.EXPAND);
|
2009-06-30 20:35:39 +00:00
|
|
|
|
2009-10-15 23:28:29 +00:00
|
|
|
this._tracker = Shell.WindowTracker.get_default();
|
2009-06-30 20:35:39 +00:00
|
|
|
this._appSystem = Shell.AppSystem.get_default();
|
|
|
|
|
2009-10-15 23:28:29 +00:00
|
|
|
this._appSystem.connect('installed-changed', Lang.bind(this, this._redisplay));
|
|
|
|
|
|
|
|
AppFavorites.getAppFavorites().connect('changed', Lang.bind(this, this._redisplay));
|
|
|
|
this._tracker.connect('app-running-changed', Lang.bind(this, this._redisplay));
|
2009-06-30 20:35:39 +00:00
|
|
|
|
|
|
|
this._redisplay();
|
|
|
|
},
|
|
|
|
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 20:40:00 +00:00
|
|
|
_appIdListToHash: function(apps) {
|
|
|
|
let ids = {};
|
|
|
|
for (let i = 0; i < apps.length; i++)
|
|
|
|
ids[apps[i].get_id()] = apps[i];
|
|
|
|
return ids;
|
2009-08-06 19:39:09 +00:00
|
|
|
},
|
|
|
|
|
2009-10-03 00:17:34 +00:00
|
|
|
_onMappedNotify: function() {
|
|
|
|
let mapped = this.actor.mapped;
|
|
|
|
if (mapped && this._pendingRedisplay)
|
|
|
|
this._redisplay();
|
|
|
|
},
|
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
_redisplay: function () {
|
2009-10-03 00:17:34 +00:00
|
|
|
let mapped = this.actor.mapped;
|
|
|
|
if (!mapped) {
|
|
|
|
this._pendingRedisplay = true;
|
|
|
|
return;
|
|
|
|
}
|
|
|
|
this._pendingRedisplay = false;
|
|
|
|
|
2009-08-06 19:39:09 +00:00
|
|
|
this._grid.removeAll();
|
2009-07-30 19:40:26 +00:00
|
|
|
|
2009-10-15 23:28:29 +00:00
|
|
|
let favorites = AppFavorites.getAppFavorites().getFavoriteMap();
|
2009-08-06 19:39:09 +00:00
|
|
|
|
|
|
|
/* hardcode here pending some design about how exactly desktop contexts behave */
|
|
|
|
let contextId = "";
|
2009-07-30 19:40:26 +00:00
|
|
|
|
2009-10-15 23:28:29 +00:00
|
|
|
let running = this._tracker.get_running_apps(contextId);
|
2009-10-14 21:25:17 +00:00
|
|
|
let runningIds = this._appIdListToHash(running);
|
2009-08-06 19:39:09 +00:00
|
|
|
|
2009-10-15 23:28:29 +00:00
|
|
|
for (let id in favorites) {
|
|
|
|
let app = favorites[id];
|
2009-09-01 18:15:29 +00:00
|
|
|
let display;
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 20:40:00 +00:00
|
|
|
if (app.get_windows().length > 0) {
|
|
|
|
display = new RunningWellItem(app, true);
|
|
|
|
} else {
|
|
|
|
display = new InactiveWellItem(app, true);
|
|
|
|
}
|
|
|
|
this._grid.actor.add_actor(display.actor);
|
|
|
|
}
|
|
|
|
|
|
|
|
for (let i = 0; i < running.length; i++) {
|
|
|
|
let app = running[i];
|
2009-10-15 23:28:29 +00:00
|
|
|
if (app.get_id() in favorites)
|
2009-10-14 19:36:58 +00:00
|
|
|
continue;
|
Create ShellApp, rebase things on it
Previously, we had ShellAppInfo, which contains fundamental
information about an application, and methods on ShellAppMonitor
to retrieve "live" information like the window list.
AppIcon ended up being used as the "App" class which was painful
for various reasons; among them that we need to handle window
list changes, and some consumers weren't ready for that.
Clean things up a bit by introducing a new ShellApp class in C,
which currently wraps a ShellAppInfo.
AppIcon then is more like the display actor for a ShellApp. Notably,
the ".windows" property moves out of it. The altTab code which
won't handle dynamic changes instead is changed to maintain a
cached version.
ShellAppMonitor gains some more methods related to ShellApp now.
In the future, we might consider changing ShellApp to be a GInterface,
which could be implemented by ShellDesktopFileApp, ShellWindowApp.
Then we could axe ShellAppInfo from the "public" API and it would
return to being an internal loss mitigation layer for GMenu.
https://bugzilla.gnome.org/show_bug.cgi?id=598227
2009-10-11 20:40:00 +00:00
|
|
|
let display = new RunningWellItem(app, false);
|
2009-08-06 19:39:09 +00:00
|
|
|
this._grid.actor.add_actor(display.actor);
|
|
|
|
}
|
2009-10-27 11:54:23 +00:00
|
|
|
|
|
|
|
if (this._grid.actor.get_n_children() == 1) {
|
|
|
|
let text = new Clutter.Text({ color: GenericDisplay.ITEM_DISPLAY_NAME_COLOR,
|
|
|
|
font_name: "Sans 14px",
|
|
|
|
text: _("Drag here to add favorites")});
|
|
|
|
this._grid.actor.add_actor(text);
|
|
|
|
}
|
2009-08-06 19:39:09 +00:00
|
|
|
},
|
|
|
|
|
|
|
|
// Draggable target interface
|
|
|
|
acceptDrop : function(source, actor, x, y, time) {
|
2009-08-14 08:35:48 +00:00
|
|
|
let app = null;
|
2009-09-25 20:20:43 +00:00
|
|
|
if (source instanceof AppDisplayItem) {
|
2009-10-15 23:28:29 +00:00
|
|
|
app = this._appSystem.get_app(source.getId());
|
2009-08-06 19:39:09 +00:00
|
|
|
} else if (source instanceof Workspaces.WindowClone) {
|
2009-10-15 23:28:29 +00:00
|
|
|
app = this._tracker.get_window_app(source.metaWindow);
|
2009-08-06 19:39:09 +00:00
|
|
|
}
|
|
|
|
|
2009-08-14 08:35:48 +00:00
|
|
|
// Don't allow favoriting of transient apps
|
|
|
|
if (app == null || app.is_transient()) {
|
2009-08-06 19:39:09 +00:00
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2009-08-14 08:35:48 +00:00
|
|
|
let id = app.get_id();
|
|
|
|
|
2009-10-15 23:28:29 +00:00
|
|
|
let favorites = AppFavorites.getAppFavorites().getFavoriteMap();
|
2009-08-06 19:39:09 +00:00
|
|
|
|
2009-10-15 23:28:29 +00:00
|
|
|
let srcIsFavorite = (id in favorites);
|
2009-08-06 19:39:09 +00:00
|
|
|
|
2009-09-25 20:20:43 +00:00
|
|
|
if (srcIsFavorite) {
|
|
|
|
return false;
|
|
|
|
} else {
|
2009-10-15 23:28:29 +00:00
|
|
|
Mainloop.idle_add(Lang.bind(this, function () {
|
|
|
|
AppFavorites.getAppFavorites().addFavorite(id);
|
2009-08-06 19:39:09 +00:00
|
|
|
return false;
|
2009-10-15 23:28:29 +00:00
|
|
|
}));
|
2009-08-06 19:39:09 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
return true;
|
2009-06-30 20:35:39 +00:00
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
Signals.addSignalMethods(AppWell.prototype);
|