Mercurial > hg > octave-terminal
changeset 13399:d5566981b3ac
Put terminal into a tab widget.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Mon, 11 Apr 2011 17:45:06 +0200 |
parents | 877f82caaee3 |
children | 4a718f51baa3 |
files | gui//src/MainWindow.cpp gui//src/MainWindow.h |
diffstat | 2 files changed, 7 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/gui//src/MainWindow.cpp +++ b/gui//src/MainWindow.cpp @@ -26,7 +26,7 @@ MainWindow::MainWindow(QWidget *parent) : QMainWindow(parent), m_isRunning(true) { - resize(1000, 600); + showMaximized(); constructWindow(); establishOctaveLink(); } @@ -42,9 +42,12 @@ m_variablesDockWidget = new VariablesDockWidget(this); m_historyDockWidget = new HistoryDockWidget(this); m_filesDockWidget = new FilesDockWidget(this); + m_centralTabWidget = new QTabWidget(this); setWindowTitle("Octave"); - setCentralWidget(m_octaveTerminal); + setCentralWidget(m_centralTabWidget); + + m_centralTabWidget->addTab(m_octaveTerminal, "Terminal"); addDockWidget(Qt::LeftDockWidgetArea, m_variablesDockWidget); addDockWidget(Qt::LeftDockWidgetArea, m_historyDockWidget);
--- a/gui//src/MainWindow.h +++ b/gui//src/MainWindow.h @@ -21,6 +21,7 @@ #include <QtGui/QMainWindow> #include <QThread> +#include <QTabWidget> #include "OctaveTerminal.h" #include "OctaveLink.h" #include "VariablesDockWidget.h" @@ -99,6 +100,7 @@ VariablesDockWidget *m_variablesDockWidget; HistoryDockWidget *m_historyDockWidget; FilesDockWidget *m_filesDockWidget; + QTabWidget *m_centralTabWidget; // Threads for running octave and managing the data interaction. OctaveMainThread *m_octaveMainThread;