# HG changeset patch
# User Jacob Dawid <jacob.dawid@googlemail.com>
# Date 1338164231 -7200
# Node ID 55f88d2236b668489ca968678e576ead2aa85ab7
# Parent  ea11c9d8aa470e90960e841e9f4f0e4c6a135d01
Added copy and paste context menu for the terminal.

MainWindow: Removed terminateOctave call in destructor which could lead to segfaults.

diff -r ea11c9d8aa47 -r 55f88d2236b6 .hgsubstate
--- a/.hgsubstate	Mon May 28 00:39:57 2012 +0200
+++ b/.hgsubstate	Mon May 28 02:17:11 2012 +0200
@@ -1,2 +1,2 @@
 f9813bce2c06a6130a68db4478d1b16ddadaf276 gnulib
-5c51db4e3b1fcce6a05c59af5be78f43ebc24db4 gui/qterminal
+6ae5b4ef8e8b4ea0b56687a77eeeb60ccc33223d gui/qterminal
diff -r ea11c9d8aa47 -r 55f88d2236b6 gui/src/MainWindow.cpp
--- a/gui/src/MainWindow.cpp	Mon May 28 00:39:57 2012 +0200
+++ b/gui/src/MainWindow.cpp	Mon May 28 02:17:11 2012 +0200
@@ -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();
 }
 
diff -r ea11c9d8aa47 -r 55f88d2236b6 gui/src/MainWindow.h
--- a/gui/src/MainWindow.h	Mon May 28 00:39:57 2012 +0200
+++ b/gui/src/MainWindow.h	Mon May 28 02:17:11 2012 +0200
@@ -89,7 +89,7 @@
   void openOctaveForgePage ();
   void processSettingsDialogRequest ();
   void showAboutOctave ();
-  void updateTerminalFont ();
+  void noticeSettings ();
   void prepareForQuit ();
 
 protected: