Mercurial > hg > octave-max

changeset 13334:677d14fe5d8e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Errors are now passed through correctly, interactive mode enforced.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Tue, 05 Apr 2011 20:09:40 +0200
parents 5a6afd0e5213
children 609facb07bad
files gui//client.cpp gui//mainwindow.cpp
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/gui//client.cpp
+++ b/gui//client.cpp
@@ -3,9 +3,10 @@
 Client::Client(QString command)
     : m_command(command) {
     m_process.start(m_command, QProcess::ReadWrite);
-    connect(&m_process, SIGNAL(readyRead()), this, SLOT(reemitDataAvailable()));
+    connect(&m_process, SIGNAL(readyReadStandardOutput()), this, SLOT(reemitDataAvailable()));
     connect(&m_process, SIGNAL(stateChanged(QProcess::ProcessState)), this, SLOT(handleProcessStatusChange(QProcess::ProcessState)));
     connect(&m_process, SIGNAL(finished(int,QProcess::ExitStatus)), this, SLOT(handleProcessFinished(int,QProcess::ExitStatus)));
+    connect(&m_process, SIGNAL(readyReadStandardError()), this, SLOT(reemitErrorAvailable()));
 }
 
 void Client::send(QString content) {
--- a/gui//mainwindow.cpp
+++ b/gui//mainwindow.cpp
@@ -24,7 +24,7 @@
 void MainWindow::addOctaveTerminal() {
     OctaveTerminal *octaveTerminal = new OctaveTerminal;
     m_mdiArea->addSubWindow(octaveTerminal);
-    Client *octaveClient = ClientManager::clientManager().startProcess("octave");
+    Client *octaveClient = ClientManager::clientManager().startProcess("octave --interactive");
     octaveTerminal->assignClient(octaveClient);
 }