Mercurial > octave-nkf
changeset 14890:3ad363879015 gui
Fixed bug with error message about missing arguments when running a file.
* file-editor-tab.cc (run_file): Removed argument on run command.
| author | Jacob Dawid <jacob.dawid@gmail.com> |
|---|---|
| date | Fri, 20 Jul 2012 09:15:22 -0400 |
| parents | 4b8fa3ce6258 |
| children | 56983afe80d5 |
| files | gui/src/m-editor/file-editor-tab.cc gui/src/main-window.cc |
| diffstat | 2 files changed, 2 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/src/m-editor/file-editor-tab.cc Thu Jul 19 16:07:12 2012 -0400 +++ b/gui/src/m-editor/file-editor-tab.cc Fri Jul 20 09:15:22 2012 -0400 @@ -719,14 +719,14 @@ QFileInfo file_info (_file_name); QString path = file_info.absolutePath (); - QString current_path = QString::fromStdString + //QString current_path = QString::fromStdString (octave_link::instance ()->get_last_working_directory ()); QString function_name = file_info.fileName (); // We have to cut off the suffix, because octave appends it. function_name.chop (file_info.suffix ().length () + 1); _file_editor->terminal ()->sendText (QString ("cd \'%1\'\n%2\n") - .arg(path).arg (function_name).arg (current_path)); + .arg(path).arg (function_name)); // TODO: Sending a run event crashes for long scripts. Find out why. // octave_link::instance () // ->post_event (new octave_run_file_event (*this, _file_name.toStdString ()));
--- a/gui/src/main-window.cc Thu Jul 19 16:07:12 2012 -0400 +++ b/gui/src/main-window.cc Fri Jul 20 09:15:22 2012 -0400 @@ -386,8 +386,6 @@ "There is ABSOLUTELY NO WARRANTY; not even for MERCHANTABILITY or" "FITNESS FOR A PARTICULAR PURPOSE. For details, type `warranty'.\n" "\n" - "Octave was configured for \"x86_64-pc-linux-gnu\".\n" - "\n" "Additional information about Octave is available at http://www.octave.org.\n" "\n" "Please contribute if you find this software useful."