Mercurial > hg > octave-terminal
changeset 13373:f7debc7c656d
Added variable and command history view.
author | Jacob Dawid <jacob.dawid@googlemail.com> |
---|---|
date | Thu, 07 Apr 2011 22:20:17 +0200 |
parents | 45e5447ef292 |
children | 54e1807f3c46 |
files | gui//src/MainWindow.cpp gui//src/TerminalMdiSubWindow.cpp gui//src/TerminalMdiSubWindow.h |
diffstat | 3 files changed, 19 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- 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() {
--- 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.");
--- a/gui//src/TerminalMdiSubWindow.h +++ b/gui//src/TerminalMdiSubWindow.h @@ -3,6 +3,7 @@ #include <QMdiSubWindow> #include <QTreeView> +#include <QListView> #include <QStatusBar> #include "QTerminalWidget.h" @@ -17,6 +18,7 @@ void constructWindow(); QTerminalWidget *m_terminalWidget; QTreeView *m_variableView; + QListView *m_commandHistoryView; QStatusBar *m_statusBar; };