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

runDialog: Better match style of other modal dialogs

Browse Source 
Update the run dialog to
 - use a proper title
 - use dialog buttons
 - use the standard entry style

https://bugzilla.gnome.org/show_bug.cgi?id=687127
This commit is contained in:
Florian Müllner
2012-10-29 17:33:21 +01:00
parent a0470bfc66
commit 0c807bddaf
2 changed files with 35 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
js/ui/runDialog.js
View File

@ -202,7 +202,7 @@ const RunDialog = new Lang.Class({
let label = new St.Label({ style_class: 'run-dialog-label',
text: _("Please enter a command:") });
text: _("Enter a Command") });
this.contentLayout.add(label, { y_align: St.Align.START });
@ -236,6 +236,16 @@ const RunDialog = new Lang.Class({
this._errorBox.hide();
this.setButtons([{ action: Lang.bind(this, this.close),
label: _("Cancel"),
key: Clutter.Escape },
{ action: Lang.bind(this,
function() {
this._activate(false);
}),
label: _("Run"),
isDefault: true }]);
this._pathCompleter = new Gio.FilenameCompleter();
this._commandCompleter = new CommandCompleter();
this._group.connect('notify::visible', Lang.bind(this._commandCompleter, this._commandCompleter.update));
@ -245,21 +255,7 @@ const RunDialog = new Lang.Class({
this._entryText.connect('key-press-event', Lang.bind(this, function(o, e) {
let symbol = e.get_key_symbol();
if (symbol == Clutter.Return || symbol == Clutter.KP_Enter) {
this.popModal();
if (e.get_state() & Clutter.ModifierType.CONTROL_MASK)
this._run(o.get_text(), true);
else
this._run(o.get_text(), false);
if (!this._commandError)
this.close();
else {
if (!this.pushModal())
this.close();
}
return true;
}
if (symbol == Clutter.Escape) {
this.close();
this._activate(e.get_state() & Clutter.ModifierType.CONTROL_MASK);
return true;
}
if (symbol == Clutter.slash) {
@ -294,6 +290,14 @@ const RunDialog = new Lang.Class({
}));
},
_activate: function(inTerminal) {
this.popModal();
this._run(this._entryText.get_text(), inTerminal);
if (!this._commandError ||
!this.pushModal())
this.close();
},
_getCompletion : function(text) {
if (text.indexOf('/') != -1) {
return this._pathCompleter.get_completion_suffix(text);