Skip to content

Commit 7410fbb

Browse files
m-kuhnm-kuhn
committed
Some layout changes
1 parent d5e0b18 commit 7410fbb

File tree

2 files changed

+101
-93
lines changed

2 files changed

+101
-93
lines changed

‎src/app/qgsattributesformproperties.cpp‎

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,28 @@
44
QgsAttributesFormProperties::QgsAttributesFormProperties( QgsVectorLayer *layer, QWidget *parent )
55
: QWidget( parent )
66
, mLayer( layer )
7-
, mAvailableWidgetsTree( nullptr )
8-
, mFormLayoutTree( nullptr )
9-
, mAttributeTypeDialog( nullptr )
107
{
118
if ( !layer )
129
return;
1310

1411
setupUi( this );
1512

16-
// drag tree (not mixup with drag queen)
17-
QGridLayout *mDragListWidgetLayout = new QGridLayout;
18-
mAvailableWidgetsTree = new DnDTree( mLayer, mDragListWidget );
19-
mDragListWidgetLayout->addWidget( mAvailableWidgetsTree );
20-
mDragListWidget->setLayout( mDragListWidgetLayout );
13+
// available widgets tree
14+
QGridLayout *availableWidgetsWidgetLayout = new QGridLayout;
15+
mAvailableWidgetsTree = new DnDTree( mLayer );
16+
availableWidgetsWidgetLayout->addWidget( mAvailableWidgetsTree );
17+
availableWidgetsWidgetLayout->setMargin( 0 );
18+
mAvailableWidgetsWidget->setLayout( availableWidgetsWidgetLayout );
2119
mAvailableWidgetsTree->setHeaderLabels( QStringList() << tr( "Available Widgets" ) );
2220
mAvailableWidgetsTree->setType( DnDTree::Type::Drag );
2321

24-
// drop tree
25-
QGridLayout *mDropListWidgetLayout = new QGridLayout;
26-
mFormLayoutTree = new DnDTree( mLayer, mDropListWidget );
27-
mDropListWidgetLayout->addWidget( mFormLayoutTree );
28-
mDropListWidgetLayout->setMargin( 0 );
29-
mDropListWidget->setLayout( mDropListWidgetLayout );
30-
mFormLayoutTree->setHeaderLabels( QStringList() << tr( "Form Structure" ) );
22+
// form layout tree
23+
QGridLayout *formLayoutWidgetLayout = new QGridLayout;
24+
mFormLayoutTree = new DnDTree( mLayer );
25+
mFormLayoutWidget->setLayout( formLayoutWidgetLayout );
26+
formLayoutWidgetLayout->addWidget( mFormLayoutTree );
27+
formLayoutWidgetLayout->setMargin( 0 );
28+
mFormLayoutTree->setHeaderLabels( QStringList() << tr( "Form Layout" ) );
3129
mFormLayoutTree->setType( DnDTree::Type::Drop );
3230

3331
// AttributeTypeDialog

‎src/ui/qgsattributesformproperties.ui‎

Lines changed: 88 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -6,101 +6,86 @@
66
<rect>
77
<x>0</x>
88
<y>0</y>
9-
<width>400</width>
10-
<height>300</height>
9+
<width>625</width>
10+
<height>359</height>
1111
</rect>
1212
</property>
1313
<property name="windowTitle">
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17+
<property name="leftMargin">
18+
<number>0</number>
19+
</property>
20+
<property name="topMargin">
21+
<number>0</number>
22+
</property>
23+
<property name="rightMargin">
24+
<number>0</number>
25+
</property>
26+
<property name="bottomMargin">
27+
<number>0</number>
28+
</property>
1729
<item row="0" column="0">
1830
<widget class="QSplitter" name="splitter">
1931
<property name="orientation">
2032
<enum>Qt::Horizontal</enum>
2133
</property>
22-
<widget class="QWidget" name="mDragListWidget" native="true"/>
23-
<widget class="QWidget" name="widget_2" native="true">
24-
<layout class="QVBoxLayout" name="verticalLayout">
25-
<property name="spacing">
26-
<number>0</number>
27-
</property>
28-
<property name="leftMargin">
29-
<number>6</number>
30-
</property>
31-
<property name="topMargin">
32-
<number>6</number>
33-
</property>
34-
<property name="rightMargin">
35-
<number>6</number>
36-
</property>
37-
<property name="bottomMargin">
38-
<number>6</number>
39-
</property>
40-
<item>
41-
<widget class="QWidget" name="widget" native="true">
42-
<property name="maximumSize">
34+
<widget class="QWidget" name="widget" native="true">
35+
<layout class="QGridLayout" name="gridLayout_3">
36+
<item row="2" column="1">
37+
<widget class="QToolButton" name="mRemoveTabOrGroupButton">
38+
<property name="text">
39+
<string>...</string>
40+
</property>
41+
<property name="icon">
42+
<iconset resource="../../images/images.qrc">
43+
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
44+
</property>
45+
</widget>
46+
</item>
47+
<item row="3" column="1">
48+
<spacer name="verticalSpacer">
49+
<property name="orientation">
50+
<enum>Qt::Vertical</enum>
51+
</property>
52+
<property name="sizeHint" stdset="0">
53+
<size>
54+
<width>20</width>
55+
<height>40</height>
56+
</size>
57+
</property>
58+
</spacer>
59+
</item>
60+
<item row="0" column="1">
61+
<spacer name="verticalSpacer_2">
62+
<property name="orientation">
63+
<enum>Qt::Vertical</enum>
64+
</property>
65+
<property name="sizeHint" stdset="0">
4366
<size>
44-
<width>16777215</width>
67+
<width>20</width>
4568
<height>40</height>
4669
</size>
4770
</property>
48-
<layout class="QHBoxLayout" name="horizontalLayout">
49-
<property name="spacing">
50-
<number>0</number>
51-
</property>
52-
<property name="leftMargin">
53-
<number>0</number>
54-
</property>
55-
<property name="topMargin">
56-
<number>0</number>
57-
</property>
58-
<property name="rightMargin">
59-
<number>0</number>
60-
</property>
61-
<property name="bottomMargin">
62-
<number>0</number>
63-
</property>
64-
<item>
65-
<widget class="QToolButton" name="mRemoveTabOrGroupButton">
66-
<property name="text">
67-
<string>...</string>
68-
</property>
69-
<property name="icon">
70-
<iconset resource="../../images/images.qrc">
71-
<normaloff>:/images/themes/default/symbologyRemove.svg</normaloff>:/images/themes/default/symbologyRemove.svg</iconset>
72-
</property>
73-
</widget>
74-
</item>
75-
<item>
76-
<widget class="QToolButton" name="mAddTabOrGroupButton">
77-
<property name="text">
78-
<string>...</string>
79-
</property>
80-
<property name="icon">
81-
<iconset resource="../../images/images.qrc">
82-
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
83-
</property>
84-
</widget>
85-
</item>
86-
<item>
87-
<spacer name="horizontalSpacer">
88-
<property name="orientation">
89-
<enum>Qt::Horizontal</enum>
90-
</property>
91-
<property name="sizeHint" stdset="0">
92-
<size>
93-
<width>40</width>
94-
<height>20</height>
95-
</size>
96-
</property>
97-
</spacer>
98-
</item>
99-
</layout>
71+
</spacer>
72+
</item>
73+
<item row="1" column="1">
74+
<widget class="QToolButton" name="mAddTabOrGroupButton">
75+
<property name="text">
76+
<string>...</string>
77+
</property>
78+
<property name="icon">
79+
<iconset resource="../../images/images.qrc">
80+
<normaloff>:/images/themes/default/symbologyAdd.svg</normaloff>:/images/themes/default/symbologyAdd.svg</iconset>
81+
</property>
10082
</widget>
10183
</item>
102-
<item>
103-
<widget class="QWidget" name="mDropListWidget" native="true"/>
84+
<item row="0" column="2" rowspan="4">
85+
<widget class="QWidget" name="mFormLayoutWidget" native="true"/>
86+
</item>
87+
<item row="0" column="0" rowspan="4">
88+
<widget class="QWidget" name="mAvailableWidgetsWidget" native="true"/>
10489
</item>
10590
</layout>
10691
</widget>
@@ -113,6 +98,31 @@
11398
</widget>
11499
<resources>
115100
<include location="../../images/images.qrc"/>
101+
<include location="../../images/images.qrc"/>
102+
<include location="../../images/images.qrc"/>
103+
<include location="../../images/images.qrc"/>
104+
<include location="../../images/images.qrc"/>
105+
<include location="../../images/images.qrc"/>
106+
<include location="../../images/images.qrc"/>
107+
<include location="../../images/images.qrc"/>
108+
<include location="../../images/images.qrc"/>
109+
<include location="../../images/images.qrc"/>
110+
<include location="../../images/images.qrc"/>
111+
<include location="../../images/images.qrc"/>
112+
<include location="../../images/images.qrc"/>
113+
<include location="../../images/images.qrc"/>
114+
<include location="../../images/images.qrc"/>
115+
<include location="../../images/images.qrc"/>
116+
<include location="../../images/images.qrc"/>
117+
<include location="../../images/images.qrc"/>
118+
<include location="../../images/images.qrc"/>
119+
<include location="../../images/images.qrc"/>
120+
<include location="../../images/images.qrc"/>
121+
<include location="../../images/images.qrc"/>
122+
<include location="../../images/images.qrc"/>
123+
<include location="../../images/images.qrc"/>
124+
<include location="../../images/images.qrc"/>
125+
<include location="../../images/images.qrc"/>
116126
</resources>
117127
<connections/>
118128
</ui>

0 commit comments

Comments
 (0)