Revert "use toolbutton"

This reverts commit 0b09c41.

Author: octaeder

src/usermenudialog.cpp

@@ -40,32 +40,26 @@ UserMenuDialog::UserMenuDialog(QWidget *parent,  QString name, QLanguageFactory
 	connect(ui.runScriptButton, SIGNAL(clicked()), SLOT(slotExecMacro()));
 
 	connect(ui.pushButtonAdd, SIGNAL(clicked()), SLOT(slotAdd()));
-	connect(ui.pushButtonAddFolder, SIGNAL(clicked()), SLOT(slotAddFolder()));
+    connect(ui.pushButtonAddFolder, SIGNAL(clicked()), SLOT(slotAddFolder()));
 	connect(ui.pushButtonRemove, SIGNAL(clicked()), SLOT(slotRemove()));
 	connect(ui.pushButtonUp, SIGNAL(clicked()), SLOT(slotMoveUp()));
 	connect(ui.pushButtonDown, SIGNAL(clicked()), SLOT(slotMoveDown()));
 
-	toolButton = new QToolButton(ui.toolBarExport);
-	toolButton->setToolButtonStyle(Qt::ToolButtonTextOnly);
-	toolButton->setPopupMode(QToolButton::MenuButtonPopup);
-
-	QMenu *menuExport = new QMenu(this);
-	menuExport->setToolTipsVisible(true);
-
-	QAction *act = menuExport->addAction(tr("Export"),this,exportMacro);
-	act->setToolTip("Export macro to file");
+	QMenu *popup = new QMenu(ui.pbExport);
+	QAction *act = new QAction(tr("Current Macro"), popup);
+	act->setMenuRole(QAction::NoRole);
 	act->setData(QVariant(QString("current")));
-	toolButton->setDefaultAction(act);
-
-	act = menuExport->addAction(tr("Export all"),this,exportMacro);
-	act->setToolTip("Export all macros to files");
+	connect(act, SIGNAL(triggered()), SLOT(exportMacro()));
+	popup->addAction(act);
+	act = new QAction(tr("All Macros"), popup);
+	act->setMenuRole(QAction::NoRole);
 	act->setData(QVariant(QString("all")));
+	connect(act, SIGNAL(triggered()), SLOT(exportMacro()));
+	popup->addAction(act);
+	ui.pbExport->setMenu(popup);
 
-	toolButton->setMenu(menuExport);
-	ui.toolBarExport->addWidget(toolButton);
-
-	connect(ui.pbImport,SIGNAL(clicked()), SLOT(importMacro()));
-	connect(ui.pbBrowse,SIGNAL(clicked()), SLOT(browseMacrosOnRepository()));
+    connect(ui.pbImport,SIGNAL(clicked()), SLOT(importMacro()));
+    connect(ui.pbBrowse,SIGNAL(clicked()), SLOT(browseMacrosOnRepository()));
 
 
 	connect(ui.radioButtonNormal, SIGNAL(clicked()), SLOT(changeTypeToNormal()));
@@ -457,7 +451,6 @@ void UserMenuDialog::exportMacro()
 	QAction *act = qobject_cast<QAction *>(sender());
 	if (!act) return;
 	QString exportType = act->data().toString();
-	toolButton->setDefaultAction(act);
 	if (exportType=="all") { // export all macros
 		QList<Macro> macros = getMacros();
 		if (macros.length()==0) return;

src/usermenudialog.h

@@ -38,7 +38,6 @@ class UserMenuDialog : public QDialog
     bool getLineWrap();
 
 private:
-	QToolButton *toolButton;
 	void setLanguageFromText(void);
     QTreeWidgetItem* findCreateFolder(const QString &menu);
     QTreeWidgetItem* findCreateFolder(QTreeWidgetItem *parent, QStringList folders);

src/usermenudialog.ui

@@ -92,9 +92,6 @@
            </property>
           </spacer>
          </item>
-         <item>
-          <widget class="QToolBar" name="toolBarExport"/>
-         </item>
          <item>
           <widget class="QPushButton" name="pbBrowse">
            <property name="toolTip">
@@ -105,6 +102,16 @@
            </property>
           </widget>
          </item>
+         <item>
+          <widget class="QPushButton" name="pbExport">
+           <property name="toolTip">
+            <string>Export macro to file</string>
+           </property>
+           <property name="text">
+            <string>Export</string>
+           </property>
+          </widget>
+         </item>
          <item>
           <widget class="QPushButton" name="pbImport">
            <property name="toolTip">