Make locator settings persistent

qgis · May 17, 2017 · 7635b44 · 7635b44
1 parent e8d3ae9
commit 7635b44
Show file tree

Hide file tree

Showing 4 changed files with 68 additions and 8 deletions.
diff --git a/src/app/locator/qgslocatoroptionswidget.cpp b/src/app/locator/qgslocatoroptionswidget.cpp
@@ -15,8 +15,8 @@
  *                                                                         *
  ***************************************************************************/
 
-
 #include "qgslocatoroptionswidget.h"
+#include "qgssettings.h"
 
 QgsLocatorOptionsWidget::QgsLocatorOptionsWidget( QgsLocator *locator, QWidget *parent )
   : QWidget( parent )
@@ -31,6 +31,11 @@ QgsLocatorOptionsWidget::QgsLocatorOptionsWidget( QgsLocator *locator, QWidget *
   mFiltersTreeView->header()->setResizeMode( 0, QHeaderView::Stretch );
 }
 
+void QgsLocatorOptionsWidget::commitChanges()
+{
+  mModel->commitChanges();
+}
+
 
 //
 // QgsLocatorFiltersModel
@@ -87,10 +92,20 @@ QVariant QgsLocatorFiltersModel::data( const QModelIndex &index, int role ) cons
           return QVariant();
 
         case Active:
-          return filterForIndex( index )->enabled() ? Qt::Checked : Qt::Unchecked;
+        {
+          QgsLocatorFilter *filter = filterForIndex( index );
+          if ( mEnabledChanges.contains( filter ) )
+            return mEnabledChanges.value( filter ) ? Qt::Checked : Qt::Unchecked;
+          else
+            return filterForIndex( index )->enabled() ? Qt::Checked : Qt::Unchecked;
+        }
 
         case Default:
-          return filterForIndex( index )->useWithoutPrefix() ? Qt::Checked : Qt::Unchecked;
+          QgsLocatorFilter *filter = filterForIndex( index );
+          if ( mDefaultChanges.contains( filter ) )
+            return mDefaultChanges.value( filter ) ? Qt::Checked : Qt::Unchecked;
+          else
+            return filterForIndex( index )->useWithoutPrefix() ? Qt::Checked : Qt::Unchecked;
       }
   }
 
