Mercurial > octave-nkf

comparison gui/src/MainWindow.cpp @ 14694:ea11c9d8aa47 gui

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Calling qApp->quit () via QMetaObject::invoke caused a segfault, now exits cleanly. * OctaveLink (terminateOctave): Changed quit() call to direct method call. * MainWindow: Added object name for QTerminal.
author Jacob Dawid <jacob.dawid@googlemail.com>
date Mon, 28 May 2012 00:39:57 +0200
parents c952f1e35e50
children 55f88d2236b6
comparison
equal deleted inserted replaced
14693:c952f1e35e50 14694:ea11c9d8aa47
192 MainWindow::writeSettings () 192 MainWindow::writeSettings ()
193 { 193 {
194 QSettings *settings = ResourceManager::instance ()->settings (); 194 QSettings *settings = ResourceManager::instance ()->settings ();
195 settings->setValue ("MainWindow/geometry", saveGeometry ()); 195 settings->setValue ("MainWindow/geometry", saveGeometry ());
196 settings->setValue ("MainWindow/windowState", saveState ()); 196 settings->setValue ("MainWindow/windowState", saveState ());
197 settings->sync ();
197 } 198 }
198 199
199 void 200 void
200 MainWindow::construct () 201 MainWindow::construct ()
201 { 202 {
222 m_currentDirectoryUpToolButton = new QToolButton (this); 223 m_currentDirectoryUpToolButton = new QToolButton (this);
223 m_currentDirectoryUpToolButton->setIcon (style->standardIcon (QStyle::SP_FileDialogToParent)); 224 m_currentDirectoryUpToolButton->setIcon (style->standardIcon (QStyle::SP_FileDialogToParent));
224 225
225 // Octave Terminal subwindow. 226 // Octave Terminal subwindow.
226 m_terminal = new QTerminal(this); 227 m_terminal = new QTerminal(this);
228 m_terminal->setObjectName ("OctaveTerminal");
227 m_terminalDockWidget = new TerminalDockWidget (m_terminal, this); 229 m_terminalDockWidget = new TerminalDockWidget (m_terminal, this);
228 230
229 /* 231 /*
230 QWidget *dummyWidget = new QWidget (); 232 QWidget *dummyWidget = new QWidget ();
231 dummyWidget->setObjectName ("DummyWidget"); 233 dummyWidget->setObjectName ("DummyWidget");