# HG changeset patch # User Jacob Dawid # Date 1302536706 -7200 # Node ID d5566981b3acae9cef5918ed2f295b11473a628a # Parent 877f82caaee3697465f25cc7ace35ef766cc1c05 Put terminal into a tab widget. diff -r 877f82caaee3 -r d5566981b3ac gui//src/MainWindow.cpp --- a/gui//src/MainWindow.cpp Mon Apr 11 16:45:28 2011 +0200 +++ b/gui//src/MainWindow.cpp Mon Apr 11 17:45:06 2011 +0200 @@ -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); diff -r 877f82caaee3 -r d5566981b3ac gui//src/MainWindow.h --- a/gui//src/MainWindow.h Mon Apr 11 16:45:28 2011 +0200 +++ b/gui//src/MainWindow.h Mon Apr 11 17:45:06 2011 +0200 @@ -21,6 +21,7 @@ #include #include +#include #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;