From 9435c7446f02ccdddbb5ede7525da4c045e0b7d7 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Fri, 5 Jan 2018 18:53:01 +0100
Subject: [PATCH] Commands and presets: tabify dock widgets. Changed placement
 of the delete button

---
 sdrgui/mainwindow.cpp |   2 +
 sdrgui/mainwindow.ui  | 247 +++++++++++++++++++++---------------------
 2 files changed, 125 insertions(+), 124 deletions(-)

diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index 5cb085356..5c445b03d 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -534,6 +534,8 @@ void MainWindow::loadSettings()
         treeItem = addCommandToTree(m_settings.getCommand(i));
     }
 
+    tabifyDockWidget(ui->presetDock, ui->commandsDock);
+
     setLoggingOptions();
 }
 
diff --git a/sdrgui/mainwindow.ui b/sdrgui/mainwindow.ui
index e3c57a155..5e80b5605 100644
--- a/sdrgui/mainwindow.ui
+++ b/sdrgui/mainwindow.ui
@@ -318,7 +318,101 @@
      <property name="spacing">
       <number>3</number>
      </property>
-     <item row="1" column="1" rowspan="2" colspan="12">
+     <item row="5" column="2">
+      <widget class="QToolButton" name="presetUpdate">
+       <property name="toolTip">
+        <string>Update selected preset with current settings</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="resources/res.qrc">
+         <normaloff>:/recycle.png</normaloff>:/recycle.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="4">
+      <widget class="QToolButton" name="presetEdit">
+       <property name="toolTip">
+        <string>Edit preset details</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="resources/res.qrc">
+         <normaloff>:/edit.png</normaloff>:/edit.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="5">
+      <widget class="QToolButton" name="presetExport">
+       <property name="toolTip">
+        <string>Export current preset to file</string>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="icon">
+        <iconset resource="resources/res.qrc">
+         <normaloff>:/export.png</normaloff>:/export.png</iconset>
+       </property>
+      </widget>
+     </item>
+     <item row="5" column="7">
+      <spacer name="horizontalSpacer_2">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="5" column="9">
+      <spacer name="horizontalSpacer">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>40</width>
+         <height>20</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
+     <item row="5" column="3">
+      <widget class="QToolButton" name="settingsSave">
+       <property name="toolTip">
+        <string>Save the current settings (inc. presets)</string>
+       </property>
+       <property name="text">
+        <string>...</string>
+       </property>
+       <property name="icon">
+        <iconset resource="resources/res.qrc">
+         <normaloff>:/save.png</normaloff>:/save.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1" rowspan="2" colspan="13">
       <widget class="QTreeWidget" name="presetTree">
        <property name="indentation">
         <number>10</number>
@@ -352,18 +446,19 @@
        </column>
       </widget>
      </item>
-     <item row="5" column="9">
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
+     <item row="5" column="6">
+      <widget class="QToolButton" name="presetImport">
+       <property name="toolTip">
+        <string>Import preset from file into current group</string>
        </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
+       <property name="text">
+        <string/>
        </property>
-      </spacer>
+       <property name="icon">
+        <iconset resource="resources/res.qrc">
+         <normaloff>:/import.png</normaloff>:/import.png</iconset>
+       </property>
+      </widget>
      </item>
      <item row="5" column="1">
       <widget class="QToolButton" name="presetSave">
@@ -386,94 +481,6 @@
       </widget>
      </item>
      <item row="5" column="10">
-      <widget class="QToolButton" name="presetDelete">
-       <property name="toolTip">
-        <string>Delete selected preset</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="resources/res.qrc">
-         <normaloff>:/bin.png</normaloff>:/bin.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="2">
-      <widget class="QToolButton" name="presetUpdate">
-       <property name="toolTip">
-        <string>Update selected preset with current settings</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="resources/res.qrc">
-         <normaloff>:/recycle.png</normaloff>:/recycle.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="6">
-      <widget class="QToolButton" name="presetImport">
-       <property name="toolTip">
-        <string>Import preset from file into current group</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="resources/res.qrc">
-         <normaloff>:/import.png</normaloff>:/import.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="5">
-      <widget class="QToolButton" name="presetExport">
-       <property name="toolTip">
-        <string>Export current preset to file</string>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="icon">
-        <iconset resource="resources/res.qrc">
-         <normaloff>:/export.png</normaloff>:/export.png</iconset>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="3">
-      <widget class="QToolButton" name="settingsSave">
-       <property name="toolTip">
-        <string>Save the current settings (inc. presets)</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="resources/res.qrc">
-         <normaloff>:/save.png</normaloff>:/save.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="8">
       <widget class="QToolButton" name="presetLoad">
        <property name="toolTip">
         <string>Load selected preset</string>
@@ -493,30 +500,23 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="7">
-      <spacer name="horizontalSpacer_2">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item row="5" column="4">
-      <widget class="QToolButton" name="presetEdit">
+     <item row="5" column="8">
+      <widget class="QToolButton" name="presetDelete">
        <property name="toolTip">
-        <string>Edit preset details</string>
+        <string>Delete selected preset</string>
        </property>
        <property name="text">
-        <string/>
+        <string>...</string>
        </property>
        <property name="icon">
         <iconset resource="resources/res.qrc">
-         <normaloff>:/edit.png</normaloff>:/edit.png</iconset>
+         <normaloff>:/bin.png</normaloff>:/bin.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
        </property>
       </widget>
      </item>
@@ -727,16 +727,16 @@
         </spacer>
        </item>
        <item>
-        <widget class="ButtonSwitch" name="commandKeyboardConnect">
+        <widget class="QToolButton" name="commandDelete">
          <property name="toolTip">
-          <string>Toggle keyboard to command connection</string>
+          <string>Delete selected command</string>
          </property>
          <property name="text">
           <string/>
          </property>
          <property name="icon">
           <iconset resource="resources/res.qrc">
-           <normaloff>:/keyboard.png</normaloff>:/keyboard.png</iconset>
+           <normaloff>:/bin.png</normaloff>:/bin.png</iconset>
          </property>
         </widget>
        </item>
@@ -754,16 +754,16 @@
         </spacer>
        </item>
        <item>
-        <widget class="QToolButton" name="commandDelete">
+        <widget class="ButtonSwitch" name="commandKeyboardConnect">
          <property name="toolTip">
-          <string>Delete selected command</string>
+          <string>Toggle keyboard to command connection</string>
          </property>
          <property name="text">
           <string/>
          </property>
          <property name="icon">
           <iconset resource="resources/res.qrc">
-           <normaloff>:/bin.png</normaloff>:/bin.png</iconset>
+           <normaloff>:/keyboard.png</normaloff>:/keyboard.png</iconset>
          </property>
         </widget>
        </item>
@@ -925,7 +925,6 @@
  <tabstops>
   <tabstop>presetTree</tabstop>
   <tabstop>presetSave</tabstop>
-  <tabstop>presetDelete</tabstop>
  </tabstops>
  <resources>
   <include location="resources/res.qrc"/>