From 13a0f445d06db0bbf286a88a8a04861e9bb03a73 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sat, 6 Jan 2018 02:44:45 +0100
Subject: [PATCH] Commands and presets GUI: changed view details

---
 sdrgui/mainwindow.cpp |   6 +-
 sdrgui/mainwindow.ui  | 363 ++++++++++++++++++++----------------------
 2 files changed, 180 insertions(+), 189 deletions(-)

diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index 5c445b03d..b83f6446b 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -534,8 +534,6 @@ void MainWindow::loadSettings()
         treeItem = addCommandToTree(m_settings.getCommand(i));
     }
 
-    tabifyDockWidget(ui->presetDock, ui->commandsDock);
-
     setLoggingOptions();
 }
 
@@ -565,6 +563,8 @@ void MainWindow::loadPresetSettings(const Preset* preset, int tabIndex)
 
 	// has to be last step
 	restoreState(preset->getLayout());
+    tabifyDockWidget(ui->presetDock, ui->commandsDock); // override this setting
+    ui->presetDock->raise();
 }
 
 void MainWindow::savePresetSettings(Preset* preset, int tabIndex)
@@ -1076,7 +1076,7 @@ void MainWindow::on_presetSave_clicked()
 void MainWindow::on_presetUpdate_clicked()
 {
 	QTreeWidgetItem* item = ui->presetTree->currentItem();
-	const Preset* changedPreset;
+	const Preset* changedPreset = 0;
 
 	if(item != 0)
 	{
diff --git a/sdrgui/mainwindow.ui b/sdrgui/mainwindow.ui
index 5e80b5605..59f7dc4e6 100644
--- a/sdrgui/mainwindow.ui
+++ b/sdrgui/mainwindow.ui
@@ -301,8 +301,11 @@
    <attribute name="dockWidgetArea">
     <number>1</number>
    </attribute>
-   <widget class="QWidget" name="dockWidgetContents">
-    <layout class="QGridLayout" name="gridLayout_6">
+   <widget class="QWidget" name="presetsDockWidget">
+    <layout class="QVBoxLayout" name="verticalLayout_6">
+     <property name="spacing">
+      <number>3</number>
+     </property>
      <property name="leftMargin">
       <number>2</number>
      </property>
@@ -315,104 +318,7 @@
      <property name="bottomMargin">
       <number>2</number>
      </property>
-     <property name="spacing">
-      <number>3</number>
-     </property>
-     <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">
+     <item>
       <widget class="QTreeWidget" name="presetTree">
        <property name="indentation">
         <number>10</number>
@@ -446,79 +352,177 @@
        </column>
       </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="1">
-      <widget class="QToolButton" name="presetSave">
-       <property name="toolTip">
-        <string>Save current settings as new preset</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="resources/res.qrc">
-         <normaloff>:/create.png</normaloff>:/create.png</iconset>
-       </property>
-       <property name="iconSize">
-        <size>
-         <width>16</width>
-         <height>16</height>
-        </size>
-       </property>
-      </widget>
-     </item>
-     <item row="5" column="10">
-      <widget class="QToolButton" name="presetLoad">
-       <property name="toolTip">
-        <string>Load selected preset</string>
-       </property>
-       <property name="text">
-        <string>...</string>
-       </property>
-       <property name="icon">
-        <iconset resource="resources/res.qrc">
-         <normaloff>:/load.png</normaloff>:/load.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="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>
+      <layout class="QHBoxLayout" name="presetsControl">
+       <item>
+        <widget class="QToolButton" name="presetSave">
+         <property name="toolTip">
+          <string>Save current settings as new preset</string>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset resource="resources/res.qrc">
+           <normaloff>:/create.png</normaloff>:/create.png</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <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>
+        <widget class="QToolButton" name="presetLoad">
+         <property name="toolTip">
+          <string>Load selected preset</string>
+         </property>
+         <property name="text">
+          <string>...</string>
+         </property>
+         <property name="icon">
+          <iconset resource="resources/res.qrc">
+           <normaloff>:/load.png</normaloff>:/load.png</iconset>
+         </property>
+         <property name="iconSize">
+          <size>
+           <width>16</width>
+           <height>16</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+      </layout>
      </item>
     </layout>
    </widget>
@@ -617,18 +621,6 @@
      </item>
      <item>
       <layout class="QHBoxLayout" name="commandsControl">
-       <property name="leftMargin">
-        <number>6</number>
-       </property>
-       <property name="topMargin">
-        <number>6</number>
-       </property>
-       <property name="rightMargin">
-        <number>6</number>
-       </property>
-       <property name="bottomMargin">
-        <number>6</number>
-       </property>
        <item>
         <widget class="QToolButton" name="commandNew">
          <property name="toolTip">
@@ -924,7 +916,6 @@
  </customwidgets>
  <tabstops>
   <tabstop>presetTree</tabstop>
-  <tabstop>presetSave</tabstop>
  </tabstops>
  <resources>
   <include location="resources/res.qrc"/>