Mercurial > hg > octave-terminal
changeset 13550:cd66481d55b0
Added close button to file editor, assorted subwindows after importance.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Wed, 27 Jul 2011 12:41:58 +0200 |
parents | 807e5e9b7591 |
children | ad905cd33563 |
files | gui/src/FileEditorMdiSubWindow.cpp gui/src/MainWindow.cpp |
diffstat | 2 files changed, 25 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/gui/src/FileEditorMdiSubWindow.cpp +++ b/gui/src/FileEditorMdiSubWindow.cpp @@ -272,23 +272,15 @@ m_editor->setIndentationsUseTabs (false); m_editor->setAutoCompletionThreshold (2); - QAction *newAction = new QAction (style->standardIcon (QStyle::SP_FileIcon), - "", m_toolBar); - QAction *openAction = new QAction (style->standardIcon (QStyle::SP_DirOpenIcon), - "", m_toolBar); - QAction *saveAction = - new QAction (style->standardIcon (QStyle::SP_DriveHDIcon), - "", m_toolBar); - QAction *saveActionAs = - new QAction (style->standardIcon (QStyle::SP_DriveFDIcon), - "", m_toolBar); - QAction *undoAction = - new QAction (style->standardIcon (QStyle::SP_ArrowLeft), - "", m_toolBar); - QAction *redoAction = - new QAction (style->standardIcon (QStyle::SP_ArrowRight), - "", m_toolBar); + QAction *closeAction = new QAction (style->standardIcon (QStyle::SP_DialogCloseButton), "", m_toolBar); + QAction *newAction = new QAction (style->standardIcon (QStyle::SP_FileIcon), "", m_toolBar); + QAction *openAction = new QAction (style->standardIcon (QStyle::SP_DirOpenIcon), "", m_toolBar); + QAction *saveAction = new QAction (style->standardIcon (QStyle::SP_DriveHDIcon), "", m_toolBar); + QAction *saveActionAs = new QAction (style->standardIcon (QStyle::SP_DriveFDIcon), "", m_toolBar); + QAction *undoAction = new QAction (style->standardIcon (QStyle::SP_ArrowLeft), "", m_toolBar); + QAction *redoAction = new QAction (style->standardIcon (QStyle::SP_ArrowRight), "", m_toolBar); + m_toolBar->addAction (closeAction); m_toolBar->addAction (newAction); m_toolBar->addAction (openAction); m_toolBar->addAction (saveAction); @@ -303,6 +295,7 @@ layout->setMargin (2); widget ()->setLayout (layout); + connect (closeAction, SIGNAL (triggered()), this, SLOT (close())); connect (newAction, SIGNAL (triggered ()), this, SLOT (newFile ())); connect (openAction, SIGNAL (triggered ()), this, SLOT (openFile ())); connect (undoAction, SIGNAL (triggered ()), m_editor, SLOT (undo ()));
--- a/gui/src/MainWindow.cpp +++ b/gui/src/MainWindow.cpp @@ -236,15 +236,7 @@ m_octaveTerminal->openTerminal (); - m_documentationWidgetSubWindow = - m_centralMdiArea->addSubWindow (m_documentationWidget, - Qt::WindowTitleHint | Qt:: - WindowMinMaxButtonsHint); - m_documentationWidgetSubWindow->setObjectName ("DocumentationWidgetSubWindow"); - m_documentationWidgetSubWindow->setWindowTitle (tr ("Documentation")); - m_documentationWidgetSubWindow->setWindowIcon (QIcon ("../media/help_index.png")); - m_documentationWidgetSubWindow->setStatusTip (tr ("Browse the Octave documentation for help.")); - + // Octave Terminal subwindow. m_octaveTerminalSubWindow = m_centralMdiArea->addSubWindow (m_octaveTerminal, Qt::WindowTitleHint | Qt:: @@ -254,11 +246,22 @@ m_octaveTerminalSubWindow->setWindowIcon (QIcon ("../media/terminal.png")); m_octaveTerminalSubWindow->setStatusTip (tr ("Enter your commands into the Octave terminal.")); + // Documentation subwindow. + m_documentationWidgetSubWindow = + m_centralMdiArea->addSubWindow (m_documentationWidget, + Qt::WindowTitleHint | Qt:: + WindowMinMaxButtonsHint); + m_documentationWidgetSubWindow->setObjectName ("DocumentationWidgetSubWindow"); + m_documentationWidgetSubWindow->setWindowTitle (tr ("Documentation")); + m_documentationWidgetSubWindow->setWindowIcon (QIcon ("../media/help_index.png")); + m_documentationWidgetSubWindow->setStatusTip (tr ("Browse the Octave documentation for help.")); + + // Chat subwindow. m_ircWidgetSubWindow = m_centralMdiArea->addSubWindow (m_ircWidget, - Qt:: - WindowTitleHint | - Qt:: - WindowMinMaxButtonsHint); + Qt:: + WindowTitleHint | + Qt:: + WindowMinMaxButtonsHint); m_ircWidgetSubWindow->setObjectName ("ChatWidgetSubWindow"); m_ircWidgetSubWindow->setWindowTitle (tr ("Chat")); m_ircWidgetSubWindow->setWindowIcon (QIcon ("../media/chat.png"));