Mercurial > hg > octave-lyh

comparison gui/src/MainWindow.cpp @ 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
comparison
equal deleted inserted replaced
14694:ea11c9d8aa47 14695:55f88d2236b6
37 OctaveLink::instance ()->launchOctave(); 37 OctaveLink::instance ()->launchOctave();
38 } 38 }
39 39
40 MainWindow::~MainWindow () 40 MainWindow::~MainWindow ()
41 { 41 {
42 OctaveLink::instance ()->terminateOctave();
43 } 42 }
44 43
45 void 44 void
46 MainWindow::newFile () 45 MainWindow::newFile ()
47 { 46 {
121 SettingsDialog *settingsDialog = new SettingsDialog (this); 120 SettingsDialog *settingsDialog = new SettingsDialog (this);
122 settingsDialog->exec (); 121 settingsDialog->exec ();
123 delete settingsDialog; 122 delete settingsDialog;
124 emit settingsChanged (); 123 emit settingsChanged ();
125 ResourceManager::instance ()->updateNetworkSettings (); 124 ResourceManager::instance ()->updateNetworkSettings ();
126 updateTerminalFont(); 125 noticeSettings();
127 } 126 }
128 127
129 void 128 void
130 MainWindow::updateTerminalFont () 129 MainWindow::noticeSettings ()
131 { 130 {
131 // Set terminal font:
132 QSettings *settings = ResourceManager::instance ()->settings (); 132 QSettings *settings = ResourceManager::instance ()->settings ();
133 QFont font = QFont(); 133 QFont font = QFont();
134 //font.setStyleHint(QFont::TypeWriter); 134 //font.setStyleHint(QFont::TypeWriter);
135 font.setFamily(settings->value("terminal/fontName").toString()); 135 font.setFamily(settings->value("terminal/fontName").toString());
136 font.setPointSize(settings->value("terminal/fontSize").toInt ()); 136 font.setPointSize(settings->value("terminal/fontSize").toInt ());
345 connect (m_fileEditor, SIGNAL (activeChanged (bool)), showEditorAction, SLOT (setChecked (bool))); 345 connect (m_fileEditor, SIGNAL (activeChanged (bool)), showEditorAction, SLOT (setChecked (bool)));
346 346
347 //connect (this, SIGNAL (settingsChanged ()), m_workspaceView, SLOT (noticeSettings ())); 347 //connect (this, SIGNAL (settingsChanged ()), m_workspaceView, SLOT (noticeSettings ()));
348 //connect (this, SIGNAL (settingsChanged ()), m_historyDockWidget, SLOT (noticeSettings ())); 348 //connect (this, SIGNAL (settingsChanged ()), m_historyDockWidget, SLOT (noticeSettings ()));
349 connect (this, SIGNAL (settingsChanged ()), m_filesDockWidget, SLOT (noticeSettings ())); 349 connect (this, SIGNAL (settingsChanged ()), m_filesDockWidget, SLOT (noticeSettings ()));
350 connect (this, SIGNAL (settingsChanged ()), this, SLOT (noticeSettings ()));
350 351
351 connect (m_filesDockWidget, SIGNAL (openFile (QString)), m_fileEditor, SLOT (requestOpenFile (QString))); 352 connect (m_filesDockWidget, SIGNAL (openFile (QString)), m_fileEditor, SLOT (requestOpenFile (QString)));
352 connect (m_historyDockWidget, SIGNAL (information (QString)), this, SLOT (reportStatusMessage (QString))); 353 connect (m_historyDockWidget, SIGNAL (information (QString)), this, SLOT (reportStatusMessage (QString)));
353 connect (m_historyDockWidget, SIGNAL (commandDoubleClicked (QString)), this, SLOT (handleCommandDoubleClicked (QString))); 354 connect (m_historyDockWidget, SIGNAL (commandDoubleClicked (QString)), this, SLOT (handleCommandDoubleClicked (QString)));
354 connect (saveWorkspaceAction, SIGNAL (triggered ()), this, SLOT (handleSaveWorkspaceRequest ())); 355 connect (saveWorkspaceAction, SIGNAL (triggered ()), this, SLOT (handleSaveWorkspaceRequest ()));
367 addDockWidget (Qt::BottomDockWidgetArea, m_fileEditor); 368 addDockWidget (Qt::BottomDockWidgetArea, m_fileEditor);
368 addDockWidget (Qt::BottomDockWidgetArea, m_terminalDockWidget); 369 addDockWidget (Qt::BottomDockWidgetArea, m_terminalDockWidget);
369 setStatusBar (m_statusBar); 370 setStatusBar (m_statusBar);
370 371
371 readSettings (); 372 readSettings ();
372 updateTerminalFont(); 373 }
373 } 374
374