# 
# 
# patch "src/view/Guitone.cpp"
#  from [97a77009492a70cc9f8aa34a609c6c57bcdc27ac]
#    to [05d79afe471311586c08c52b1752f8332950baf8]
# 
# patch "src/view/Guitone.h"
#  from [bd85de58c8af019af8ecaf17fd5f0907e6d2d084]
#    to [780724a6857911d704510786ff1c5d11908c75bf]
# 
============================================================
--- src/view/Guitone.cpp	97a77009492a70cc9f8aa34a609c6c57bcdc27ac
+++ src/view/Guitone.cpp	05d79afe471311586c08c52b1752f8332950baf8
@@ -21,6 +21,10 @@
 
 #include "Guitone.h"
 #include <Q3PopupMenu>
+#include <QAction>
+#include <QMenu>
+#include <QMenuBar>
+#include <QToolBar>
 
 Guitone::Guitone()
     : QMainWindow( 0, "Guitone" )
@@ -31,31 +35,21 @@
     //
     // Menubar
     //
-    Q3PopupMenu *fileMenu = new Q3PopupMenu(this);
-    menuBar()->insertItem( tr("&File"), fileMenu );
+	menu = menuBar()->addMenu(tr("&File"));
+	
+	menu->addAction(tr("&Import Sandbox..."), 
+		this, SLOT(chooseSandbox()), Qt::CTRL+Qt::Key_I);
+	
+	menu->addAction(tr("&Quit"), this, SLOT(close()), Qt::CTRL+Qt::Key_Q);
 
-    int id;
-    id = fileMenu->insertItem(
-        tr("&Import Sandbox..."),
-		this,
-		SLOT(chooseSandbox()),
-		Qt::CTRL+Qt::Key_I
-    );
-	QString fileImportText = tr("Import a local sandbox into Guitone.");
-    fileMenu->setWhatsThis( id, fileImportText );
-/*
-    fileMenu->insertSeparator();
-
-    id = fileMenu->insertItem(
-        tr("&Quit"),
-        this,
-        SLOT(closeAllWindows()),
-        CTRL+Key_Q
-    );
-    QString fileQuitText = tr("Quit Guitone.");
-    fileMenu->setWhatsThis( id, fileQuitText );
-*/
+	//
+    // Toolbar
     //
+	toolBar = new QToolBar(this);
+    toolBar->setAllowedAreas(Qt::TopToolBarArea | Qt::BottomToolBarArea);
+    addToolBar(toolBar);	
+	
+	//
     // Main view
     //
     QSplitter *mainSplitter = new QSplitter(this);
============================================================
--- src/view/Guitone.h	bd85de58c8af019af8ecaf17fd5f0907e6d2d084
+++ src/view/Guitone.h	780724a6857911d704510786ff1c5d11908c75bf
@@ -26,8 +26,6 @@
 #include "../view/SandboxView.h"
 
 #include <QMainWindow.h>
-#include <q3popupmenu.h>
-#include <qmenubar.h>
 #include <qmessagebox.h>
 #include <qsplitter.h>
 #include <q3textedit.h>
@@ -35,7 +33,8 @@
 #include <qstatusbar.h>
 #include <map>
 
-class Q3TextEdit;
+class QToolBar;
+class QMenu;
 
 class Guitone: public QMainWindow
 {
@@ -49,7 +48,9 @@
 	void doFindAndSelectItem(SandboxItem*);
 
 private:
-    QString determineStatus(SandboxItem*);
+    QMenu *menu;
+	QToolBar *toolBar;
+	QString determineStatus(SandboxItem*);
     Sandbox *mySandbox;
     SandboxView *treeView;
     SandboxView *listView;