--- a/gui//octaveterminal.cpp	Tue Apr 05 00:12:18 2011 +0200
+++ b/gui//octaveterminal.cpp	Tue Apr 05 08:42:28 2011 +0200
@@ -1,6 +1,6 @@
 #include "octaveterminal.h"
 #include <QVBoxLayout>
-
+#include <QPushButton>
 
 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() {

--- a/gui//octaveterminal.h	Tue Apr 05 00:12:18 2011 +0200
+++ b/gui//octaveterminal.h	Tue Apr 05 08:42:28 2011 +0200
@@ -7,6 +7,7 @@
 #include <QAction>
 #include <QMenuBar>
 #include <QMenu>
+#include <QToolBar>
 
 #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;