Mercurial > hg > octave-lyh

changeset 14695:55f88d2236b6 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Added copy and paste context menu for the terminal. MainWindow: Removed terminateOctave call in destructor which could lead to segfaults.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Mon, 28 May 2012 02:17:11 +0200
parents ea11c9d8aa47
children 79c9a6d06590
files .hgsubstate gui/src/MainWindow.cpp gui/src/MainWindow.h
diffstat 3 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate
+++ b/.hgsubstate
@@ -1,2 +1,2 @@
 f9813bce2c06a6130a68db4478d1b16ddadaf276 gnulib
-5c51db4e3b1fcce6a05c59af5be78f43ebc24db4 gui/qterminal
+6ae5b4ef8e8b4ea0b56687a77eeeb60ccc33223d gui/qterminal
--- a/gui/src/MainWindow.cpp
+++ b/gui/src/MainWindow.cpp
@@ -39,7 +39,6 @@
 
 MainWindow::~MainWindow ()
 {
-  OctaveLink::instance ()->terminateOctave();
 }
 
 void
@@ -123,12 +122,13 @@
   delete settingsDialog;
   emit settingsChanged ();
   ResourceManager::instance ()->updateNetworkSettings ();
-  updateTerminalFont();
+  noticeSettings();
 }
 
 void
-MainWindow::updateTerminalFont ()
+MainWindow::noticeSettings ()
 {
+  // Set terminal font:
   QSettings *settings = ResourceManager::instance ()->settings ();
   QFont font = QFont();
   //font.setStyleHint(QFont::TypeWriter);
@@ -347,6 +347,7 @@
   //connect (this, SIGNAL (settingsChanged ()), m_workspaceView, SLOT (noticeSettings ()));
   //connect (this, SIGNAL (settingsChanged ()), m_historyDockWidget, SLOT (noticeSettings ()));
   connect (this, SIGNAL (settingsChanged ()), m_filesDockWidget, SLOT (noticeSettings ()));
+  connect (this, SIGNAL (settingsChanged ()), this, SLOT (noticeSettings ()));
 
   connect (m_filesDockWidget, SIGNAL (openFile (QString)), m_fileEditor, SLOT (requestOpenFile (QString)));
   connect (m_historyDockWidget, SIGNAL (information (QString)), this, SLOT (reportStatusMessage (QString)));
@@ -369,6 +370,5 @@
   setStatusBar (m_statusBar);
 
   readSettings ();
-  updateTerminalFont();
 }
 
--- a/gui/src/MainWindow.h
+++ b/gui/src/MainWindow.h
@@ -89,7 +89,7 @@
   void openOctaveForgePage ();
   void processSettingsDialogRequest ();
   void showAboutOctave ();
-  void updateTerminalFont ();
+  void noticeSettings ();
   void prepareForQuit ();
 
 protected: