# HG changeset patch # User Jacob Dawid # Date 1302207617 -7200 # Node ID f7debc7c656d1b4e8d58e0189ac064d4412a4ab9 # Parent 45e5447ef292c9b3fc86264e25a62cc3d065fec3 Added variable and command history view. diff --git a/gui//src/MainWindow.cpp b/gui//src/MainWindow.cpp --- a/gui//src/MainWindow.cpp +++ b/gui//src/MainWindow.cpp @@ -29,6 +29,7 @@ constructWindow(); loadWebPage("Online Manual", "http://www.gnu.org/software/octave/doc/interpreter/"); + showMaximized(); } MainWindow::~MainWindow() { diff --git a/gui//src/TerminalMdiSubWindow.cpp b/gui//src/TerminalMdiSubWindow.cpp --- a/gui//src/TerminalMdiSubWindow.cpp +++ b/gui//src/TerminalMdiSubWindow.cpp @@ -10,7 +10,7 @@ void TerminalMdiSubWindow::constructWindow() { setWindowTitle("Octave Session"); - resize(800, 400); + resize(900, 600); setWidget(new QWidget(this)); QVBoxLayout *vBoxLayout = new QVBoxLayout(); @@ -23,17 +23,29 @@ m_terminalWidget->setShellProgram("octave"); m_terminalWidget->startShellProgram(); m_terminalWidget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding); - m_variableView = new QTreeView(hWidget); - m_variableView->setMaximumWidth(200); + + QWidget *hvWidget = new QWidget(); + QVBoxLayout *hvBoxLayout = new QVBoxLayout(); + m_variableView = new QTreeView(hWidget); + m_commandHistoryView = new QListView(hWidget); + hvWidget->setMaximumWidth(250); + hvBoxLayout->addWidget(new QLabel("Variables", hWidget)); + hvBoxLayout->addWidget(m_variableView); + hvBoxLayout->addWidget(new QLabel("Command History", hWidget)); + hvBoxLayout->addWidget(m_commandHistoryView); + hvBoxLayout->setMargin(1); + hvWidget->setLayout(hvBoxLayout); hBoxLayout->addWidget(m_terminalWidget); - hBoxLayout->addWidget(m_variableView); + hBoxLayout->addWidget(hvWidget); + hBoxLayout->setMargin(2); hWidget->setLayout(hBoxLayout); m_statusBar = new QStatusBar(); vBoxLayout->addWidget(hWidget); vBoxLayout->addWidget(m_statusBar); + vBoxLayout->setMargin(2); widget()->setLayout(vBoxLayout); m_statusBar->showMessage("Ready."); diff --git a/gui//src/TerminalMdiSubWindow.h b/gui//src/TerminalMdiSubWindow.h --- a/gui//src/TerminalMdiSubWindow.h +++ b/gui//src/TerminalMdiSubWindow.h @@ -3,6 +3,7 @@ #include #include +#include #include #include "QTerminalWidget.h" @@ -17,6 +18,7 @@ void constructWindow(); QTerminalWidget *m_terminalWidget; QTreeView *m_variableView; + QListView *m_commandHistoryView; QStatusBar *m_statusBar; };