# HG changeset patch # User Jacob Dawid # Date 1301985748 -7200 # Node ID 30469264a58f8b5c06b22a4b42b817722cad0675 # Parent 583c15dd487b5a7486fdd295643d6b1c2552632a Changed menu to toolbar. diff --git a/gui//octaveterminal.cpp b/gui//octaveterminal.cpp --- a/gui//octaveterminal.cpp +++ b/gui//octaveterminal.cpp @@ -1,6 +1,6 @@ #include "octaveterminal.h" #include - +#include OctaveTerminal::OctaveTerminal(QWidget *parent) : QMdiSubWindow(parent), @@ -8,25 +8,25 @@ setWindowTitle("Octave Terminal"); setWidget(new QWidget(this)); - m_menuBar = new QMenuBar(widget()); + m_mainToolBar = new QToolBar(widget()); m_octaveOutput = new QTextBrowser(widget()); m_commandLine = new QLineEdit(widget()); QVBoxLayout *layout = new QVBoxLayout(); - layout->addWidget(m_menuBar); + layout->addWidget(m_mainToolBar); layout->addWidget(m_octaveOutput); layout->addWidget(m_commandLine); widget()->setLayout(layout); - QMenu *octaveMenu = m_menuBar->addMenu("Octave"); - QAction *showEnvironmentAction = octaveMenu->addAction("Show Environment (who)"); + QPushButton *showEnvironmentButton = new QPushButton("Show Environment (who)"); + m_mainToolBar->addWidget(showEnvironmentButton); m_octaveOutput->setFontFamily("Monospace"); m_octaveOutput->setReadOnly(true); blockUserInput(); connect(m_commandLine, SIGNAL(returnPressed()), this, SLOT(sendCommand())); - connect(showEnvironmentAction, SIGNAL(triggered()), this, SLOT(showEnvironment())); + connect(showEnvironmentButton, SIGNAL(clicked()), this, SLOT(showEnvironment())); } void OctaveTerminal::sendCommand() { diff --git a/gui//octaveterminal.h b/gui//octaveterminal.h --- a/gui//octaveterminal.h +++ b/gui//octaveterminal.h @@ -7,6 +7,7 @@ #include #include #include +#include #include "client.h" @@ -30,7 +31,7 @@ void fetchErrorFromClient(); private: - QMenuBar *m_menuBar; + QToolBar *m_mainToolBar; QTextBrowser *m_octaveOutput; QLineEdit *m_commandLine; Client *m_client;