Browse Source

Merge pull request #3004 from 3ProFilm/remember-preset-groups

Presets/Configurations dialogs: remember collapsed groups
chirpmodem-v8.0.0
Edouard Griffiths 1 month ago committed by GitHub
parent
commit
b4e1833ed1
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
  1. 65
      sdrgui/gui/configurationsdialog.cpp
  2. 7
      sdrgui/gui/configurationsdialog.h
  3. 54
      sdrgui/gui/devicesetpresetsdialog.cpp
  4. 7
      sdrgui/gui/devicesetpresetsdialog.h

65
sdrgui/gui/configurationsdialog.cpp

@ -19,6 +19,7 @@ @@ -19,6 +19,7 @@
#include <QMessageBox>
#include <QDebug>
#include <QFileDialog>
#include <QSettings>
#include "gui/addpresetdialog.h"
#include "maincore.h"
@ -48,6 +49,9 @@ ConfigurationsDialog::ConfigurationsDialog(bool openOnly, QWidget* parent) : @@ -48,6 +49,9 @@ ConfigurationsDialog::ConfigurationsDialog(bool openOnly, QWidget* parent) :
{
ui->description->setVisible(false);
}
QSettings settings;
m_collapsedGroups = settings.value("configurations.collapsed_groups").toStringList();
}
ConfigurationsDialog::~ConfigurationsDialog()
@ -64,19 +68,23 @@ void ConfigurationsDialog::populateTree() @@ -64,19 +68,23 @@ void ConfigurationsDialog::populateTree()
sortConfigurations();
QList<Configuration*>::const_iterator it = m_configurations->begin();
int middleIndex = m_configurations->size() / 2;
QTreeWidgetItem *treeItem;
QList<QTreeWidgetItem*> treeItems;
ui->configurationsTree->clear();
for (int i = 0; it != m_configurations->end(); ++it, i++)
for (; it != m_configurations->end(); ++it)
{
treeItem = addConfigurationToTree(*it);
QTreeWidgetItem *treeItem = addConfigurationToTree(*it);
if (i == middleIndex) {
ui->configurationsTree->setCurrentItem(treeItem);
// Only select from expanded groups, so selecting doesn't expand a collapsed group
if (treeItem->parent()->isExpanded()) {
treeItems.push_back(treeItem);
}
}
if (treeItems.size() > 0) {
ui->configurationsTree->setCurrentItem(treeItems.at(treeItems.size()/2));
}
updateConfigurationControls();
}
@ -99,7 +107,7 @@ QTreeWidgetItem* ConfigurationsDialog::addConfigurationToTree(const Configuratio @@ -99,7 +107,7 @@ QTreeWidgetItem* ConfigurationsDialog::addConfigurationToTree(const Configuratio
sl.append(configuration->getGroup());
group = new QTreeWidgetItem(ui->configurationsTree, sl, PGroup);
group->setFirstColumnSpanned(true);
group->setExpanded(true);
group->setExpanded(!m_collapsedGroups.contains(configuration->getGroup()));
ui->configurationsTree->sortByColumn(0, Qt::AscendingOrder);
}
@ -241,6 +249,7 @@ void ConfigurationsDialog::on_configurationEdit_clicked() @@ -241,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;
@ -321,6 +330,7 @@ void ConfigurationsDialog::on_configurationDelete_clicked() @@ -321,6 +330,7 @@ void ConfigurationsDialog::on_configurationDelete_clicked()
) == QMessageBox::Yes
)
{
forgetCollapsedGroup(item->text(0));
deleteConfigurationGroup(item->text(0));
ui->configurationsTree->clear();
@ -465,6 +475,47 @@ void ConfigurationsDialog::on_configurationsTree_itemActivated(QTreeWidgetItem * @@ -465,6 +475,47 @@ void ConfigurationsDialog::on_configurationsTree_itemActivated(QTreeWidgetItem *
on_configurationLoad_clicked();
}
void ConfigurationsDialog::on_configurationsTree_itemCollapsed(QTreeWidgetItem *item)
{
if ((item->type() == PGroup) && !m_collapsedGroups.contains(item->text(0)))
{
m_collapsedGroups.append(item->text(0));
saveCollapsedGroups();
}
}
void ConfigurationsDialog::on_configurationsTree_itemExpanded(QTreeWidgetItem *item)
{
if ((item->type() == PGroup) && (m_collapsedGroups.removeAll(item->text(0)) > 0)) {
saveCollapsedGroups();
}
}
void ConfigurationsDialog::saveCollapsedGroups()
{
QSettings settings;
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();

7
sdrgui/gui/configurationsdialog.h

@ -21,6 +21,7 @@ @@ -21,6 +21,7 @@
#include <QDialog>
#include <QList>
#include <QStringList>
#include <QTreeWidgetItem>
#include "export.h"
@ -51,9 +52,13 @@ private: @@ -51,9 +52,13 @@ private:
Ui::ConfigurationsDialog* ui;
QList<Configuration*> *m_configurations;
QStringList m_collapsedGroups; //!< Groups the user collapsed, restored next time the dialog is opened
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();
@ -71,6 +76,8 @@ private slots: @@ -71,6 +76,8 @@ private slots:
void on_configurationLoad_clicked();
void on_configurationsTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void on_configurationsTree_itemActivated(QTreeWidgetItem *item, int column);
void on_configurationsTree_itemCollapsed(QTreeWidgetItem *item);
void on_configurationsTree_itemExpanded(QTreeWidgetItem *item);
void accept() override;
signals:

54
sdrgui/gui/devicesetpresetsdialog.cpp

@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
#include <QMessageBox>
#include <QTextStream>
#include <QFile>
#include <QSettings>
#include "settings/preset.h"
#include "gui/presetitem.h"
@ -41,6 +42,8 @@ DeviceSetPresetsDialog::DeviceSetPresetsDialog(QWidget* parent) : @@ -41,6 +42,8 @@ DeviceSetPresetsDialog::DeviceSetPresetsDialog(QWidget* parent) :
m_presetLoaded(false)
{
ui->setupUi(this);
QSettings settings;
m_collapsedGroups = settings.value("presets.collapsed_groups").toStringList();
}
DeviceSetPresetsDialog::~DeviceSetPresetsDialog()
@ -65,7 +68,11 @@ void DeviceSetPresetsDialog::populateTree(int deviceType) @@ -65,7 +68,11 @@ void DeviceSetPresetsDialog::populateTree(int deviceType)
((*it)->isMIMOPreset() && (deviceType == 2)))
{
QTreeWidgetItem *treeItem = addPresetToTree(*it);
treeItems.push_back(treeItem);
// Only select from expanded groups, so selecting doesn't expand a collapsed group
if (treeItem->parent()->isExpanded()) {
treeItems.push_back(treeItem);
}
}
}
@ -95,7 +102,7 @@ QTreeWidgetItem* DeviceSetPresetsDialog::addPresetToTree(const Preset* preset) @@ -95,7 +102,7 @@ QTreeWidgetItem* DeviceSetPresetsDialog::addPresetToTree(const Preset* preset)
sl.append(preset->getGroup());
group = new QTreeWidgetItem(ui->presetTree, sl, PGroup);
group->setFirstColumnSpanned(true);
group->setExpanded(true);
group->setExpanded(!m_collapsedGroups.contains(preset->getGroup()));
ui->presetTree->sortByColumn(0, Qt::AscendingOrder);
}
@ -241,6 +248,7 @@ void DeviceSetPresetsDialog::on_presetEdit_clicked() @@ -241,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;
@ -434,6 +442,7 @@ void DeviceSetPresetsDialog::on_presetDelete_clicked() @@ -434,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();
@ -460,6 +469,47 @@ void DeviceSetPresetsDialog::on_presetTree_itemActivated(QTreeWidgetItem *item, @@ -460,6 +469,47 @@ void DeviceSetPresetsDialog::on_presetTree_itemActivated(QTreeWidgetItem *item,
on_presetLoad_clicked();
}
void DeviceSetPresetsDialog::on_presetTree_itemCollapsed(QTreeWidgetItem *item)
{
if ((item->type() == PGroup) && !m_collapsedGroups.contains(item->text(0)))
{
m_collapsedGroups.append(item->text(0));
saveCollapsedGroups();
}
}
void DeviceSetPresetsDialog::on_presetTree_itemExpanded(QTreeWidgetItem *item)
{
if ((item->type() == PGroup) && (m_collapsedGroups.removeAll(item->text(0)) > 0)) {
saveCollapsedGroups();
}
}
void DeviceSetPresetsDialog::saveCollapsedGroups()
{
QSettings settings;
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]",

7
sdrgui/gui/devicesetpresetsdialog.h

@ -20,6 +20,7 @@ @@ -20,6 +20,7 @@
#include <QDialog>
#include <QList>
#include <QStringList>
#include "export.h"
@ -59,10 +60,14 @@ private: @@ -59,10 +60,14 @@ private:
Workspace *m_currentWorkspace;
QList<Workspace*> *m_workspaces;
bool m_presetLoaded;
QStringList m_collapsedGroups; //!< Groups the user collapsed, restored next time the dialog is opened
QTreeWidgetItem* addPresetToTree(const Preset* preset);
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();
@ -74,6 +79,8 @@ private slots: @@ -74,6 +79,8 @@ private slots:
void on_presetDelete_clicked();
void on_presetTree_currentItemChanged(QTreeWidgetItem *current, QTreeWidgetItem *previous);
void on_presetTree_itemActivated(QTreeWidgetItem *item, int column);
void on_presetTree_itemCollapsed(QTreeWidgetItem *item);
void on_presetTree_itemExpanded(QTreeWidgetItem *item);
};
#endif // SDRGUI_GUI_DEVICESETPRESETDIALOG_H_

Loading…
Cancel
Save