Only enable non-default presets in presets model and some style impro…

…vements (#755)
ManiVaultStudio · Dec 18, 2024 · b4d6a97 · b4d6a97
1 parent 4c22067
commit b4d6a97
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 17 deletions.
diff --git a/ManiVault/src/actions/PresetsAction.cpp b/ManiVault/src/actions/PresetsAction.cpp
@@ -8,7 +8,6 @@
 #include <QHBoxLayout>
 #include <QHeaderView>
 #include <QMenu>
-#include <QLocale>
 #include <QFileDialog>
 #include <QStringListModel>
 
@@ -18,9 +17,9 @@
 
 namespace mv::gui {
 
-QMap<PresetsAction::Column, QPair<QString, QString>> PresetsAction::columnInfo = QMap<PresetsAction::Column, QPair<QString, QString>>({
-    { PresetsAction::Column::Name, { "Name", "Preset name" }},
-    { PresetsAction::Column::DateTime, { "Date and time", "Date and time when the preset was changed" }}
+QMap<PresetsAction::Column, QPair<QString, QString>> PresetsAction::columnInfo = QMap<Column, QPair<QString, QString>>({
+    { Column::Name, { "Name", "Preset name" }},
+    { Column::DateTime, { "Date and time", "Date and time when the preset was changed" }}
 });
 
 PresetsAction::PresetsAction(QObject* parent, WidgetAction* sourceAction, const QString& settingsKey /*= ""*/, const QString& presetType /*= ""*/, const QIcon& icon /*= QIcon()*/) :
@@ -31,8 +30,7 @@ PresetsAction::PresetsAction(QObject* parent, WidgetAction* sourceAction, const
     _icon(icon),
     _model(this),
     _filterModel(this),
-    _editAction(this, "Edit..."),
-    _presets()
+    _editAction(this, "Edit...")
 {
     Q_ASSERT(_sourceAction != nullptr);
 
@@ -92,7 +90,7 @@ void PresetsAction::loadPresetsFromApplicationSettings()
     updateModel();
 }
 
-void PresetsAction::savePresetsToApplicationSettings()
+void PresetsAction::savePresetsToApplicationSettings() const
 {
 #ifdef PRESETS_ACTION_VERBOSE
     qDebug() << __FUNCTION__;
@@ -351,7 +349,7 @@ void PresetsAction::updateModel()
 
         dateTimeItem->setData(dateTime, Qt::EditRole);
 
-        const auto itemEnabled = true;// presetName != "Default";
+        const auto itemEnabled = presetName != "Default";
 
         nameItem->setEnabled(itemEnabled);
         dateTimeItem->setEnabled(itemEnabled);
@@ -464,11 +462,10 @@ PresetsAction::ChoosePresetNameDialog::ChoosePresetNameDialog(PresetsAction* pre
 
 QSize PresetsAction::ChoosePresetNameDialog::sizeHint() const
 {
-    return QSize(300, 0);
+    return { 300, 0 };
 }
 
 PresetsAction::ManagePresetsDialog::ManagePresetsDialog(PresetsAction* presetsAction) :
-    QDialog(),
     _hierarchyWidget(this, QString("%1 Preset").arg(presetsAction->getPresetType()), presetsAction->getModel(), const_cast<PresetsAction::FilterModel*>(&presetsAction->getFilterModel())),
     _removeAction(this, "Remove"),
     _okAction(this, "Ok")
@@ -507,12 +504,12 @@ PresetsAction::ManagePresetsDialog::ManagePresetsDialog(PresetsAction* presetsAc
 
     treeViewHeader->setStretchLastSection(false);
 
-    treeViewHeader->setSortIndicator(static_cast<int>(PresetsAction::Column::Name), Qt::DescendingOrder);
+    treeViewHeader->setSortIndicator(static_cast<int>(Column::Name), Qt::DescendingOrder);
 
-    treeViewHeader->resizeSection(static_cast<int>(PresetsAction::Column::DateTime), 100);
+    treeViewHeader->resizeSection(static_cast<int>(Column::DateTime), 100);
 
-    treeViewHeader->setSectionResizeMode(static_cast<int>(PresetsAction::Column::Name), QHeaderView::Stretch);
-    treeViewHeader->setSectionResizeMode(static_cast<int>(PresetsAction::Column::DateTime), QHeaderView::Fixed);
+    treeViewHeader->setSectionResizeMode(static_cast<int>(Column::Name), QHeaderView::Stretch);
+    treeViewHeader->setSectionResizeMode(static_cast<int>(Column::DateTime), QHeaderView::Fixed);
 
     _removeAction.setEnabled(false);
 
@@ -537,7 +534,7 @@ PresetsAction::ManagePresetsDialog::ManagePresetsDialog(PresetsAction* presetsAc
         QStringList presetsToRemove;
 
         for (const auto& selectedRow : selectedRows)
-            presetsToRemove << selectedRow.siblingAtColumn(static_cast<int>(PresetsAction::Column::Name)).data().toString();
+            presetsToRemove << selectedRow.siblingAtColumn(static_cast<int>(Column::Name)).data().toString();
 
         presetsAction->removePresets(presetsToRemove);
     });
@@ -547,7 +544,7 @@ PresetsAction::ManagePresetsDialog::ManagePresetsDialog(PresetsAction* presetsAc
 
 QSize PresetsAction::ManagePresetsDialog::sizeHint() const
 {
-    return QSize(480, 480);
+    return { 480, 480 };
 }
 
 }
diff --git a/ManiVault/src/actions/PresetsAction.h b/ManiVault/src/actions/PresetsAction.h
@@ -204,7 +204,7 @@ class CORE_EXPORT PresetsAction final : public WidgetAction
     void loadPresetsFromApplicationSettings();
 
     /** Save presets variant map to application settings */
-    void savePresetsToApplicationSettings();
+    void savePresetsToApplicationSettings() const;
 
     /**
      * Get recent file paths menu

diff --git a/resharper.DotSettings b/resharper.DotSettings
@@ -0,0 +1 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" />
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation" />