Skip to content

Commit 72c045a

Browse files
NathanW2NathanW2
committed
Clean up labeling UI. Remove borders from frames.
1 parent 8f9fa6d commit 72c045a

File tree

1 file changed

+112
-55
lines changed

1 file changed

+112
-55
lines changed

‎src/ui/qgslabelingguibase.ui‎

Lines changed: 112 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -18,50 +18,6 @@
1818
<normaloff>../../../../.designer/backup</normaloff>../../../../.designer/backup</iconset>
1919
</property>
2020
<layout class="QGridLayout" name="gridLayout_8">
21-
<item row="0" column="0">
22-
<layout class="QHBoxLayout" name="horizontalLayout_3">
23-
<item>
24-
<widget class="QCheckBox" name="chkEnableLabeling">
25-
<property name="text">
26-
<string>Label this layer</string>
27-
</property>
28-
</widget>
29-
</item>
30-
<item>
31-
<spacer name="horizontalSpacer_5">
32-
<property name="orientation">
33-
<enum>Qt::Horizontal</enum>
34-
</property>
35-
<property name="sizeHint" stdset="0">
36-
<size>
37-
<width>40</width>
38-
<height>20</height>
39-
</size>
40-
</property>
41-
</spacer>
42-
</item>
43-
<item>
44-
<widget class="QLabel" name="label_20">
45-
<property name="text">
46-
<string>Field with labels</string>
47-
</property>
48-
<property name="alignment">
49-
<set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
50-
</property>
51-
</widget>
52-
</item>
53-
<item>
54-
<widget class="QComboBox" name="cboFieldName"/>
55-
</item>
56-
<item>
57-
<widget class="QToolButton" name="btnExpression">
58-
<property name="text">
59-
<string>...</string>
60-
</property>
61-
</widget>
62-
</item>
63-
</layout>
64-
</item>
6521
<item row="1" column="0">
6622
<layout class="QHBoxLayout" name="horizontalLayout_4">
6723
<item>
@@ -106,8 +62,11 @@
10662
</item>
10763
<item row="2" column="0">
10864
<widget class="QTabWidget" name="mTabWidget">
65+
<property name="enabled">
66+
<bool>false</bool>
67+
</property>
10968
<property name="currentIndex">
110-
<number>0</number>
69+
<number>1</number>
11170
</property>
11271
<property name="iconSize">
11372
<size>
@@ -437,6 +396,12 @@
437396
<layout class="QGridLayout" name="gridLayout_6">
438397
<item row="0" column="0">
439398
<widget class="QScrollArea" name="scrollArea_2">
399+
<property name="autoFillBackground">
400+
<bool>true</bool>
401+
</property>
402+
<property name="frameShape">
403+
<enum>QFrame::NoFrame</enum>
404+
</property>
440405
<property name="widgetResizable">
441406
<bool>true</bool>
442407
</property>
@@ -445,8 +410,8 @@
445410
<rect>
446411
<x>0</x>
447412
<y>0</y>
448-
<width>643</width>
449-
<height>478</height>
413+
<width>647</width>
414+
<height>487</height>
450415
</rect>
451416
</property>
452417
<layout class="QGridLayout" name="gridLayout_13">
@@ -549,7 +514,7 @@
549514
<item>
550515
<widget class="QCheckBox" name="chkNoObstacle">
551516
<property name="enabled">
552-
<bool>true</bool>
517+
<bool>false</bool>
553518
</property>
554519
<property name="text">
555520
<string>Features don't act as obstacles for labels</string>
@@ -572,7 +537,7 @@
572537
<item>
573538
<widget class="QPushButton" name="btnEngineSettings">
574539
<property name="enabled">
575-
<bool>true</bool>
540+
<bool>false</bool>
576541
</property>
577542
<property name="text">
578543
<string>Engine settings</string>
@@ -891,6 +856,9 @@
891856
<layout class="QGridLayout" name="gridLayout_3">
892857
<item row="3" column="1">
893858
<widget class="QScrollArea" name="scrollArea">
859+
<property name="frameShape">
860+
<enum>QFrame::NoFrame</enum>
861+
</property>
894862
<property name="widgetResizable">
895863
<bool>true</bool>
896864
</property>
@@ -899,8 +867,8 @@
899867
<rect>
900868
<x>0</x>
901869
<y>0</y>
902-
<width>643</width>
903-
<height>586</height>
870+
<width>647</width>
871+
<height>615</height>
904872
</rect>
905873
</property>
906874
<layout class="QGridLayout" name="gridLayout_11">
@@ -1105,6 +1073,47 @@
11051073
</property>
11061074
</widget>
11071075
</item>
1076+
<item row="0" column="0">
1077+
<layout class="QHBoxLayout" name="horizontalLayout_3">
1078+
<item>
1079+
<widget class="QCheckBox" name="chkEnableLabeling">
1080+
<property name="text">
1081+
<string>Label this layer with</string>
1082+
</property>
1083+
</widget>
1084+
</item>
1085+
<item>
1086+
<widget class="QComboBox" name="cboFieldName">
1087+
<property name="enabled">
1088+
<bool>false</bool>
1089+
</property>
1090+
</widget>
1091+
</item>
1092+
<item>
1093+
<widget class="QToolButton" name="btnExpression">
1094+
<property name="enabled">
1095+
<bool>false</bool>
1096+
</property>
1097+
<property name="text">
1098+
<string>...</string>
1099+
</property>
1100+
</widget>
1101+
</item>
1102+
<item>
1103+
<spacer name="horizontalSpacer_5">
1104+
<property name="orientation">
1105+
<enum>Qt::Horizontal</enum>
1106+
</property>
1107+
<property name="sizeHint" stdset="0">
1108+
<size>
1109+
<width>40</width>
1110+
<height>20</height>
1111+
</size>
1112+
</property>
1113+
</spacer>
1114+
</item>
1115+
</layout>
1116+
</item>
11081117
</layout>
11091118
</widget>
11101119
<layoutdefault spacing="6" margin="11"/>
@@ -1134,8 +1143,8 @@
11341143
<slot>accept()</slot>
11351144
<hints>
11361145
<hint type="sourcelabel">
1137-
<x>344</x>
1138-
<y>575</y>
1146+
<x>353</x>
1147+
<y>459</y>
11391148
</hint>
11401149
<hint type="destinationlabel">
11411150
<x>309</x>
@@ -1150,14 +1159,62 @@
11501159
<slot>reject()</slot>
11511160
<hints>
11521161
<hint type="sourcelabel">
1153-
<x>344</x>
1154-
<y>575</y>
1162+
<x>353</x>
1163+
<y>459</y>
11551164
</hint>
11561165
<hint type="destinationlabel">
11571166
<x>353</x>
11581167
<y>430</y>
11591168
</hint>
11601169
</hints>
11611170
</connection>
1171+
<connection>
1172+
<sender>chkEnableLabeling</sender>
1173+
<signal>clicked(bool)</signal>
1174+
<receiver>mTabWidget</receiver>
1175+
<slot>setEnabled(bool)</slot>
1176+
<hints>
1177+
<hint type="sourcelabel">
1178+
<x>59</x>
1179+
<y>22</y>
1180+
</hint>
1181+
<hint type="destinationlabel">
1182+
<x>91</x>
1183+
<y>89</y>
1184+
</hint>
1185+
</hints>
1186+
</connection>
1187+
<connection>
1188+
<sender>chkEnableLabeling</sender>
1189+
<signal>clicked(bool)</signal>
1190+
<receiver>cboFieldName</receiver>
1191+
<slot>setEnabled(bool)</slot>
1192+
<hints>
1193+
<hint type="sourcelabel">
1194+
<x>127</x>
1195+
<y>25</y>
1196+
</hint>
1197+
<hint type="destinationlabel">
1198+
<x>248</x>
1199+
<y>26</y>
1200+
</hint>
1201+
</hints>
1202+
</connection>
1203+
<connection>
1204+
<sender>chkEnableLabeling</sender>
1205+
<signal>clicked(bool)</signal>
1206+
<receiver>btnExpression</receiver>
1207+
<slot>setEnabled(bool)</slot>
1208+
<hints>
1209+
<hint type="sourcelabel">
1210+
<x>70</x>
1211+
<y>28</y>
1212+
</hint>
1213+
<hint type="destinationlabel">
1214+
<x>291</x>
1215+
<y>32</y>
1216+
</hint>
1217+
</hints>
1218+
</connection>
11621219
</connections>
11631220
</ui>

0 commit comments

Comments
 (0)