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

[runDialog] Support opening files and folders

Browse Source 
Support completion on files and folders in the run dialog and launch
the default application when activated. Assume a path relative to the
home directory if execution as command fails and the input doesn't start
with a slash.
Removed workaround for relayout of error messages.

https://bugzilla.gnome.org/show_bug.cgi?id=611209
This commit is contained in:
Florian Müllner 2010-02-26 20:07:44 +01:00
parent 765779272f
commit 62ca7fb268
1 changed files with 32 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
js/ui/runDialog.js
View File

@ -26,6 +26,7 @@ CommandCompleter.prototype = {
_init : function() { _init : function() {
this._changedCount = 0; this._changedCount = 0;
this._paths = GLib.getenv('PATH').split(':'); this._paths = GLib.getenv('PATH').split(':');
this._paths.push(GLib.get_home_dir());
this._valid = false; this._valid = false;
this._updateInProgress = false; this._updateInProgress = false;
this._childs = new Array(this._paths.length); this._childs = new Array(this._paths.length);
@ -300,37 +301,51 @@ RunDialog.prototype = {
} }
}, },
_run : function(command, inTerminal) { _run : function(input, inTerminal) {
let command = input;
this._commandError = false; this._commandError = false;
let f; let f;
if (this._enableInternalCommands) if (this._enableInternalCommands)
f = this._internalCommands[command]; f = this._internalCommands[input];
else else
f = null; f = null;
if (f) { if (f) {
f(); f();
} else if (command) { } else if (input) {
try { try {
if (inTerminal) if (inTerminal)
command = 'gnome-terminal -x ' + command; command = 'gnome-terminal -x ' + input;
let [ok, len, args] = GLib.shell_parse_argv(command); let [ok, len, args] = GLib.shell_parse_argv(command);
let p = new Shell.Process({ 'args' : args }); let p = new Shell.Process({ 'args' : args });
p.run(); p.run();
} catch (e) { } catch (e) {
this._commandError = true; // Mmmh, that failed - see if @input matches an existing file
/* let path = null;
* The exception contains an error string like: if (input.charAt(0) == '/') {
* Error invoking Shell.run: Failed to execute child process "foo" path = input;
* (No such file or directory) } else {
* We are only interested in the actual error, so parse that out. if (input.charAt(0) == '~')
*/ input = input.slice(1);
let m = /.+\((.+)\)/.exec(e); path = GLib.get_home_dir() + '/' + input;
let errorStr = _("Execution of '%s' failed:").format(command) + "\n" + m[1]; }
this._errorMessage.set_text(errorStr);
this._errorBox.show(); if (GLib.file_test(path, GLib.FileTest.EXISTS)) {
// preferred_size change. Without this, message will show with delay let file = Gio.file_new_for_path(path);
this._errorBox.get_parent().queue_relayout(); Gio.app_info_launch_default_for_uri(file.get_uri(),
global.create_app_launch_context());
} else {
this._commandError = true;
// The exception contains an error string like:
// Error invoking Shell.run: Failed to execute child
// process "foo" (No such file or directory)
// We are only interested in the actual error, so parse
//that out.
let m = /.+\((.+)\)/.exec(e);
let errorStr = _("Execution of '%s' failed:").format(command) + "\n" + m[1];
this._errorMessage.set_text(errorStr);
this._errorBox.show();
}
} }
} }
}, },