qsui: changed toolbar editor form

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

1 files changed, 64 insertions, 33 deletions

diff --git a/src/plugins/Ui/qsui/forms/toolbareditor.ui b/src/plugins/Ui/qsui/forms/toolbareditor.ui
index b13af57d7..5c29d8d83 100644
--- a/src/plugins/Ui/qsui/forms/toolbareditor.ui
+++ b/src/plugins/Ui/qsui/forms/toolbareditor.ui
@@ -23,17 +23,17 @@
    <property name="bottomMargin">
     <number>6</number>
    </property>
-   <item row="0" column="0" rowspan="3">
-    <widget class="QListWidget" name="actionsListWidget">
+   <item row="1" column="2" rowspan="3">
+    <widget class="QListWidget" name="activeActionsListWidget">
      <property name="editTriggers">
       <set>QAbstractItemView::NoEditTriggers</set>
      </property>
-     <property name="showDropIndicator" stdset="0">
-      <bool>false</bool>
-     </property>
      <property name="dragEnabled">
       <bool>true</bool>
      </property>
+     <property name="dragDropOverwriteMode">
+      <bool>false</bool>
+     </property>
      <property name="dragDropMode">
       <enum>QAbstractItemView::DragDrop</enum>
      </property>
@@ -54,30 +54,38 @@
      </property>
     </widget>
    </item>
-   <item row="0" column="1">
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>20</width>
-       <height>137</height>
-      </size>
-     </property>
-    </spacer>
+   <item row="4" column="0" colspan="3">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QPushButton" name="resetPushButton">
+       <property name="text">
+        <string>Reset</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="0" column="2" rowspan="3">
-    <widget class="QListWidget" name="activeActionsListWidget">
+   <item row="1" column="0" rowspan="3">
+    <widget class="QListWidget" name="actionsListWidget">
      <property name="editTriggers">
       <set>QAbstractItemView::NoEditTriggers</set>
      </property>
+     <property name="showDropIndicator" stdset="0">
+      <bool>false</bool>
+     </property>
      <property name="dragEnabled">
       <bool>true</bool>
      </property>
-     <property name="dragDropOverwriteMode">
-      <bool>false</bool>
-     </property>
      <property name="dragDropMode">
       <enum>QAbstractItemView::DragDrop</enum>
      </property>
@@ -98,7 +106,7 @@
      </property>
     </widget>
    </item>
-   <item row="1" column="1">
+   <item row="2" column="1">
     <layout class="QGridLayout" name="gridLayout">
      <item row="0" column="0" colspan="2">
       <widget class="QToolButton" name="upToolButton">
@@ -154,7 +162,7 @@
      </item>
     </layout>
    </item>
-   <item row="2" column="1">
+   <item row="3" column="1">
     <spacer name="verticalSpacer_2">
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -167,22 +175,45 @@
      </property>
     </spacer>
    </item>
-   <item row="3" column="0" colspan="3">
-    <layout class="QHBoxLayout" name="horizontalLayout">
+   <item row="1" column="1">
+    <spacer name="verticalSpacer">
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>20</width>
+       <height>137</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="0" column="0" colspan="3">
+    <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QPushButton" name="resetPushButton">
+      <widget class="QLabel" name="label">
        <property name="text">
-        <string>Reset</string>
+        <string>Toolbar:</string>
        </property>
       </widget>
      </item>
      <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+      <widget class="QComboBox" name="toolbarNameComboBox">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
        </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+      </widget>
+     </item>
+     <item>
+      <widget class="QToolButton" name="toolBarMenuButton">
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="popupMode">
+        <enum>QToolButton::InstantPopup</enum>
        </property>
       </widget>
      </item>