mirror of
https://github.com/f4exb/sdrangel.git
synced 2024-11-25 17:28:50 -05:00
Massive UI revamping (v7): feature window basic feature settings dialog: implemented reset to default title. Some cosmetic changes
This commit is contained in:
parent
e8a2c8b947
commit
560d61abcb
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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();
|
||||
|
@ -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));
|
||||
}
|
||||
|
@ -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);
|
||||
|
@ -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);
|
||||
|
@ -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,
|
||||
|
@ -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));
|
||||
}
|
||||
|
@ -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();
|
||||
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
@ -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();
|
||||
|
@ -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;
|
||||
};
|
||||
|
||||
|
@ -48,6 +48,26 @@
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QPushButton" name="titleReset">
|
||||
<property name="maximumSize">
|
||||
<size>
|
||||
<width>24</width>
|
||||
<height>24</height>
|
||||
</size>
|
||||
</property>
|
||||
<property name="toolTip">
|
||||
<string>Reset title to feature type name</string>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string/>
|
||||
</property>
|
||||
<property name="icon">
|
||||
<iconset resource="../resources/res.qrc">
|
||||
<normaloff>:/recycle.png</normaloff>:/recycle.png</iconset>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</item>
|
||||
<item>
|
||||
@ -192,7 +212,9 @@
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<resources>
|
||||
<include location="../resources/res.qrc"/>
|
||||
</resources>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
|
@ -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);
|
||||
|
@ -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(
|
||||
|
Loading…
Reference in New Issue
Block a user