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

plugins/samplesource/fileinput/fileinput.cpp

@@ -616,6 +616,9 @@ void FileInput::webapiUpdateDeviceSettings(
         const QStringList& deviceSettingsKeys,
         SWGSDRangel::SWGDeviceSettings& response)
 {
+    if (deviceSettingsKeys.contains("title")) {
+        settings.m_title = *response.getFileInputSettings()->getTitle();
+    }
     if (deviceSettingsKeys.contains("fileName")) {
         settings.m_fileName = *response.getFileInputSettings()->getFileName();
     }
@@ -680,6 +683,12 @@ int FileInput::webapiReportGet(
 
 void FileInput::webapiFormatDeviceSettings(SWGSDRangel::SWGDeviceSettings& response, const FileInputSettings& settings)
 {
+    if (response.getFileInputSettings()->getTitle()) {
+        *response.getFileInputSettings()->getTitle() = settings.m_title;
+    } else {
+        response.getFileInputSettings()->setTitle(new QString(settings.m_title));
+    }
+
     response.getFileInputSettings()->setFileName(new QString(settings.m_fileName));
     response.getFileInputSettings()->setAccelerationFactor(settings.m_accelerationFactor);
     response.getFileInputSettings()->setLoop(settings.m_loop ? 1 : 0);

plugins/samplesource/fileinput/fileinputgui.cpp

@@ -31,6 +31,7 @@
 #include "gui/glspectrum.h"
 #include "gui/basicdevicesettingsdialog.h"
 #include "gui/dialogpositioner.h"
+#include "mainspectrum/mainspectrumgui.h"
 #include "dsp/dspcommands.h"
 
 #include "fileinputgui.h"
@@ -229,13 +230,17 @@ void FileInputGUI::updateSampleRateAndFrequency()
 void FileInputGUI::displaySettings()
 {
     blockApplySettings(true);
+    setTitle(m_settings.m_title);
+    m_deviceUISet->m_mainSpectrumGUI->setTitle(m_settings.m_title);
     ui->playLoop->setChecked(m_settings.m_loop);
     ui->acceleration->setCurrentIndex(FileInputSettings::getAccelerationIndex(m_settings.m_accelerationFactor));
+
     if (!m_settings.m_fileName.isEmpty() && (m_settings.m_fileName != ui->fileNameText->text()))
     {
-	ui->crcLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }");
-	configureFileName();
+        ui->crcLabel->setStyleSheet("QLabel { background:rgb(79,79,79); }");
+        configureFileName();
     }
+
     ui->fileNameText->setText(m_settings.m_fileName);
     blockApplySettings(false);
 }
@@ -450,17 +455,30 @@ void FileInputGUI::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);
+            m_deviceUISet->m_mainSpectrumGUI->setTitle(m_settings.m_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();
+            m_settingsKeys.append("title");
+            m_settingsKeys.append("useReverseAPI");
+            m_settingsKeys.append("reverseAPIAddress");
+            m_settingsKeys.append("reverseAPIPort");
+            m_settingsKeys.append("reverseAPIDeviceIndex");
 
-        sendSettings();
+            sendSettings();
+        }
     }
 
     resetContextMenuType();

plugins/samplesource/fileinput/fileinputsettings.cpp

@@ -32,6 +32,7 @@ FileInputSettings::FileInputSettings()
 
 void FileInputSettings::resetToDefaults()
 {
+    m_title = "FileInput";
     m_fileName = "";
     m_accelerationFactor = 1;
     m_loop = true;
@@ -51,6 +52,7 @@ QByteArray FileInputSettings::serialize() const
     s.writeString(5, m_reverseAPIAddress);
     s.writeU32(6, m_reverseAPIPort);
     s.writeU32(7, m_reverseAPIDeviceIndex);
+    s.writeString(8, m_title);
 
     return s.final();
 }
@@ -83,6 +85,7 @@ bool FileInputSettings::deserialize(const QByteArray& data)
 
         d.readU32(7, &uintval, 0);
         m_reverseAPIDeviceIndex = uintval > 99 ? 99 : uintval;
+        d.readString(8, &m_title, "FileInput");
 
         return true;
     }
@@ -148,6 +151,9 @@ int FileInputSettings::getAccelerationValue(int accelerationIndex)
 
 void FileInputSettings::applySettings(const QStringList& settingsKeys, const FileInputSettings& settings)
 {
+    if (settingsKeys.contains("title")) {
+        m_title = settings.m_title;
+    }
     if (settingsKeys.contains("fileName")) {
         m_fileName = settings.m_fileName;
     }
@@ -175,6 +181,9 @@ QString FileInputSettings::getDebugString(const QStringList& settingsKeys, bool
 {
     std::ostringstream ostr;
 
+    if (settingsKeys.contains("title") || force) {
+        ostr << " m_title: " << m_title.toStdString();
+    }
     if (settingsKeys.contains("m_fileName") || force) {
         ostr << " m_fileName: " << m_fileName.toStdString();
     }

plugins/samplesource/fileinput/fileinputsettings.h

@@ -24,6 +24,7 @@
 #include <QByteArray>
 
 struct FileInputSettings {
+    QString m_title;
     QString m_fileName;
     quint32 m_accelerationFactor;
     bool m_loop;