diff --git a/plugins/feature/afc/afcgui.cpp b/plugins/feature/afc/afcgui.cpp
index e6e4d606c..a5924e9ea 100644
--- a/plugins/feature/afc/afcgui.cpp
+++ b/plugins/feature/afc/afcgui.cpp
@@ -274,6 +274,7 @@ void AFCGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -285,7 +286,7 @@ void AFCGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/ais/aisgui.cpp b/plugins/feature/ais/aisgui.cpp
index 5bbdd19d8..79a6656cc 100644
--- a/plugins/feature/ais/aisgui.cpp
+++ b/plugins/feature/ais/aisgui.cpp
@@ -276,6 +276,7 @@ void AISGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -287,7 +288,7 @@ void AISGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/antennatools/antennatoolsgui.cpp b/plugins/feature/antennatools/antennatoolsgui.cpp
index add2c2cec..b1e55847f 100644
--- a/plugins/feature/antennatools/antennatoolsgui.cpp
+++ b/plugins/feature/antennatools/antennatoolsgui.cpp
@@ -209,6 +209,7 @@ void AntennaToolsGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -220,7 +221,7 @@ void AntennaToolsGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/aprs/aprsgui.cpp b/plugins/feature/aprs/aprsgui.cpp
index 2c4430d05..f83e50f60 100644
--- a/plugins/feature/aprs/aprsgui.cpp
+++ b/plugins/feature/aprs/aprsgui.cpp
@@ -688,6 +688,7 @@ void APRSGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -699,7 +700,7 @@ void APRSGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/demodanalyzer/demodanalyzergui.cpp b/plugins/feature/demodanalyzer/demodanalyzergui.cpp
index 7846641bd..0fefd371e 100644
--- a/plugins/feature/demodanalyzer/demodanalyzergui.cpp
+++ b/plugins/feature/demodanalyzer/demodanalyzergui.cpp
@@ -258,6 +258,7 @@ void DemodAnalyzerGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -269,7 +270,7 @@ void DemodAnalyzerGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/gs232controller/gs232controllergui.cpp b/plugins/feature/gs232controller/gs232controllergui.cpp
index a7aebbdb5..e777ee052 100644
--- a/plugins/feature/gs232controller/gs232controllergui.cpp
+++ b/plugins/feature/gs232controller/gs232controllergui.cpp
@@ -303,6 +303,7 @@ void GS232ControllerGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -314,7 +315,7 @@ void GS232ControllerGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp b/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp
index 9757e4919..3db3ca647 100644
--- a/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp
+++ b/plugins/feature/jogdialcontroller/jogdialcontrollergui.cpp
@@ -248,6 +248,7 @@ void JogdialControllerGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -259,7 +260,7 @@ void JogdialControllerGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/map/mapgui.cpp b/plugins/feature/map/mapgui.cpp
index fb4e1cce9..41fdfa947 100644
--- a/plugins/feature/map/mapgui.cpp
+++ b/plugins/feature/map/mapgui.cpp
@@ -882,6 +882,7 @@ void MapGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -893,7 +894,7 @@ void MapGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/pertester/pertestergui.cpp b/plugins/feature/pertester/pertestergui.cpp
index 87f22b3a7..55e9be8d6 100644
--- a/plugins/feature/pertester/pertestergui.cpp
+++ b/plugins/feature/pertester/pertestergui.cpp
@@ -200,6 +200,7 @@ void PERTesterGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -211,7 +212,7 @@ void PERTesterGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/radiosonde/radiosondegui.cpp b/plugins/feature/radiosonde/radiosondegui.cpp
index 235bd15d4..ba68f6b28 100644
--- a/plugins/feature/radiosonde/radiosondegui.cpp
+++ b/plugins/feature/radiosonde/radiosondegui.cpp
@@ -241,6 +241,7 @@ void RadiosondeGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -252,7 +253,7 @@ void RadiosondeGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/rigctlserver/rigctlservergui.cpp b/plugins/feature/rigctlserver/rigctlservergui.cpp
index 0ba6772b7..352a36076 100644
--- a/plugins/feature/rigctlserver/rigctlservergui.cpp
+++ b/plugins/feature/rigctlserver/rigctlservergui.cpp
@@ -287,6 +287,7 @@ void RigCtlServerGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -298,7 +299,7 @@ void RigCtlServerGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/satellitetracker/satellitetrackergui.cpp b/plugins/feature/satellitetracker/satellitetrackergui.cpp
index 3a84b41ab..fa0c4418f 100644
--- a/plugins/feature/satellitetracker/satellitetrackergui.cpp
+++ b/plugins/feature/satellitetracker/satellitetrackergui.cpp
@@ -362,6 +362,7 @@ void SatelliteTrackerGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -373,7 +374,7 @@ void SatelliteTrackerGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/simpleptt/simplepttgui.cpp b/plugins/feature/simpleptt/simplepttgui.cpp
index e92a2c7b4..163094290 100644
--- a/plugins/feature/simpleptt/simplepttgui.cpp
+++ b/plugins/feature/simpleptt/simplepttgui.cpp
@@ -307,6 +307,7 @@ void SimplePTTGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -318,7 +319,7 @@ void SimplePTTGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/startracker/startrackergui.cpp b/plugins/feature/startracker/startrackergui.cpp
index 243bb41c4..33db89876 100644
--- a/plugins/feature/startracker/startrackergui.cpp
+++ b/plugins/feature/startracker/startrackergui.cpp
@@ -470,6 +470,7 @@ void StarTrackerGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -481,7 +482,7 @@ void StarTrackerGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/plugins/feature/vorlocalizer/vorlocalizergui.cpp b/plugins/feature/vorlocalizer/vorlocalizergui.cpp
index 16f2948bb..63648aa2e 100644
--- a/plugins/feature/vorlocalizer/vorlocalizergui.cpp
+++ b/plugins/feature/vorlocalizer/vorlocalizergui.cpp
@@ -1189,6 +1189,7 @@ void VORLocalizerGUI::onMenuDialogCalled(const QPoint &p)
dialog.setReverseAPIPort(m_settings.m_reverseAPIPort);
dialog.setReverseAPIFeatureSetIndex(m_settings.m_reverseAPIFeatureSetIndex);
dialog.setReverseAPIFeatureIndex(m_settings.m_reverseAPIFeatureIndex);
+ dialog.setDefaultTitle(m_displayedName);
dialog.move(p);
dialog.exec();
@@ -1200,7 +1201,7 @@ void VORLocalizerGUI::onMenuDialogCalled(const QPoint &p)
m_settings.m_reverseAPIFeatureSetIndex = dialog.getReverseAPIFeatureSetIndex();
m_settings.m_reverseAPIFeatureIndex = dialog.getReverseAPIFeatureIndex();
- setWindowTitle(m_settings.m_title);
+ setTitle(m_settings.m_title);
setTitleColor(m_settings.m_rgbColor);
applySettings();
diff --git a/sdrgui/channel/channelgui.cpp b/sdrgui/channel/channelgui.cpp
index f04055bcc..63297c098 100644
--- a/sdrgui/channel/channelgui.cpp
+++ b/sdrgui/channel/channelgui.cpp
@@ -72,7 +72,7 @@ ChannelGUI::ChannelGUI(QWidget *parent) :
m_moveButton->setFixedSize(20, 20);
QIcon moveIcon(":/exit.png");
m_moveButton->setIcon(moveIcon);
- m_moveButton->setToolTip("Move to workspace");
+ m_moveButton->setToolTip("Move to another workspace");
m_shrinkButton = new QPushButton();
m_shrinkButton->setFixedSize(20, 20);
@@ -329,7 +329,7 @@ void ChannelGUI::setDisplayedame(const QString& name)
m_displayedName = name;
}
-void ChannelGUI::setToolTip(const QString& tooltip)
+void ChannelGUI::setIndexToolTip(const QString& tooltip)
{
m_indexLabel->setToolTip(tr("%1 / %2").arg(tooltip).arg(m_displayedName));
}
diff --git a/sdrgui/channel/channelgui.h b/sdrgui/channel/channelgui.h
index 049bd21d3..a933ac339 100644
--- a/sdrgui/channel/channelgui.h
+++ b/sdrgui/channel/channelgui.h
@@ -78,7 +78,7 @@ public:
void setDeviceType(DeviceType type);
void setDisplayedame(const QString& name);
DeviceType getDeviceType() const { return m_deviceType; }
- void setToolTip(const QString& tooltip);
+ void setIndexToolTip(const QString& tooltip);
void setIndex(int index);
int getIndex() const { return m_channelIndex; }
void setDeviceSetIndex(int index);
diff --git a/sdrgui/device/devicegui.cpp b/sdrgui/device/devicegui.cpp
index 231ee3a4f..6bcb2c671 100644
--- a/sdrgui/device/devicegui.cpp
+++ b/sdrgui/device/devicegui.cpp
@@ -94,7 +94,7 @@ DeviceGUI::DeviceGUI(QWidget *parent) :
m_moveButton->setFixedSize(20, 20);
QIcon moveIcon(":/exit.png");
m_moveButton->setIcon(moveIcon);
- m_moveButton->setToolTip("Move to workspace");
+ m_moveButton->setToolTip("Move to another workspace");
m_shrinkButton = new QPushButton();
m_shrinkButton->setFixedSize(20, 20);
diff --git a/sdrgui/device/deviceuiset.cpp b/sdrgui/device/deviceuiset.cpp
index 6714974cc..7ca335251 100644
--- a/sdrgui/device/deviceuiset.cpp
+++ b/sdrgui/device/deviceuiset.cpp
@@ -338,7 +338,7 @@ void DeviceUISet::loadRxChannelSettings(const Preset *preset, PluginAPI *pluginA
rxChannelGUI->setDeviceType(ChannelGUI::DeviceRx);
rxChannelGUI->setDeviceSetIndex(m_deviceSetIndex);
rxChannelGUI->setIndex(channelAPI->getIndexInDeviceSet());
- rxChannelGUI->setToolTip(m_deviceAPI->getSamplingDeviceDisplayName());
+ rxChannelGUI->setIndexToolTip(m_deviceAPI->getSamplingDeviceDisplayName());
QObject::connect(
rxChannelGUI,
@@ -466,7 +466,7 @@ void DeviceUISet::loadTxChannelSettings(const Preset *preset, PluginAPI *pluginA
txChannelGUI->setDeviceType(ChannelGUI::DeviceRx);
txChannelGUI->setDeviceSetIndex(m_deviceSetIndex);
txChannelGUI->setIndex(channelAPI->getIndexInDeviceSet());
- txChannelGUI->setToolTip(m_deviceAPI->getSamplingDeviceDisplayName());
+ txChannelGUI->setIndexToolTip(m_deviceAPI->getSamplingDeviceDisplayName());
QObject::connect(
txChannelGUI,
@@ -639,7 +639,7 @@ void DeviceUISet::loadMIMOChannelSettings(const Preset *preset, PluginAPI *plugi
channelGUI->setDeviceType(ChannelGUI::DeviceRx);
channelGUI->setDeviceSetIndex(m_deviceSetIndex);
channelGUI->setIndex(channelAPI->getIndexInDeviceSet());
- channelGUI->setToolTip(m_deviceAPI->getSamplingDeviceDisplayName());
+ channelGUI->setIndexToolTip(m_deviceAPI->getSamplingDeviceDisplayName());
QObject::connect(
channelGUI,
diff --git a/sdrgui/feature/featuregui.cpp b/sdrgui/feature/featuregui.cpp
index b9ff810e7..b4d587b8e 100644
--- a/sdrgui/feature/featuregui.cpp
+++ b/sdrgui/feature/featuregui.cpp
@@ -67,7 +67,7 @@ FeatureGUI::FeatureGUI(QWidget *parent) :
m_moveButton->setFixedSize(20, 20);
QIcon moveIcon(":/exit.png");
m_moveButton->setIcon(moveIcon);
- m_moveButton->setToolTip("Move to workspace");
+ m_moveButton->setToolTip("Move to another workspace");
m_shrinkButton = new QPushButton();
m_shrinkButton->setFixedSize(20, 20);
@@ -260,3 +260,8 @@ void FeatureGUI::setIndex(int index)
m_indexLabel->setText(tr("F:%1").arg(m_featureIndex));
}
+void FeatureGUI::setDisplayedame(const QString& name)
+{
+ m_displayedName = name;
+ m_indexLabel->setToolTip(tr("%1").arg(m_displayedName));
+}
diff --git a/sdrgui/feature/featuregui.h b/sdrgui/feature/featuregui.h
index ca92b4209..1c7f3e894 100644
--- a/sdrgui/feature/featuregui.h
+++ b/sdrgui/feature/featuregui.h
@@ -39,8 +39,7 @@ public:
enum ContextMenuType
{
ContextMenuNone,
- ContextMenuChannelSettings,
- ContextMenuStreamSettings
+ ContextMenuChannelSettings
};
FeatureGUI(QWidget *parent = nullptr);
@@ -63,6 +62,7 @@ public:
void setTitle(const QString& title);
void setIndex(int index);
int getIndex() const { return m_featureIndex; }
+ void setDisplayedame(const QString& name);
protected:
void closeEvent(QCloseEvent *event);
@@ -74,6 +74,7 @@ protected:
QString m_helpURL;
RollupContents m_rollupContents;
ContextMenuType m_contextMenuType;
+ QString m_displayedName;
protected slots:
void shrinkWindow();
diff --git a/sdrgui/feature/featureuiset.cpp b/sdrgui/feature/featureuiset.cpp
index 54a290ec2..0667053c3 100644
--- a/sdrgui/feature/featureuiset.cpp
+++ b/sdrgui/feature/featureuiset.cpp
@@ -178,9 +178,11 @@ void FeatureUISet::loadFeatureSetSettings(
qPrintable((*featureRegistrations)[i].m_featureIdURI),
qPrintable(featureConfig.m_featureIdURI)
);
- feature = (*featureRegistrations)[i].m_plugin->createFeature(apiAdapter);
- featureGUI = (*featureRegistrations)[i].m_plugin->createFeatureGUI(this, feature);
+ PluginInterface *pluginInterface = (*featureRegistrations)[i].m_plugin;
+ feature = pluginInterface->createFeature(apiAdapter);
+ featureGUI = pluginInterface->createFeatureGUI(this, feature);
registerFeatureInstance(featureGUI, feature);
+ featureGUI->setDisplayedame(pluginInterface->getPluginDescriptor().displayedName);
break;
}
}
diff --git a/sdrgui/gui/basicfeaturesettingsdialog.cpp b/sdrgui/gui/basicfeaturesettingsdialog.cpp
index f7695af78..8ff5b51d6 100644
--- a/sdrgui/gui/basicfeaturesettingsdialog.cpp
+++ b/sdrgui/gui/basicfeaturesettingsdialog.cpp
@@ -25,6 +25,12 @@ void BasicFeatureSettingsDialog::setTitle(const QString& title)
ui->title->blockSignals(false);
}
+void BasicFeatureSettingsDialog::on_titleReset_clicked()
+{
+ ui->title->setText(m_defaultTitle);
+ m_title = ui->title->text();
+}
+
void BasicFeatureSettingsDialog::on_title_editingFinished()
{
m_title = ui->title->text();
diff --git a/sdrgui/gui/basicfeaturesettingsdialog.h b/sdrgui/gui/basicfeaturesettingsdialog.h
index 4891212e0..20617ef3c 100644
--- a/sdrgui/gui/basicfeaturesettingsdialog.h
+++ b/sdrgui/gui/basicfeaturesettingsdialog.h
@@ -45,10 +45,12 @@ public:
void setReverseAPIPort(uint16_t port);
void setReverseAPIFeatureSetIndex(uint16_t featureSetIndex);
void setReverseAPIFeatureIndex(uint16_t featureIndex);
+ void setDefaultTitle(const QString& title) { m_defaultTitle = title; }
bool hasChanged() const { return m_hasChanged; }
private slots:
void on_title_editingFinished();
+ void on_titleReset_clicked();
void on_reverseAPI_toggled(bool checked);
void on_reverseAPIAddress_editingFinished();
void on_reverseAPIPort_editingFinished();
@@ -64,6 +66,7 @@ private:
uint16_t m_reverseAPIPort;
uint16_t m_reverseAPIFeatureSetIndex;
uint16_t m_reverseAPIFeatureIndex;
+ QString m_defaultTitle;
bool m_hasChanged;
};
diff --git a/sdrgui/gui/basicfeaturesettingsdialog.ui b/sdrgui/gui/basicfeaturesettingsdialog.ui
index 0e72cd7fc..99349f362 100644
--- a/sdrgui/gui/basicfeaturesettingsdialog.ui
+++ b/sdrgui/gui/basicfeaturesettingsdialog.ui
@@ -48,6 +48,26 @@
+ -
+
+
+
+ 24
+ 24
+
+
+
+ Reset title to feature type name
+
+
+
+
+
+
+ :/recycle.png:/recycle.png
+
+
+
-
@@ -192,7 +212,9 @@
-
+
+
+
buttonBox
diff --git a/sdrgui/mainspectrum/mainspectrumgui.cpp b/sdrgui/mainspectrum/mainspectrumgui.cpp
index ef98a195a..a4d082977 100644
--- a/sdrgui/mainspectrum/mainspectrumgui.cpp
+++ b/sdrgui/mainspectrum/mainspectrumgui.cpp
@@ -67,7 +67,7 @@ MainSpectrumGUI::MainSpectrumGUI(GLSpectrum *spectrum, GLSpectrumGUI *spectrumGU
m_moveButton->setFixedSize(20, 20);
QIcon moveIcon(":/exit.png");
m_moveButton->setIcon(moveIcon);
- m_moveButton->setToolTip("Move to workspace");
+ m_moveButton->setToolTip("Move to another workspace");
m_shrinkButton = new QPushButton();
m_shrinkButton->setFixedSize(20, 20);
diff --git a/sdrgui/mainwindow.cpp b/sdrgui/mainwindow.cpp
index 16057c890..93abdaa1c 100644
--- a/sdrgui/mainwindow.cpp
+++ b/sdrgui/mainwindow.cpp
@@ -2153,7 +2153,7 @@ void MainWindow::channelMoveToDeviceSet(ChannelGUI *gui, int dsIndexDestination)
gui->setIndex(channelAPI->getIndexInDeviceSet());
gui->setDeviceSetIndex(dsIndexDestination);
DeviceAPI *destDeviceAPI = destDeviceUI->m_deviceAPI;
- gui->setToolTip(destDeviceAPI->getSamplingDeviceDisplayName());
+ gui->setIndexToolTip(destDeviceAPI->getSamplingDeviceDisplayName());
channelAPI->setDeviceAPI(destDeviceAPI);
deviceUI->removeChannelMarker(&gui->getChannelMarker());
destDeviceUI->addChannelMarker(&gui->getChannelMarker());
@@ -2338,7 +2338,7 @@ void MainWindow::channelDuplicateToDeviceSet(ChannelGUI *sourceChannelGUI, int d
);
destChannelGUI->setDeviceSetIndex(dsIndexDestination);
- destChannelGUI->setToolTip(destDeviceAPI->getSamplingDeviceDisplayName());
+ destChannelGUI->setIndexToolTip(destDeviceAPI->getSamplingDeviceDisplayName());
destChannelGUI->setWorkspaceIndex(workspace->getIndex());
qDebug("MainWindow::channelDuplicate: adding %s to workspace #%d",
qPrintable(destChannelGUI->getTitle()), workspace->getIndex());
@@ -2451,7 +2451,7 @@ void MainWindow::channelAddClicked(Workspace *workspace, int deviceSetIndex, int
);
gui->setDeviceSetIndex(deviceSetIndex);
- gui->setToolTip(deviceAPI->getSamplingDeviceDisplayName());
+ gui->setIndexToolTip(deviceAPI->getSamplingDeviceDisplayName());
gui->setWorkspaceIndex(workspace->getIndex());
qDebug("MainWindow::channelAddClicked: adding %s to workspace #%d",
qPrintable(gui->getTitle()), workspace->getIndex());
@@ -2475,6 +2475,7 @@ void MainWindow::featureAddClicked(Workspace *workspace, int featureIndex)
featureUISet->registerFeatureInstance(gui, feature);
gui->setIndex(feature->getIndexInFeatureSet());
gui->setWorkspaceIndex(workspace->getIndex());
+ gui->setDisplayedame(pluginInterface->getPluginDescriptor().displayedName);
workspace->addToMdiArea((QMdiSubWindow*) gui);
QObject::connect(