Skip to content

Commit c4fe714

Browse files
author
timlinux
committed
Remove scrollbox for property list since it adds its own scrollbars when needed
git-svn-id: http://svn.osgeo.org/qgis/trunk@12110 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 767a260 commit c4fe714

File tree

1 file changed

+48
-70
lines changed

1 file changed

+48
-70
lines changed

‎src/ui/qgsvectorlayerpropertiesbase.ui

Lines changed: 48 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,47 @@
2121
<bool>true</bool>
2222
</property>
2323
<layout class="QGridLayout" name="gridLayout">
24-
<item row="0" column="0" rowspan="2" colspan="2">
24+
<item row="0" column="0">
25+
<widget class="QListWidget" name="listWidget">
26+
<property name="iconSize">
27+
<size>
28+
<width>64</width>
29+
<height>64</height>
30+
</size>
31+
</property>
32+
<item>
33+
<property name="text">
34+
<string>Symbology</string>
35+
</property>
36+
</item>
37+
<item>
38+
<property name="text">
39+
<string>Labels</string>
40+
</property>
41+
</item>
42+
<item>
43+
<property name="text">
44+
<string>Attributes</string>
45+
</property>
46+
</item>
47+
<item>
48+
<property name="text">
49+
<string>General</string>
50+
</property>
51+
</item>
52+
<item>
53+
<property name="text">
54+
<string>Metadata</string>
55+
</property>
56+
</item>
57+
<item>
58+
<property name="text">
59+
<string>Actions</string>
60+
</property>
61+
</item>
62+
</widget>
63+
</item>
64+
<item row="0" column="1">
2565
<layout class="QHBoxLayout">
2666
<property name="spacing">
2767
<number>3</number>
@@ -31,69 +71,7 @@
3171
</property>
3272
</layout>
3373
</item>
34-
<item row="1" column="1">
35-
<widget class="QScrollArea" name="scrollArea">
36-
<property name="widgetResizable">
37-
<bool>true</bool>
38-
</property>
39-
<widget class="QWidget" name="scrollAreaWidgetContents">
40-
<property name="geometry">
41-
<rect>
42-
<x>0</x>
43-
<y>0</y>
44-
<width>194</width>
45-
<height>404</height>
46-
</rect>
47-
</property>
48-
<layout class="QGridLayout" name="gridLayout_10">
49-
<property name="margin">
50-
<number>0</number>
51-
</property>
52-
<item row="0" column="0">
53-
<widget class="QListWidget" name="listWidget">
54-
<property name="iconSize">
55-
<size>
56-
<width>64</width>
57-
<height>64</height>
58-
</size>
59-
</property>
60-
<item>
61-
<property name="text">
62-
<string>Symbology</string>
63-
</property>
64-
</item>
65-
<item>
66-
<property name="text">
67-
<string>Labels</string>
68-
</property>
69-
</item>
70-
<item>
71-
<property name="text">
72-
<string>Attributes</string>
73-
</property>
74-
</item>
75-
<item>
76-
<property name="text">
77-
<string>General</string>
78-
</property>
79-
</item>
80-
<item>
81-
<property name="text">
82-
<string>Metadata</string>
83-
</property>
84-
</item>
85-
<item>
86-
<property name="text">
87-
<string>Actions</string>
88-
</property>
89-
</item>
90-
</widget>
91-
</item>
92-
</layout>
93-
</widget>
94-
</widget>
95-
</item>
96-
<item row="0" column="2" rowspan="2" colspan="4">
74+
<item row="0" column="2" colspan="3">
9775
<widget class="QStackedWidget" name="stackedWidget">
9876
<property name="currentIndex">
9977
<number>3</number>
@@ -370,7 +348,7 @@
370348
<rect>
371349
<x>0</x>
372350
<y>0</y>
373-
<width>540</width>
351+
<width>555</width>
374352
<height>401</height>
375353
</rect>
376354
</property>
@@ -619,35 +597,35 @@
619597
</widget>
620598
</widget>
621599
</item>
622-
<item row="2" column="1" colspan="2">
600+
<item row="1" column="0" colspan="2">
623601
<widget class="QPushButton" name="pbnLoadDefaultStyle">
624602
<property name="text">
625603
<string>Restore Default Style</string>
626604
</property>
627605
</widget>
628606
</item>
629-
<item row="2" column="3">
607+
<item row="1" column="2">
630608
<widget class="QPushButton" name="pbnSaveDefaultStyle">
631609
<property name="text">
632610
<string>Save As Default</string>
633611
</property>
634612
</widget>
635613
</item>
636-
<item row="2" column="4">
614+
<item row="1" column="3">
637615
<widget class="QPushButton" name="pbnLoadStyle">
638616
<property name="text">
639617
<string>Load Style ...</string>
640618
</property>
641619
</widget>
642620
</item>
643-
<item row="2" column="5">
621+
<item row="1" column="4">
644622
<widget class="QPushButton" name="pbnSaveStyleAs">
645623
<property name="text">
646624
<string>Save Style ...</string>
647625
</property>
648626
</widget>
649627
</item>
650-
<item row="3" column="0" colspan="6">
628+
<item row="2" column="0" colspan="5">
651629
<widget class="QDialogButtonBox" name="buttonBox">
652630
<property name="orientation">
653631
<enum>Qt::Horizontal</enum>

0 commit comments

Comments
 (0)