Skip to content
Permalink
Browse files

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/qgis@6200 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux
timlinux committed Dec 7, 2006
1 parent 0bccf04 commit 94170ff0bafb25ba45b667e6e4b6f9681c947db3
Showing with 102 additions and 95 deletions.
  1. +2 −2 src/gui/qgsoptions.cpp
  2. +100 −93 src/ui/qgsoptionsbase.ui
@@ -142,7 +142,7 @@ QgsOptions::QgsOptions(QWidget *parent, Qt::WFlags fl) :
cmbWheelAction->setCurrentIndex(settings.value("/qgis/wheel_action", 0).toInt());
spinZoomFactor->setValue(settings.value("/qgis/zoom_factor", 2).toDouble());

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

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

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

//all done
accept();
@@ -18,55 +18,33 @@
<property name="sizeGripEnabled" >
<bool>true</bool>
</property>
<layout class="QVBoxLayout" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<item row="0" column="0" >
<widget class="QTabWidget" name="tabWidget" >
<property name="currentIndex" >
<number>2</number>
<number>0</number>
</property>
<widget class="QWidget" name="tabAppearance" >
<attribute name="title" >
<string>&amp;Appearance</string>
</attribute>
<layout class="QVBoxLayout" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>&amp;Splash screen</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QCheckBox" name="cbxHideSplash" >
<property name="text" >
<string>Hide splash screen at startup</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_2" >
<item row="3" column="0" >
<widget class="QGroupBox" name="groupBox_3" >
<property name="title" >
<string>&amp;Icon Theme</string>
<string>Appearance</string>
</property>
<layout class="QGridLayout" >
<property name="margin" >
@@ -75,63 +53,37 @@
<property name="spacing" >
<number>6</number>
</property>
<item row="1" column="0" colspan="3" >
<widget class="QLabel" name="textLabel1_5" >
<item row="1" column="0" >
<widget class="QCheckBox" name="cbxSplitterRedraw" >
<property name="text" >
<string>&lt;b>Note: &lt;/b>Theme changes take effect the next time QGIS is started</string>
</property>
<property name="alignment" >
<set>Qt::AlignVCenter</set>
<string>Remember Legend Width</string>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1_4" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<widget class="QCheckBox" name="capitaliseCheckBox" >
<property name="text" >
<string>Theme</string>
</property>
<property name="buddy" >
<cstring>cmbTheme</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QComboBox" name="cmbTheme" >
<property name="duplicatesEnabled" >
<bool>false</bool>
<string>Capitalise layer name</string>
</property>
<item>
<property name="text" >
<string/>
</property>
</item>
</widget>
</item>
<item row="0" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<item row="4" column="0" >
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
</property>
</spacer>
</item>
<item row="2" column="0" >
<widget class="QGroupBox" name="groupBox_9" >
<property name="title" >
<string>Default Map Appearance (Overridden by project properties)</string>
@@ -218,40 +170,95 @@
</layout>
</widget>
</item>
<item>
<widget class="QGroupBox" name="groupBox_3" >
<item row="1" column="0" >
<widget class="QGroupBox" name="groupBox_2" >
<property name="title" >
<string>Appearance</string>
<string>&amp;Icon Theme</string>
</property>
<layout class="QVBoxLayout" >
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item>
<widget class="QCheckBox" name="capitaliseCheckBox" >
<item row="1" column="0" colspan="3" >
<widget class="QLabel" name="textLabel1_5" >
<property name="text" >
<string>Capitalise layer name</string>
<string>&lt;b>Note: &lt;/b>Theme changes take effect the next time QGIS is started</string>
</property>
<property name="alignment" >
<set>Qt::AlignVCenter</set>
</property>
</widget>
</item>
<item row="0" column="0" >
<widget class="QLabel" name="textLabel1_4" >
<property name="sizePolicy" >
<sizepolicy>
<hsizetype>0</hsizetype>
<vsizetype>5</vsizetype>
<horstretch>0</horstretch>
<verstretch>0</verstretch>
</sizepolicy>
</property>
<property name="text" >
<string>Theme</string>
</property>
<property name="buddy" >
<cstring>cmbTheme</cstring>
</property>
</widget>
</item>
<item row="0" column="1" >
<widget class="QComboBox" name="cmbTheme" >
<property name="duplicatesEnabled" >
<bool>false</bool>
</property>
<item>
<property name="text" >
<string/>
</property>
</item>
</widget>
</item>
<item row="0" column="2" >
<spacer>
<property name="orientation" >
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" >
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</widget>
</item>
<item>
<spacer>
<property name="orientation" >
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" >
<size>
<width>20</width>
<height>40</height>
</size>
<item row="0" column="0" >
<widget class="QGroupBox" name="groupBox" >
<property name="title" >
<string>&amp;Splash screen</string>
</property>
</spacer>
<layout class="QGridLayout" >
<property name="margin" >
<number>9</number>
</property>
<property name="spacing" >
<number>6</number>
</property>
<item row="0" column="0" >
<widget class="QCheckBox" name="cbxHideSplash" >
<property name="text" >
<string>Hide splash screen at startup</string>
</property>
</widget>
</item>
</layout>
</widget>
</item>
</layout>
</widget>
@@ -732,7 +739,7 @@ p, li { white-space: pre-wrap; }
</widget>
</widget>
</item>
<item>
<item row="1" column="0" >
<layout class="QHBoxLayout" >
<property name="margin" >
<number>0</number>

0 comments on commit 94170ff

Please sign in to comment.
You can’t perform that action at this time.