qsui: fixed some bugs

git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6203 90c681e8-e032-0410-971d-27865f9a5e38

4 files changed, 61 insertions, 21 deletions

diff --git a/src/plugins/Ui/qsui/actionmanager.cpp b/src/plugins/Ui/qsui/actionmanager.cpp
index 6311a5aea..36f450154 100644
--- a/src/plugins/Ui/qsui/actionmanager.cpp
+++ b/src/plugins/Ui/qsui/actionmanager.cpp
@@ -238,6 +238,7 @@ QToolBar *ActionManager::createToolBar(ActionManager::ToolBarInfo info, QWidget
     updateToolBar(toolBar, info);
     toolBar->setProperty("uid", info.uid);
     toolBar->setIconSize(QSize(16,16));
+    toolBar->setObjectName("Toolbar" + info.uid);
     return toolBar;
 }
 
diff --git a/src/plugins/Ui/qsui/forms/toolbareditor.ui b/src/plugins/Ui/qsui/forms/toolbareditor.ui
index 5c29d8d83..c13fa3f94 100644
--- a/src/plugins/Ui/qsui/forms/toolbareditor.ui
+++ b/src/plugins/Ui/qsui/forms/toolbareditor.ui
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>524</width>
+    <width>578</width>
     <height>419</height>
    </rect>
   </property>
@@ -190,6 +190,9 @@
    </item>
    <item row="0" column="0" colspan="3">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
+     <property name="spacing">
+      <number>6</number>
+     </property>
      <item>
       <widget class="QLabel" name="label">
        <property name="text">
@@ -208,12 +211,50 @@
       </widget>
      </item>
      <item>
-      <widget class="QToolButton" name="toolBarMenuButton">
+      <widget class="QPushButton" name="createButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>&amp;Create</string>
+       </property>
+       <property name="flat">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="renameButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string>Re&amp;name</string>
+       </property>
+       <property name="flat">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="removeButton">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
        <property name="text">
-        <string>...</string>
+        <string>&amp;Remove</string>
        </property>
-       <property name="popupMode">
-        <enum>QToolButton::InstantPopup</enum>
+       <property name="flat">
+        <bool>false</bool>
        </property>
       </widget>
      </item>
diff --git a/src/plugins/Ui/qsui/toolbareditor.cpp b/src/plugins/Ui/qsui/toolbareditor.cpp
index 58a2f61a7..20d67e810 100644
--- a/src/plugins/Ui/qsui/toolbareditor.cpp
+++ b/src/plugins/Ui/qsui/toolbareditor.cpp
@@ -48,13 +48,6 @@ ToolBarEditor::ToolBarEditor(QWidget *parent) :
 
     m_previousIndex = -1;
     populateActionList();
-
-    QMenu *menu = new QMenu(this);
-    menu->addAction(tr("Create"), this, SLOT(createToolBar()));
-    menu->addAction(tr("Rename"), this, SLOT(renameToolBar()));
-    menu->addSeparator();
-    menu->addAction(tr("Remove"), this, SLOT(removeToolBar()));
-    m_ui->toolBarMenuButton->setMenu(menu);
 }
 
 ToolBarEditor::~ToolBarEditor()
@@ -75,6 +68,13 @@ void ToolBarEditor::populateActionList(bool reset)
     m_ui->actionsListWidget->clear();
     m_ui->activeActionsListWidget->clear();
 
+    if(reset)
+    {
+        m_toolBarInfoList.clear();
+        m_toolBarInfoList.append(ActionManager::instance()->defaultToolBar());
+        m_previousIndex = -1;
+    }
+
     QStringList actionNames;
     foreach (ActionManager::ToolBarInfo info, m_toolBarInfoList)
     {
@@ -170,9 +170,7 @@ void ToolBarEditor::on_downToolButton_clicked()
 
 void ToolBarEditor::on_resetPushButton_clicked()
 {
-    /*m_ui->actionsListWidget->clear();
-    m_ui->activeActionsListWidget->clear();
-    populateActionList(true);*/
+    populateActionList(true);
 }
 
 void ToolBarEditor::on_toolbarNameComboBox_activated(int index)
@@ -242,7 +240,7 @@ void ToolBarEditor::onRowsAboutToBeRemoved(const QModelIndex &, int start, int)
     }
 }
 
-void ToolBarEditor::createToolBar()
+void ToolBarEditor::on_createButton_clicked()
 {
     ActionManager::ToolBarInfo info;
     int i = 0;
@@ -257,7 +255,7 @@ void ToolBarEditor::createToolBar()
     m_ui->toolbarNameComboBox->addItem(info.title);
 }
 
-void ToolBarEditor::renameToolBar()
+void ToolBarEditor::on_renameButton_clicked()
 {
     int index = m_ui->toolbarNameComboBox->currentIndex();
     if(index >= 0)
@@ -273,7 +271,7 @@ void ToolBarEditor::renameToolBar()
     }
 }
 
-void ToolBarEditor::removeToolBar()
+void ToolBarEditor::on_removeButton_clicked()
 {
     if(m_ui->toolbarNameComboBox->count() == 1)
         return;
diff --git a/src/plugins/Ui/qsui/toolbareditor.h b/src/plugins/Ui/qsui/toolbareditor.h
index 03f7453ff..b93fabff0 100644
--- a/src/plugins/Ui/qsui/toolbareditor.h
+++ b/src/plugins/Ui/qsui/toolbareditor.h
@@ -54,9 +54,9 @@ private slots:
     void on_resetPushButton_clicked();
     void on_toolbarNameComboBox_activated(int index);
     void onRowsAboutToBeRemoved(const QModelIndex &, int start, int);
-    void createToolBar();
-    void renameToolBar();
-    void removeToolBar();
+    void on_createButton_clicked();
+    void on_renameButton_clicked();
+    void on_removeButton_clicked();
 
 private:
     void populateActionList(bool reset = false);