Skip to content

Commit

Permalink
Some layout changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@m-kuhn
m-kuhn committed Sep 29, 2017
1 parent d5e0b18 commit 7410fbb
Show file tree
Hide file tree
Showing 2 changed files with 101 additions and 93 deletions.
28 changes: 13 additions & 15 deletions src/app/qgsattributesformproperties.cpp
View file
Expand Up @@ -4,30 +4,28 @@
QgsAttributesFormProperties::QgsAttributesFormProperties( QgsVectorLayer *layer, QWidget *parent ) QgsAttributesFormProperties::QgsAttributesFormProperties( QgsVectorLayer *layer, QWidget *parent )
: QWidget( parent ) : QWidget( parent )
, mLayer( layer ) , mLayer( layer )
, mAvailableWidgetsTree( nullptr )
, mFormLayoutTree( nullptr )
, mAttributeTypeDialog( nullptr )
{ {
if ( !layer ) if ( !layer )
return; return;


setupUi( this ); setupUi( this );


// drag tree (not mixup with drag queen) // available widgets tree
QGridLayout *mDragListWidgetLayout = new QGridLayout; QGridLayout *availableWidgetsWidgetLayout = new QGridLayout;
mAvailableWidgetsTree = new DnDTree( mLayer, mDragListWidget ); mAvailableWidgetsTree = new DnDTree( mLayer );
mDragListWidgetLayout->addWidget( mAvailableWidgetsTree ); availableWidgetsWidgetLayout->addWidget( mAvailableWidgetsTree );
mDragListWidget->setLayout( mDragListWidgetLayout ); availableWidgetsWidgetLayout->setMargin( 0 );
mAvailableWidgetsWidget->setLayout( availableWidgetsWidgetLayout );
mAvailableWidgetsTree->setHeaderLabels( QStringList() << tr( "Available Widgets" ) ); mAvailableWidgetsTree->setHeaderLabels( QStringList() << tr( "Available Widgets" ) );
mAvailableWidgetsTree->setType( DnDTree::Type::Drag ); mAvailableWidgetsTree->setType( DnDTree::Type::Drag );


// drop tree // form layout tree
QGridLayout *mDropListWidgetLayout = new QGridLayout; QGridLayout *formLayoutWidgetLayout = new QGridLayout;
mFormLayoutTree = new DnDTree( mLayer, mDropListWidget ); mFormLayoutTree = new DnDTree( mLayer );
mDropListWidgetLayout->addWidget( mFormLayoutTree ); mFormLayoutWidget->setLayout( formLayoutWidgetLayout );
mDropListWidgetLayout->setMargin( 0 ); formLayoutWidgetLayout->addWidget( mFormLayoutTree );
mDropListWidget->setLayout( mDropListWidgetLayout ); formLayoutWidgetLayout->setMargin( 0 );
mFormLayoutTree->setHeaderLabels( QStringList() << tr( "Form Structure" ) ); mFormLayoutTree->setHeaderLabels( QStringList() << tr( "Form Layout" ) );
mFormLayoutTree->setType( DnDTree::Type::Drop ); mFormLayoutTree->setType( DnDTree::Type::Drop );


// AttributeTypeDialog // AttributeTypeDialog
Expand Down
166 changes: 88 additions & 78 deletions src/ui/qgsattributesformproperties.ui
View file
Expand Up @@ -6,101 +6,86 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>400</width> <width>625</width>
<height>300</height> <height>359</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string>Form</string> <string>Form</string>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout">
<property name="leftMargin">
<number>0</number>
</property>
<property name="topMargin">
<number>0</number>
</property>
<property name="rightMargin">
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item row="0" column="0"> <item row="0" column="0">
<widget class="QSplitter" name="splitter"> <widget class="QSplitter" name="splitter">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<widget class="QWidget" name="mDragListWidget" native="true"/> <widget class="QWidget" name="widget" native="true">
<widget class="QWidget" name="widget_2" native="true"> <layout class="QGridLayout" name="gridLayout_3">
<layout class="QVBoxLayout" name="verticalLayout"> <item row="2" column="1">
<property name="spacing"> <widget class="QToolButton" name="mRemoveTabOrGroupButton">
<number>0</number> <property name="text">
</property> <string>...</string>
<property name="leftMargin"> </property>
<number>6</number> <property name="icon">
</property> <iconset resource="../../images/images.qrc">
<property name="topMargin"> <normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
<number>6</number> </property>
</property> </widget>
<property name="rightMargin"> </item>
<number>6</number> <item row="3" column="1">
</property> <spacer name="verticalSpacer">
<property name="bottomMargin"> <property name="orientation">
<number>6</number> <enum>Qt::Vertical</enum>
</property> </property>
<item> <property name="sizeHint" stdset="0">
<widget class="QWidget" name="widget" native="true"> <size>
<property name="maximumSize"> <width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="1">
<spacer name="verticalSpacer_2">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size> <size>
<width>16777215</width> <width>20</width>
<height>40</height> <height>40</height>
</size> </size>
</property> </property>
<layout class="QHBoxLayout" name="horizontalLayout"> </spacer>
<property name="spacing"> </item>
<number>0</number> <item row="1" column="1">
</property> <widget class="QToolButton" name="mAddTabOrGroupButton">
<property name="leftMargin"> <property name="text">
<number>0</number> <string>...</string>
</property> </property>
<property name="topMargin"> <property name="icon">
<number>0</number> <iconset resource="../../images/images.qrc">
</property> <normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
<property name="rightMargin"> </property>
<number>0</number>
</property>
<property name="bottomMargin">
<number>0</number>
</property>
<item>
<widget class="QToolButton" name="mRemoveTabOrGroupButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="mAddTabOrGroupButton">
<property name="text">
<string>...</string>
</property>
<property name="icon">
<iconset resource="../../images/images.qrc">
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget> </widget>
</item> </item>
<item> <item row="0" column="2" rowspan="4">
<widget class="QWidget" name="mDropListWidget" native="true"/> <widget class="QWidget" name="mFormLayoutWidget" native="true"/>
</item>
<item row="0" column="0" rowspan="4">
<widget class="QWidget" name="mAvailableWidgetsWidget" native="true"/>
</item> </item>
</layout> </layout>
</widget> </widget>
Expand All @@ -113,6 +98,31 @@
</widget> </widget>
<resources> <resources>
<include location="../../images/images.qrc"/> <include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
<include location="../../images/images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

0 comments on commit 7410fbb

Please sign in to comment.