Browse Source

Keep collapsed state when a group is renamed, forget it when deleted

Renaming a collapsed preset or configuration group lost its collapsed
state and left a stale entry under the old name. Deleting a group left a
stale entry too.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
chirpmodem-v8.0.0
3ProFilm 1 month ago
parent
commit
8e254de647
  1. 21
      sdrgui/gui/configurationsdialog.cpp
  2. 2
      sdrgui/gui/configurationsdialog.h
  3. 21
      sdrgui/gui/devicesetpresetsdialog.cpp
  4. 2
      sdrgui/gui/devicesetpresetsdialog.h

21
sdrgui/gui/configurationsdialog.cpp

@ -249,6 +249,7 @@ void ConfigurationsDialog::on_configurationEdit_clicked() @@ -249,6 +249,7 @@ void ConfigurationsDialog::on_configurationEdit_clicked()
if (dlg.exec() == QDialog::Accepted)
{
renameCollapsedGroup(item->text(0), dlg.group());
renameConfigurationGroup(item->text(0), dlg.group());
newGroupName = dlg.group();
change = true;
@ -329,6 +330,7 @@ void ConfigurationsDialog::on_configurationDelete_clicked() @@ -329,6 +330,7 @@ void ConfigurationsDialog::on_configurationDelete_clicked()
) == QMessageBox::Yes
)
{
forgetCollapsedGroup(item->text(0));
deleteConfigurationGroup(item->text(0));
ui->configurationsTree->clear();
@ -495,6 +497,25 @@ void ConfigurationsDialog::saveCollapsedGroups() @@ -495,6 +497,25 @@ void ConfigurationsDialog::saveCollapsedGroups()
settings.setValue("configurations.collapsed_groups", m_collapsedGroups);
}
void ConfigurationsDialog::renameCollapsedGroup(const QString& oldGroupName, const QString& newGroupName)
{
if (m_collapsedGroups.removeAll(oldGroupName) > 0)
{
if (!m_collapsedGroups.contains(newGroupName)) {
m_collapsedGroups.append(newGroupName);
}
saveCollapsedGroups();
}
}
void ConfigurationsDialog::forgetCollapsedGroup(const QString& groupName)
{
if (m_collapsedGroups.removeAll(groupName) > 0) {
saveCollapsedGroups();
}
}
Configuration* ConfigurationsDialog::newConfiguration(const QString& group, const QString& description)
{
Configuration* configuration = new Configuration();

2
sdrgui/gui/configurationsdialog.h

@ -57,6 +57,8 @@ private: @@ -57,6 +57,8 @@ private:
QTreeWidgetItem* addConfigurationToTree(const Configuration* configuration);
void updateConfigurationControls();
void saveCollapsedGroups();
void renameCollapsedGroup(const QString& oldGroupName, const QString& newGroupName);
void forgetCollapsedGroup(const QString& groupName);
Configuration* newConfiguration(const QString& group, const QString& description);
void addConfiguration(Configuration *configuration);
void sortConfigurations();

21
sdrgui/gui/devicesetpresetsdialog.cpp

@ -248,6 +248,7 @@ void DeviceSetPresetsDialog::on_presetEdit_clicked() @@ -248,6 +248,7 @@ void DeviceSetPresetsDialog::on_presetEdit_clicked()
if (dlg.exec() == QDialog::Accepted)
{
renameCollapsedGroup(item->text(0), dlg.group());
MainCore::instance()->m_settings.renamePresetGroup(item->text(0), dlg.group());
newGroupName = dlg.group();
change = true;
@ -441,6 +442,7 @@ void DeviceSetPresetsDialog::on_presetDelete_clicked() @@ -441,6 +442,7 @@ void DeviceSetPresetsDialog::on_presetDelete_clicked()
QMessageBox::No | QMessageBox::Yes, QMessageBox::No) == QMessageBox::Yes
)
{
forgetCollapsedGroup(item->text(0));
MainCore::instance()->m_settings.deletePresetGroup(item->text(0));
ui->presetTree->clear();
@ -489,6 +491,25 @@ void DeviceSetPresetsDialog::saveCollapsedGroups() @@ -489,6 +491,25 @@ void DeviceSetPresetsDialog::saveCollapsedGroups()
settings.setValue("presets.collapsed_groups", m_collapsedGroups);
}
void DeviceSetPresetsDialog::renameCollapsedGroup(const QString& oldGroupName, const QString& newGroupName)
{
if (m_collapsedGroups.removeAll(oldGroupName) > 0)
{
if (!m_collapsedGroups.contains(newGroupName)) {
m_collapsedGroups.append(newGroupName);
}
saveCollapsedGroups();
}
}
void DeviceSetPresetsDialog::forgetCollapsedGroup(const QString& groupName)
{
if (m_collapsedGroups.removeAll(groupName) > 0) {
saveCollapsedGroups();
}
}
void DeviceSetPresetsDialog::loadDeviceSetPresetSettings(const Preset* preset)
{
qDebug("DeviceSetPresetsDialog::loadPresetSettings: preset [%s | %s]",

2
sdrgui/gui/devicesetpresetsdialog.h

@ -66,6 +66,8 @@ private: @@ -66,6 +66,8 @@ private:
void updatePresetControls();
void loadDeviceSetPresetSettings(const Preset* preset);
void saveCollapsedGroups();
void renameCollapsedGroup(const QString& oldGroupName, const QString& newGroupName);
void forgetCollapsedGroup(const QString& groupName);
private slots:
void on_presetSave_clicked();

Loading…
Cancel
Save