Make device title editable in the basic device settings. Fixes #2292

plugins/samplesource/fcdpro/fcdprogui.cpp

@@ -25,6 +25,7 @@
 #include "gui/glspectrum.h"
 #include "gui/basicdevicesettingsdialog.h"
 #include "gui/dialogpositioner.h"
+#include "mainspectrum/mainspectrumgui.h"
 #include "dsp/dspcommands.h"
 #include "fcdprogui.h"
 
@@ -293,6 +294,8 @@ void FCDProGui::updateFrequencyLimits()
 
 void FCDProGui::displaySettings()
 {
+	setTitle(m_settings.m_title);
+	getDeviceUISet()->m_mainSpectrumGUI->setTitle(m_settings.m_title);
     ui->transverter->setDeltaFrequency(m_settings.m_transverterDeltaFrequency);
     ui->transverter->setDeltaFrequencyActive(m_settings.m_transverterMode);
     ui->transverter->setIQOrder(m_settings.m_iqOrder);
@@ -602,17 +605,26 @@ void FCDProGui::openDeviceSettingsDialog(const QPoint& p)
         dialog.setReverseAPIAddress(m_settings.m_reverseAPIAddress);
         dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
         dialog.setReverseAPIDeviceIndex(m_settings.m_reverseAPIDeviceIndex);
+		dialog.setTitle(m_settings.m_title);
+		dialog.setDefaultTitle(getDefaultTitle());
 
         dialog.move(p);
         new DialogPositioner(&dialog, false);
         dialog.exec();
 
-        m_settings.m_useReverseAPI = dialog.useReverseAPI();
-        m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
-        m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
-        m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
+		if (dialog.result() == QDialog::Accepted)
+		{
+			m_settings.m_title = dialog.getTitle();
+			setTitle(m_settings.m_title);
+			getDeviceUISet()->m_mainSpectrumGUI->setTitle(m_settings.m_title);
+			m_settingsKeys.append("title");
+			m_settings.m_useReverseAPI = dialog.useReverseAPI();
+			m_settings.m_reverseAPIAddress = dialog.getReverseAPIAddress();
+			m_settings.m_reverseAPIPort = dialog.getReverseAPIPort();
+			m_settings.m_reverseAPIDeviceIndex = dialog.getReverseAPIDeviceIndex();
 
-        sendSettings();
+			sendSettings();
+		}
     }
 
     resetContextMenuType();

plugins/samplesource/fcdpro/fcdproinput.cpp

@@ -852,6 +852,9 @@ void FCDProInput::webapiUpdateDeviceSettings(
         const QStringList& deviceSettingsKeys,
         SWGSDRangel::SWGDeviceSettings& response)
 {
+    if (deviceSettingsKeys.contains("title")) {
+        settings.m_title = *response.getFcdProSettings()->getTitle();
+    }
     if (deviceSettingsKeys.contains("centerFrequency")) {
         settings.m_centerFrequency = response.getFcdProSettings()->getCenterFrequency();
     }
@@ -943,6 +946,12 @@ void FCDProInput::webapiUpdateDeviceSettings(
 
 void FCDProInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const FCDProSettings& settings)
 {
+    if (response.getFcdProSettings()->getTitle()) {
+        *response.getFcdProSettings()->getTitle() = settings.m_title;
+    } else {
+        response.getFcdProSettings()->setTitle(new QString(settings.m_title));
+    }
+
     response.getFcdProSettings()->setCenterFrequency(settings.m_centerFrequency);
     response.getFcdProSettings()->setLOppmTenths(settings.m_LOppmTenths);
     response.getFcdProSettings()->setLnaGainIndex(settings.m_lnaGainIndex);
@@ -992,6 +1001,9 @@ void FCDProInput::webapiReverseSendSettings(const QList<QString>& deviceSettings
 
     // transfer data that has been modified. When force is on transfer all data except reverse API data
 
+    if (deviceSettingsKeys.contains("title") || force) {
+        swgFCDProSettings->setTitle(new QString(settings.m_title));
+    }
     if (deviceSettingsKeys.contains("centerFrequency") || force) {
         swgFCDProSettings->setCenterFrequency(settings.m_centerFrequency);
     }

plugins/samplesource/fcdpro/fcdprosettings.cpp

@@ -26,6 +26,7 @@ FCDProSettings::FCDProSettings()
 
 void FCDProSettings::resetToDefaults()
 {
+    m_title = "FCDPro";
 	m_centerFrequency = 435000 * 1000;
 	m_dcBlock = false;
 	m_iqCorrection = false;
@@ -89,6 +90,7 @@ QByteArray FCDProSettings::serialize() const
     s.writeU32(26, m_reverseAPIPort);
     s.writeU32(27, m_reverseAPIDeviceIndex);
     s.writeBool(28, m_iqOrder);
+    s.writeString(29, m_title);
 
 	return s.final();
 }
@@ -145,6 +147,7 @@ bool FCDProSettings::deserialize(const QByteArray& data)
         d.readU32(27, &uintval, 0);
         m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
         d.readBool(28, &m_iqOrder, true);
+        d.readString(29, &m_title, "FCDPro");
 
 		return true;
 	}
@@ -157,6 +160,9 @@ bool FCDProSettings::deserialize(const QByteArray& data)
 
 void FCDProSettings::applySettings(const QStringList& settingsKeys, const FCDProSettings& settings)
 {
+    if (settingsKeys.contains("title")) {
+        m_title = settings.m_title;
+    }
     if (settingsKeys.contains("centerFrequency")) {
         m_centerFrequency = settings.m_centerFrequency;
     }
@@ -250,6 +256,9 @@ QString FCDProSettings::getDebugString(const QStringList& settingsKeys, bool for
 {
     std::ostringstream ostr;
 
+    if (settingsKeys.contains("title") || force) {
+        ostr << " m_title: " << m_title.toStdString();
+    }
     if (settingsKeys.contains("centerFrequency") || force) {
         ostr << " m_centerFrequency: " << m_centerFrequency;
     }

plugins/samplesource/fcdpro/fcdprosettings.h

@@ -30,6 +30,7 @@ struct FCDProSettings {
 		FC_POS_CENTER
 	} fcPos_t;
 
+	QString m_title;
 	quint64 m_centerFrequency;
 	qint32 m_LOppmTenths;
 	qint32 m_lnaGainIndex;