Mercurial > hg > octave-lyh

changeset 13463:0659ca41b3de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Repaired syntax highlighting.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Sun, 17 Apr 2011 21:01:38 +0200
parents e66dbc6485f2
children 661f66fb26a7
files gui//src/MainWindow.cpp gui//src/Session.cpp gui//src/SimpleEditor.cpp
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/gui//src/MainWindow.cpp
+++ b/gui//src/MainWindow.cpp
@@ -66,11 +66,11 @@
     m_isRunning = false;
     reportStatusMessage("Saving data and shutting down.");
     writeSettings();
+
     m_octaveCallbackThread->terminate();
     m_octaveCallbackThread->wait();
 
     m_octaveMainThread->terminate();
-    m_octaveMainThread->wait();
     QMainWindow::closeEvent(closeEvent);
 }
 
--- a/gui//src/Session.cpp
+++ b/gui//src/Session.cpp
@@ -596,7 +596,7 @@
 
   //FIXME: Make message text for this notification and the activity notification more descriptive.    
   if (_monitorSilence) {
-    //KNotification::event("Silence", i18n("Silence in session '%1'", _nameTitle), QPixmap(),
+    //KNotification::event("Silence", i18n("Silence in session '%1'", _nameTitle)propagateSize, QPixmap(),
     //                QApplication::activeWindow(),
     //                KNotification::CloseWhenWidgetActivated);
     emit stateChanged(NOTIFYSILENCE);
--- a/gui//src/SimpleEditor.cpp
+++ b/gui//src/SimpleEditor.cpp
@@ -46,7 +46,7 @@
 }
 
 void SimpleEditor::loadSyntaxXMLDescription() {
-    QString installPath = QString("syntax_files")
+    QString installPath = QString("../syntax_files")
         + QDir::separator();
 
     QFileInfo file(m_currentFileName);