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

windowAttentionHandler: Remove "%s has finished starting"

Browse Source 
The message is verbose and confusing. Use the traditional "'%s' is ready"
for all cases.

https://bugzilla.gnome.org/show_bug.cgi?id=660310
This commit is contained in:
Jasper St. Pierre 2011-09-27 21:03:53 -04:00
parent a9817f4832
commit 6510904711
1 changed files with 8 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
js/ui/windowAttentionHandler.js
View File

@ -12,35 +12,10 @@ function WindowAttentionHandler() {
WindowAttentionHandler.prototype = { WindowAttentionHandler.prototype = {
_init : function() { _init : function() {
this._startupIds = {};
this._tracker = Shell.WindowTracker.get_default(); this._tracker = Shell.WindowTracker.get_default();
this._tracker.connect('startup-sequence-changed', Lang.bind(this, this._onStartupSequenceChanged));
global.display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention)); global.display.connect('window-demands-attention', Lang.bind(this, this._onWindowDemandsAttention));
}, },
_onStartupSequenceChanged : function(tracker) {
let sequences = tracker.get_startup_sequences();
this._startupIds = {};
for(let i = 0; i < sequences.length; i++) {
this._startupIds[sequences[i].get_id()] = true;
}
},
_getTitle : function(app, window) {
if (this._startupIds[window.get_startup_id()])
return app.get_name();
else
return window.title;
},
_getBanner : function(app, window) {
if (this._startupIds[window.get_startup_id()])
return _("%s has finished starting").format(app.get_name());
else
return _("'%s' is ready").format(window.title);
},
_onWindowDemandsAttention : function(display, window) { _onWindowDemandsAttention : function(display, window) {
// We don't want to show the notification when the window is already focused, // We don't want to show the notification when the window is already focused,
// because this is rather pointless. // because this is rather pointless.
@ -57,12 +32,16 @@ WindowAttentionHandler.prototype = {
let source = new Source(app, window); let source = new Source(app, window);
Main.messageTray.add(source); Main.messageTray.add(source);
let notification = new MessageTray.Notification(source, this._getTitle(app, window), this._getBanner(app, window)); let banner = _("'%s' is ready").format(window.title);
let title = app.get_name();
let notification = new MessageTray.Notification(source, title, banner);
source.notify(notification); source.notify(notification);
source.signalIDs.push(window.connect('notify::title', Lang.bind(this, function(win) { source.signalIDs.push(window.connect('notify::title',
notification.update(this._getTitle(app, win), this._getBanner(app, win)); Lang.bind(this, function() {
}))); notification.update(title, banner);
})));
} }
}; };