sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-25 00:58:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

when adding new container in form designer, preselect the current group as parent (#35332)

Browse Source
This commit is contained in:
Denis Rouzaud 2020-03-25 11:05:06 +01:00 committed by GitHub
parent b1d50c2116
commit e697b7f062
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/gui/qgsaddtaborgroup.cpp
View File

@ -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;
}
}

2
src/gui/qgsaddtaborgroup.h
View File

@ -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();

3
src/gui/vector/qgsattributesformproperties.cpp
View File

@ -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;