sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-15 00:04:00 -04:00
Code Issues Packages Projects Releases Wiki Activity

Use full height on attribute form with drag and drop layout

Browse Source 
And fix some file permission issues
This commit is contained in:
Matthias Kuhn 2015-06-05 02:44:26 +02:00
parent 316210d622
commit e66dd998d6
3 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
python/gui/qgscolorswatchgrid.sip Executable file → Normal file
View File

0
python/gui/qgscolorwidgets.sip Executable file → Normal file
View File

11
src/gui/qgsattributeform.cpp
View File

@ -387,7 +387,7 @@ void QgsAttributeForm::init()
// Tab layout // Tab layout
if ( !formWidget && mLayer->editorLayout() == QgsVectorLayer::TabLayout ) if ( !formWidget && mLayer->editorLayout() == QgsVectorLayer::TabLayout )
{ {
QTabWidget* tabWidget = new QTabWidget( this ); QTabWidget* tabWidget = new QTabWidget();
layout()->addWidget( tabWidget ); layout()->addWidget( tabWidget );
Q_FOREACH ( QgsAttributeEditorElement *widgDef, mLayer->attributeEditorElements() ) Q_FOREACH ( QgsAttributeEditorElement *widgDef, mLayer->attributeEditorElements() )
@ -395,7 +395,8 @@ void QgsAttributeForm::init()
QWidget* tabPage = new QWidget( tabWidget ); QWidget* tabPage = new QWidget( tabWidget );
tabWidget->addTab( tabPage, widgDef->name() ); tabWidget->addTab( tabPage, widgDef->name() );
QGridLayout *tabPageLayout = new QGridLayout( tabPage ); QGridLayout* tabPageLayout = new QGridLayout();
tabPage->setLayout( tabPageLayout );
if ( widgDef->type() == QgsAttributeEditorElement::AeTypeContainer ) if ( widgDef->type() == QgsAttributeEditorElement::AeTypeContainer )
{ {
@ -645,7 +646,7 @@ QWidget* QgsAttributeForm::createWidgetFromDef( const QgsAttributeEditorElement
newWidget = scrollArea; newWidget = scrollArea;
} }
QGridLayout* gbLayout = new QGridLayout( myContainer ); QGridLayout* gbLayout = new QGridLayout();
myContainer->setLayout( gbLayout ); myContainer->setLayout( gbLayout );
int index = 0; int index = 0;
@ -680,7 +681,9 @@ QWidget* QgsAttributeForm::createWidgetFromDef( const QgsAttributeEditorElement
++index; ++index;
} }
gbLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding ), index, 0 ); QWidget* spacer = new QWidget();
spacer->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Preferred );
gbLayout->addWidget( spacer, index, 0 );
labelText = QString::null; labelText = QString::null;
labelOnTop = true; labelOnTop = true;