Skip to content

Commit ae9ed3d

Browse files
author
timlinux
committedDec 7, 2006
Fixed build eror with recent changes to qgsoptions
Changed splitter checkbox var name to be consistent with rest of options. git-svn-id: http://svn.osgeo.org/qgis/trunk@6200 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent 17090c6 commit ae9ed3d

File tree

2 files changed

+102
-95
lines changed

2 files changed

+102
-95
lines changed
 

‎src/gui/qgsoptions.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ QgsOptions::QgsOptions(QWidget *parent, Qt::WFlags fl) :
142142
cmbWheelAction->setCurrentIndex(settings.value("/qgis/wheel_action", 0).toInt());
143143
spinZoomFactor->setValue(settings.value("/qgis/zoom_factor", 2).toDouble());
144144

145-
splitterRedrawCB->setChecked(settings.value("/qgis/splitterRedraw", QVariant(true)).toBool());
145+
cbxSplitterRedraw->setChecked(settings.value("/qgis/splitterRedraw", QVariant(true)).toBool());
146146
}
147147

148148
//! Destructor
@@ -251,7 +251,7 @@ void QgsOptions::saveOptions()
251251
settings.writeEntry("/qgis/wheel_action", cmbWheelAction->currentIndex());
252252
settings.writeEntry("/qgis/zoom_factor", spinZoomFactor->value());
253253

254-
settings.setValue("/qgis/splitterRedraw", splitterRedrawCB->isChecked());
254+
settings.setValue("/qgis/splitterRedraw", cbxSplitterRedraw->isChecked());
255255

256256
//all done
257257
accept();

‎src/ui/qgsoptionsbase.ui