@@ -107,6 +122,7 @@ bool QgsLocatorFiltersModel::setData( const QModelIndex &index, const QVariant &
   {
     case Qt::CheckStateRole:
     {
+      bool checked = static_cast< Qt::CheckState >( value.toInt() ) == Qt::Checked;
       switch ( index.column() )
       {
         case Name:
@@ -115,15 +131,15 @@ bool QgsLocatorFiltersModel::setData( const QModelIndex &index, const QVariant &
 
         case Active:
         {
-          filterForIndex( index )->setEnabled( value.toInt() == Qt::Checked );
-          emit dataChanged( index, index, QVector<int>() << Qt::EditRole << Qt::CheckStateRole );
+          mEnabledChanges.insert( filterForIndex( index ), checked );
+          emit dataChanged( index, index );
           return true;
         }
 
         case Default:
         {
-          filterForIndex( index )->setUseWithoutPrefix( value.toInt() == Qt::Checked );
-          emit dataChanged( index, index, QVector<int>() << Qt::EditRole << Qt::CheckStateRole );
+          mDefaultChanges.insert( filterForIndex( index ), checked );
+          emit dataChanged( index, index );
           return true;
         }
       }
@@ -148,7 +164,6 @@ Qt::ItemFlags QgsLocatorFiltersModel::flags( const QModelIndex &index ) const
     case Active:
     case Default:
       flags = flags | Qt::ItemIsUserCheckable;
-      flags = flags | Qt::ItemIsEditable;
       break;
   }
 
@@ -178,6 +193,26 @@ QVariant QgsLocatorFiltersModel::headerData( int section, Qt::Orientation orient
   return QVariant();
 }
 
+void QgsLocatorFiltersModel::commitChanges()
+{
+  QgsSettings settings;
+
+  QHash< QgsLocatorFilter *, bool >::const_iterator it = mEnabledChanges.constBegin();
+  for ( ; it != mEnabledChanges.constEnd(); ++it )
+  {
+    QgsLocatorFilter *filter = it.key();
+    settings.setValue( QStringLiteral( "locator_filters/enabled_%1" ).arg( filter->name() ), it.value(), QgsSettings::Section::Gui );
+    filter->setEnabled( it.value() );
+  }
+  it = mDefaultChanges.constBegin();
+  for ( ; it != mDefaultChanges.constEnd(); ++it )
+  {
+    QgsLocatorFilter *filter = it.key();
+    settings.setValue( QStringLiteral( "locator_filters/default_%1" ).arg( filter->name() ), it.value(), QgsSettings::Section::Gui );
+    filter->setUseWithoutPrefix( it.value() );
+  }
+}
+
 QgsLocatorFilter *QgsLocatorFiltersModel::filterForIndex( const QModelIndex &index ) const
 {
   return mLocator->filters().at( index.row() + HIDDEN_FILTER_OFFSET );

diff --git a/src/app/locator/qgslocatoroptionswidget.h b/src/app/locator/qgslocatoroptionswidget.h
@@ -32,6 +32,10 @@ class QgsLocatorOptionsWidget : public QWidget, private Ui::QgsLocatorOptionsWid
 
     QgsLocatorOptionsWidget( QgsLocator *locator, QWidget *parent = nullptr );
 
+  public slots:
+
+    void commitChanges();
+
   private:
 
     QgsLocator *mLocator = nullptr;
@@ -77,11 +81,21 @@ class QgsLocatorFiltersModel : public QAbstractTableModel
     Qt::ItemFlags flags( const QModelIndex &index ) const override;
     QVariant headerData( int section, Qt::Orientation orientation,
                          int role = Qt::DisplayRole ) const override;
+
+  public slots:
+
+    void commitChanges();
+
   private:
 
     QgsLocatorFilter *filterForIndex( const QModelIndex &index ) const;
 
     QgsLocator *mLocator = nullptr;
+
+    // changes are defered to support cancelation
+    QHash< QgsLocatorFilter *, bool > mEnabledChanges;
+    QHash< QgsLocatorFilter *, bool > mDefaultChanges;
+
 };
 
 #endif // QGSLOCATOROPTIONSWIDGET_H

diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -1515,6 +1515,8 @@ void QgsOptions::saveOptions()
 
   saveDefaultDatumTransformations();
 
+  mLocatorOptionsWidget->commitChanges();
+
   Q_FOREACH ( QgsOptionsPageWidget *widget, mAdditionalOptionWidgets )
   {
     widget->apply();

diff --git a/src/gui/locator/qgslocator.cpp b/src/gui/locator/qgslocator.cpp
@@ -16,6 +16,7 @@
  ***************************************************************************/
 
 #include "qgslocator.h"
+#include "qgssettings.h"
 #include <QtConcurrent>
 #include <functional>
 
@@ -72,6 +73,14 @@ void QgsLocator::registerFilter( QgsLocatorFilter *filter )
       mPrefixedFilters.insert( filter->prefix(), filter );
     }
   }
+
+  // restore settings
+  QgsSettings settings;
+  bool enabled = settings.value( QStringLiteral( "locator_filters/enabled_%1" ).arg( filter->name() ), true, QgsSettings::Section::Gui ).toBool();
+  bool byDefault = settings.value( QStringLiteral( "locator_filters/default_%1" ).arg( filter->name() ), filter->useWithoutPrefix(), QgsSettings::Section::Gui ).toBool();
+
+  filter->setEnabled( enabled );
+  filter->setUseWithoutPrefix( byDefault );
 }
 
 void QgsLocator::fetchResults( const QString &string, const QgsLocatorContext &context, QgsFeedback *feedback )