apply enableAutoGeometryRestore to config shortcut dialog

qgis · Jan 28, 2018 · 3ca5d72 · 3ca5d72
1 parent bcbc46b
commit 3ca5d72
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 29 deletions.
diff --git a/python/gui/qgsconfigureshortcutsdialog.sip.in b/python/gui/qgsconfigureshortcutsdialog.sip.in
@@ -33,8 +33,6 @@ Constructor for QgsConfigureShortcutsDialog.
 singleton QgsShortcutsManager instance.
 %End
 
-    ~QgsConfigureShortcutsDialog();
-
   protected:
     virtual void keyPressEvent( QKeyEvent *event );
 

diff --git a/src/gui/qgsconfigureshortcutsdialog.cpp b/src/gui/qgsconfigureshortcutsdialog.cpp
@@ -34,6 +34,7 @@ QgsConfigureShortcutsDialog::QgsConfigureShortcutsDialog( QWidget *parent, QgsSh
   , mManager( manager )
 {
   setupUi( this );
+  QgsGui::enableAutoGeometryRestore( this );
   connect( mLeFilter, &QgsFilterLineEdit::textChanged, this, &QgsConfigureShortcutsDialog::mLeFilter_textChanged );
 
   if ( !mManager )
@@ -50,25 +51,6 @@ QgsConfigureShortcutsDialog::QgsConfigureShortcutsDialog( QWidget *parent, QgsSh
            this, &QgsConfigureShortcutsDialog::actionChanged );
 
   populateActions();
-
-  restoreState();
-}
-
-QgsConfigureShortcutsDialog::~QgsConfigureShortcutsDialog()
-{
-  saveState();
-}
-
-void QgsConfigureShortcutsDialog::saveState()
-{
-  QgsSettings settings;
-  settings.setValue( QStringLiteral( "Windows/ShortcutsDialog/geometry" ), saveGeometry() );
-}
-
-void QgsConfigureShortcutsDialog::restoreState()
-{
-  QgsSettings settings;
-  restoreGeometry( settings.value( QStringLiteral( "Windows/ShortcutsDialog/geometry" ) ).toByteArray() );
 }
 
 void QgsConfigureShortcutsDialog::populateActions()

diff --git a/src/gui/qgsconfigureshortcutsdialog.h b/src/gui/qgsconfigureshortcutsdialog.h
@@ -47,8 +47,6 @@ class GUI_EXPORT QgsConfigureShortcutsDialog : public QDialog, private Ui::QgsCo
      */
     QgsConfigureShortcutsDialog( QWidget *parent SIP_TRANSFERTHIS = nullptr, QgsShortcutsManager *manager = nullptr );
 
-    ~QgsConfigureShortcutsDialog() override;
-
   protected:
     void keyPressEvent( QKeyEvent *event ) override;
     void keyReleaseEvent( QKeyEvent *event ) override;
@@ -68,12 +66,6 @@ class GUI_EXPORT QgsConfigureShortcutsDialog : public QDialog, private Ui::QgsCo
 
   private:
 
-    //! Saves the dialog window state
-    void saveState();
-
-    //! Restores the dialog window state
-    void restoreState();
-
     //! Populates the dialog with all actions from the manager
     void populateActions();