Lines changed: 100 additions & 93 deletions
Original file line numberDiff line numberDiff line change
@@ -18,55 +18,33 @@
1818
<property name="sizeGripEnabled" >
1919
<bool>true</bool>
2020
</property>
21-
<layout class="QVBoxLayout" >
21+
<layout class="QGridLayout" >
2222
<property name="margin" >
2323
<number>9</number>
2424
</property>
2525
<property name="spacing" >
2626
<number>6</number>
2727
</property>
28-
<item>
28+
<item row="0" column="0" >
2929
<widget class="QTabWidget" name="tabWidget" >
3030
<property name="currentIndex" >
31-
<number>2</number>
31+
<number>0</number>
3232
</property>
3333
<widget class="QWidget" name="tabAppearance" >
3434
<attribute name="title" >
3535
<string>&amp;Appearance</string>
3636
</attribute>
37-
<layout class="QVBoxLayout" >
37+
<layout class="QGridLayout" >
3838
<property name="margin" >
3939
<number>9</number>
4040
</property>
4141
<property name="spacing" >
4242
<number>6</number>
4343
</property>
44-
<item>
45-
<widget class="QGroupBox" name="groupBox" >
46-
<property name="title" >
47-
<string>&amp;Splash screen</string>
48-
</property>
49-
<layout class="QGridLayout" >
50-
<property name="margin" >
51-
<number>9</number>
52-
</property>
53-
<property name="spacing" >
54-
<number>6</number>
55-
</property>
56-
<item row="0" column="0" >
57-
<widget class="QCheckBox" name="cbxHideSplash" >
58-
<property name="text" >
59-
<string>Hide splash screen at startup</string>
60-
</property>
61-
</widget>
62-
</item>
63-
</layout>
64-
</widget>
65-
</item>
66-
<item>
67-
<widget class="QGroupBox" name="groupBox_2" >
44+
<item row="3" column="0" >
45+
<widget class="QGroupBox" name="groupBox_3" >
6846
<property name="title" >
69-
<string>&amp;Icon Theme</string>
47+
<string>Appearance</string>
7048
</property>
7149
<layout class="QGridLayout" >
7250
<property name="margin" >
@@ -75,63 +53,37 @@
7553
<property name="spacing" >
7654
<number>6</number>
7755
</property>
78-
<item row="1" column="0" colspan="3" >
79-
<widget class="QLabel" name="textLabel1_5" >
56+
<item row="1" column="0" >
57+
<widget class="QCheckBox" name="cbxSplitterRedraw" >
8058
<property name="text" >
81-
<string>&lt;b>Note: &lt;/b>Theme changes take effect the next time QGIS is started</string>
82-
</property>
83-
<property name="alignment" >
84-
<set>Qt::AlignVCenter</set>
59+
<string>Remember Legend Width</string>
8560
</property>
8661
</widget>
8762
</item>
8863
<item row="0" column="0" >
89-
<widget class="QLabel" name="textLabel1_4" >
90-
<property name="sizePolicy" >
91-
<sizepolicy>
92-
<hsizetype>0</hsizetype>
93-
<vsizetype>5</vsizetype>
94-
<horstretch>0</horstretch>
95-
<verstretch>0</verstretch>
96-
</sizepolicy>
97-
</property>
64+
<widget class="QCheckBox" name="capitaliseCheckBox" >
9865
<property name="text" >
99-
<string>Theme</string>
100-
</property>
101-
<property name="buddy" >
102-
<cstring>cmbTheme</cstring>
103-
</property>
104-
</widget>
105-
</item>
106-
<item row="0" column="1" >
107-
<widget class="QComboBox" name="cmbTheme" >
108-
<property name="duplicatesEnabled" >
109-
<bool>false</bool>
66+
<string>Capitalise layer name</string>
11067
</property>
111-
<item>
112-
<property name="text" >
113-
<string/>
114-
</property>
115-
</item>
11668
</widget>
11769
</item>
118-
<item row="0" column="2" >
119-
<spacer>
120-
<property name="orientation" >
121-
<enum>Qt::Horizontal</enum>
122-
</property>
123-
<property name="sizeHint" >
124-
<size>
125-
<width>40</width>
126-
<height>20</height>
127-
</size>
128-
</property>
129-
</spacer>
130-
</item>
13170
</layout>
13271
</widget>
13372
</item>
134-
<item>
73+
<item row="4" column="0" >
74+
<spacer>
75+
<property name="orientation" >
76+
<enum>Qt::Vertical</enum>
77+
</property>
78+
<property name="sizeHint" >
79+
<size>
80+
<width>20</width>
81+
<height>40</height>
82+
</size>
83+
</property>
84+
</spacer>
85+
</item>
86+
<item row="2" column="0" >
13587
<widget class="QGroupBox" name="groupBox_9" >
13688
<property name="title" >
13789
<string>Default Map Appearance (Overridden by project properties)</string>
@@ -218,40 +170,95 @@
218170
</layout>
219171
</widget>
220172
</item>
221-
<item>
222-
<widget class="QGroupBox" name="groupBox_3" >
173+
<item row="1" column="0" >
174+
<widget class="QGroupBox" name="groupBox_2" >
223175
<property name="title" >
224-
<string>Appearance</string>
176+
<string>&amp;Icon Theme</string>
225177
</property>
226-
<layout class="QVBoxLayout" >
178+
<layout class="QGridLayout" >
227179
<property name="margin" >
228180
<number>9</number>
229181
</property>
230182
<property name="spacing" >
231183
<number>6</number>
232184
</property>
233-
<item>
234-
<widget class="QCheckBox" name="capitaliseCheckBox" >
185+
<item row="1" column="0" colspan="3" >
186+
<widget class="QLabel" name="textLabel1_5" >
235187
<property name="text" >
236-
<string>Capitalise layer name</string>
188+
<string>&lt;b>Note: &lt;/b>Theme changes take effect the next time QGIS is started</string>
189+
</property>
190+
<property name="alignment" >
191+
<set>Qt::AlignVCenter</set>
192+
</property>
193+
</widget>
194+
</item>
195+
<item row="0" column="0" >
196+
<widget class="QLabel" name="textLabel1_4" >
197+
<property name="sizePolicy" >
198+
<sizepolicy>
199+
<hsizetype>0</hsizetype>
200+
<vsizetype>5</vsizetype>
201+
<horstretch>0</horstretch>
202+
<verstretch>0</verstretch>
203+
</sizepolicy>
204+
</property>
205+
<property name="text" >
206+
<string>Theme</string>
207+
</property>
208+
<property name="buddy" >
209+
<cstring>cmbTheme</cstring>
237210
</property>
238211
</widget>
239212
</item>
213+
<item row="0" column="1" >
214+
<widget class="QComboBox" name="cmbTheme" >
215+
<property name="duplicatesEnabled" >
216+
<bool>false</bool>
217+
</property>
218+
<item>
219+
<property name="text" >
220+
<string/>
221+
</property>
222+
</item>
223+
</widget>
224+
</item>
225+
<item row="0" column="2" >
226+
<spacer>
227+
<property name="orientation" >
228+
<enum>Qt::Horizontal</enum>
229+
</property>
230+
<property name="sizeHint" >
231+
<size>
232+
<width>40</width>
233+
<height>20</height>
234+
</size>
235+
</property>
236+
</spacer>
237+
</item>
240238
</layout>
241239
</widget>
242240
</item>
243-
<item>
244-
<spacer>
245-
<property name="orientation" >
246-
<enum>Qt::Vertical</enum>
247-
</property>
248-
<property name="sizeHint" >
249-
<size>
250-
<width>20</width>
251-
<height>40</height>
252-
</size>
241+
<item row="0" column="0" >
242+
<widget class="QGroupBox" name="groupBox" >
243+
<property name="title" >
244+
<string>&amp;Splash screen</string>
253245
</property>
254-
</spacer>
246+
<layout class="QGridLayout" >
247+
<property name="margin" >
248+
<number>9</number>
249+
</property>
250+
<property name="spacing" >
251+
<number>6</number>
252+
</property>
253+
<item row="0" column="0" >
254+
<widget class="QCheckBox" name="cbxHideSplash" >
255+
<property name="text" >
256+
<string>Hide splash screen at startup</string>
257+
</property>
258+
</widget>
259+
</item>
260+
</layout>
261+
</widget>
255262
</item>
256263
</layout>
257264
</widget>
@@ -732,7 +739,7 @@ p, li { white-space: pre-wrap; }
732739
</widget>
733740
</widget>
734741
</item>
735-
<item>
742+
<item row="1" column="0" >
736743
<layout class="QHBoxLayout" >
737744
<property name="margin" >
738745
<number>0</number>

0 commit comments

Comments
 (0)
Please sign in to comment.