when adding new container in form designer, preselect the current gro…

…up as parent (#35332)
qgis · Mar 25, 2020 · e697b7f · e697b7f
1 parent b1d50c2
commit e697b7f
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/src/gui/qgsaddtaborgroup.cpp b/src/gui/qgsaddtaborgroup.cpp
@@ -25,7 +25,7 @@
 #include <QComboBox>
 #include <QRadioButton>
 
-QgsAddTabOrGroup::QgsAddTabOrGroup( QgsVectorLayer *lyr, const QList < TabPair > &tabList, QWidget *parent )
+QgsAddTabOrGroup::QgsAddTabOrGroup( QgsVectorLayer *lyr, const QList < TabPair > &tabList, QTreeWidgetItem *currentTab, QWidget *parent )
   : QDialog( parent )
   , mLayer( lyr )
   , mTabs( tabList )
@@ -43,6 +43,11 @@ QgsAddTabOrGroup::QgsAddTabOrGroup( QgsVectorLayer *lyr, const QList < TabPair >
     for ( const TabPair &tab : constMTabs )
     {
       mTabList->addItem( tab.first, i );
+      if ( tab.second == currentTab )
+      {
+        mTabList->setCurrentIndex( i );
+        mGroupButton->setChecked( true );
+      }
       ++i;
     }
   }

diff --git a/src/gui/qgsaddtaborgroup.h b/src/gui/qgsaddtaborgroup.h
@@ -46,7 +46,7 @@ class GUI_EXPORT QgsAddTabOrGroup : public QDialog, private Ui::QgsAddTabOrGroup
 
   public:
     //! constructor
-    QgsAddTabOrGroup( QgsVectorLayer *lyr, const QList<TabPair> &tabList, QWidget *parent = nullptr );
+    QgsAddTabOrGroup( QgsVectorLayer *lyr, const QList<TabPair> &tabList, QTreeWidgetItem *currentTab = nullptr, QWidget *parent = nullptr );
 
     //! Returns the name of the tab or group
     QString name();

diff --git a/src/gui/vector/qgsattributesformproperties.cpp b/src/gui/vector/qgsattributesformproperties.cpp
@@ -658,7 +658,8 @@ void QgsAttributesFormProperties::addTabOrGroupButton()
       tabList.append( QgsAddTabOrGroup::TabPair( itemData.name(), *it ) );
     }
   }
-  QgsAddTabOrGroup addTabOrGroup( mLayer, tabList, this );
+  QTreeWidgetItem *currentItem = mFormLayoutTree->selectedItems().at( 0 );
+  QgsAddTabOrGroup addTabOrGroup( mLayer, tabList, currentItem, this );
 
   if ( !addTabOrGroup.exec() )
     return;