From cf9263f1ff489e7c31fa3822e2028bd1e9688002 Mon Sep 17 00:00:00 2001
From: f4exb <f4exb06@gmail.com>
Date: Sat, 3 Oct 2015 02:14:26 +0200
Subject: [PATCH] Added a save settings button to the main window

---
 include-gpl/mainwindow.h  |  1 +
 sdrbase/dsp/dspengine.cpp |  6 ++---
 sdrbase/mainwindow.cpp    |  5 ++++
 sdrbase/mainwindow.ui     | 52 ++++++++++++++++++++++++++++++++++++---
 4 files changed, 56 insertions(+), 8 deletions(-)

diff --git a/include-gpl/mainwindow.h b/include-gpl/mainwindow.h
index e4dfb3736..5b79184ce 100644
--- a/include-gpl/mainwindow.h
+++ b/include-gpl/mainwindow.h
@@ -126,6 +126,7 @@ private slots:
 	void on_action_View_Fullscreen_toggled(bool checked);
 	void on_presetSave_clicked();
 	void on_presetUpdate_clicked();
+	void on_settingsSave_clicked();
 	void on_presetLoad_clicked();
 	void on_presetDelete_clicked();
 	void on_presetTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
diff --git a/sdrbase/dsp/dspengine.cpp b/sdrbase/dsp/dspengine.cpp
index 601545b22..41d19e0d4 100644
--- a/sdrbase/dsp/dspengine.cpp
+++ b/sdrbase/dsp/dspengine.cpp
@@ -497,8 +497,6 @@ DSPEngine::State DSPEngine::gotoError(const QString& errorMessage)
 
 void DSPEngine::handleSetSource(SampleSource* source)
 {
-	qDebug() << "DSPEngine::handleSetSource";
-
 	gotoIdle();
 
 	if(m_sampleSource != 0)
@@ -510,12 +508,12 @@ void DSPEngine::handleSetSource(SampleSource* source)
 
 	if(m_sampleSource != 0)
 	{
-		qDebug() << "  - set " << source->getDeviceDescription().toStdString().c_str();
+		qDebug() << "DSPEngine::handleSetSource: set " << source->getDeviceDescription().toStdString().c_str();
 		connect(m_sampleSource->getSampleFifo(), SIGNAL(dataReady()), this, SLOT(handleData()), Qt::QueuedConnection);
 	}
 	else
 	{
-		qDebug() << "  - set none";
+		qDebug() << "DSPEngine::handleSetSource: set none";
 	}
 }
 
diff --git a/sdrbase/mainwindow.cpp b/sdrbase/mainwindow.cpp
index b915ed2e3..af0a425ec 100644
--- a/sdrbase/mainwindow.cpp
+++ b/sdrbase/mainwindow.cpp
@@ -488,6 +488,11 @@ void MainWindow::on_presetUpdate_clicked()
 	}
 }
 
+void MainWindow::on_settingsSave_clicked()
+{
+	saveSettings();
+}
+
 void MainWindow::on_presetLoad_clicked()
 {
 	qDebug() << "MainWindow::on_presetLoad_clicked";
diff --git a/sdrbase/mainwindow.ui b/sdrbase/mainwindow.ui
index b5b761490..1da4817ed 100644
--- a/sdrbase/mainwindow.ui
+++ b/sdrbase/mainwindow.ui
@@ -163,7 +163,7 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="7">
+     <item row="5" column="9">
       <widget class="QToolButton" name="presetLoad">
        <property name="toolTip">
         <string>Load selected preset</string>
@@ -183,7 +183,7 @@
        </property>
       </widget>
      </item>
-     <item row="5" column="5" colspan="2">
+     <item row="5" column="7" colspan="2">
       <spacer name="horizontalSpacer_3">
        <property name="orientation">
         <enum>Qt::Horizontal</enum>
@@ -196,7 +196,7 @@
        </property>
       </spacer>
      </item>
-     <item row="5" column="3">
+     <item row="5" column="5">
       <widget class="QToolButton" name="presetDelete">
        <property name="toolTip">
         <string>Delete selected preset</string>
@@ -216,7 +216,7 @@
        </property>
       </widget>
      </item>
-     <item row="1" column="1" rowspan="4" colspan="7">
+     <item row="1" column="1" rowspan="4" colspan="9">
       <widget class="QTreeWidget" name="presetTree">
        <property name="allColumnsShowFocus">
         <bool>true</bool>
@@ -253,6 +253,39 @@
        </property>
       </widget>
      </item>
+     <item row="5" column="4">
+      <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>:/preset-last.png</normaloff>:/preset-last.png</iconset>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>16</width>
+         <height>16</height>
+        </size>
+       </property>
+      </widget>
+     </item>
     </layout>
    </widget>
   </widget>
@@ -359,6 +392,17 @@
     </layout>
    </widget>
   </widget>
+  <widget class="QToolBar" name="toolBar">
+   <property name="windowTitle">
+    <string>toolBar</string>
+   </property>
+   <attribute name="toolBarArea">
+    <enum>TopToolBarArea</enum>
+   </attribute>
+   <attribute name="toolBarBreak">
+    <bool>false</bool>
+   </attribute>
+  </widget>
   <action name="action_Exit">
    <property name="text">
     <string>E&amp;xit</string>