create settings trees on start so texts can be searched

qgis · Apr 27, 2023 · 2d28f1e · 2d28f1e
1 parent 83d735f
commit 2d28f1e
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/src/app/options/qgsadvancedoptions.cpp b/src/app/options/qgsadvancedoptions.cpp
@@ -38,15 +38,21 @@ QgsAdvancedSettingsWidget::QgsAdvancedSettingsWidget( QWidget *parent )
   if ( !settingsShowWarning->value() )
   {
     mAdvancedSettingsWarning->hide();
-    mGroupBox->layout()->addWidget( createSettingsTreeWidget() );
+    bool newTree = settingsUseNewTreeWidget->value();
+    createSettingsTreeWidget( newTree, !newTree, false );
   }
   else
   {
+    createSettingsTreeWidget( true, true, true );
+
     connect( mAdvancedSettingsEnableButton, &QPushButton::clicked, this, [ = ]
     {
       settingsUseNewTreeWidget->setValue( mUseNewSettingsTree->isChecked() );
       mAdvancedSettingsWarning->hide();
-      mGroupBox->layout()->addWidget( createSettingsTreeWidget() );
+      if ( settingsUseNewTreeWidget->value() )
+        mTreeWidget->show();
+      else
+        mTreeWidgetOld->show();
     } );
   }
 }
@@ -64,18 +70,23 @@ void QgsAdvancedSettingsWidget::apply()
 
 }
 
-QWidget *QgsAdvancedSettingsWidget::createSettingsTreeWidget()
+void QgsAdvancedSettingsWidget::createSettingsTreeWidget( bool newWidget, bool oldWidget, bool hide )
 {
-  if ( settingsUseNewTreeWidget->value() )
+  if ( newWidget )
   {
     mTreeWidget = new QgsSettingsTreeWidget( this );
-    return mTreeWidget;
+    mGroupBox->layout()->addWidget( mTreeWidget );
+    if ( hide )
+      mTreeWidget->hide();
   }
-  else
+
+  if ( oldWidget )
   {
-    return new QgsSettingsTreeWidgetOld( this );
+    mTreeWidgetOld = new QgsSettingsTreeWidgetOld( this );
+    mGroupBox->layout()->addWidget( mTreeWidgetOld );
+    if ( hide )
+      mTreeWidgetOld->hide();
   }
-
 }
 
 //

diff --git a/src/app/options/qgsadvancedoptions.h b/src/app/options/qgsadvancedoptions.h
@@ -21,6 +21,7 @@
 #include "qgssettingsentryimpl.h"
 
 class QgsSettingsTreeWidget;
+class QgsSettingsTreeWidgetOld;
 
 /**
  * \ingroup app
@@ -48,10 +49,10 @@ class QgsAdvancedSettingsWidget : public QgsOptionsPageWidget, private Ui::QgsAd
     void apply() override;
 
   private:
-
-    QWidget *createSettingsTreeWidget();
+    void createSettingsTreeWidget( bool newWidget, bool oldWidget, bool hide );
 
     QgsSettingsTreeWidget *mTreeWidget = nullptr;
+    QgsSettingsTreeWidgetOld *mTreeWidgetOld = nullptr;
 
 };