diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2013-05-28 11:21:27 -0700 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2013-05-29 12:59:46 +0900 |
| commit | 4f53ad736dc3e9942b12f4240b8c391b0100206b (patch) | |
| tree | d0d98322b55fd8b2aef79dde8c77289c3cacaa43 /qt-ui/preferences.ui | |
| parent | 8394828806baf050fa833402c969139d52dc221d (diff) | |
| download | subsurface-4f53ad736dc3e9942b12f4240b8c391b0100206b.tar.gz | |
Connect preferences to the rest of the code
The biggest problem here was that bool has different sizes in C and C++
code. So using this in a structure shared between the two sides wasn't a
smart idea.
Instead I went with 'short', but that caused problems with Qt being to
smart for its own good and not doing the right thing when dealing with
'boolean' settings and a short value. This may be something in the way I
implemented things (as I doubt that something this fundamental would be
broken) but the workaround implemented here (explicitly using 0 or 1
depending on the value of the boolean) seems to work.
I also decided to get rid of the confusion of where gflow/gfhigh are
floating point (0..1) and when they are integers (0..100). We now use
integers anywhere outside of deco.c.
I also applied some serious spelling corrections to the preferences
dialog's ui file.
Finally, this enables the code that selects which partial pressure graph
to show.
Still to do: font size, metric/imperial logic
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-ui/preferences.ui')
| -rw-r--r-- | qt-ui/preferences.ui | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/qt-ui/preferences.ui b/qt-ui/preferences.ui index e36aef5b3..c442f5d2c 100644 --- a/qt-ui/preferences.ui +++ b/qt-ui/preferences.ui @@ -449,12 +449,12 @@ <bool>false</bool> </property> <property name="text"> - <string>threshould</string> + <string>threshold</string> </property> </widget> </item> <item> - <widget class="QSpinBox" name="po2Threashould"> + <widget class="QDoubleSpinBox" name="po2Threshold"> <property name="enabled"> <bool>false</bool> </property> @@ -490,12 +490,12 @@ <bool>false</bool> </property> <property name="text"> - <string>threshould</string> + <string>threshold</string> </property> </widget> </item> <item> - <widget class="QSpinBox" name="pn2Threshould"> + <widget class="QDoubleSpinBox" name="pn2Threshold"> <property name="enabled"> <bool>false</bool> </property> @@ -531,12 +531,12 @@ <bool>false</bool> </property> <property name="text"> - <string>threshould</string> + <string>threshold</string> </property> </widget> </item> <item> - <widget class="QSpinBox" name="pheThreshould"> + <widget class="QDoubleSpinBox" name="pheThreshold"> <property name="enabled"> <bool>false</bool> </property> @@ -650,7 +650,7 @@ </widget> </item> <item row="0" column="1"> - <widget class="QDoubleSpinBox" name="gflow"/> + <widget class="QSpinBox" name="gflow"/> </item> <item row="1" column="0"> <widget class="QLabel" name="label_20"> @@ -660,7 +660,7 @@ </widget> </item> <item row="1" column="1"> - <widget class="QDoubleSpinBox" name="gfhigh"/> + <widget class="QSpinBox" name="gfhigh"/> </item> </layout> </widget> @@ -754,7 +754,7 @@ <connection> <sender>po2</sender> <signal>clicked(bool)</signal> - <receiver>po2Threashould</receiver> + <receiver>po2Threshold</receiver> <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> @@ -786,7 +786,7 @@ <connection> <sender>pn2</sender> <signal>clicked(bool)</signal> - <receiver>pn2Threshould</receiver> + <receiver>pn2Threshold</receiver> <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> @@ -818,7 +818,7 @@ <connection> <sender>phe</sender> <signal>clicked(bool)</signal> - <receiver>pheThreshould</receiver> + <receiver>pheThreshold</receiver> <slot>setEnabled(bool)</slot> <hints> <hint type="sourcelabel"> |