mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2025-02-19 22:16:15 +00:00
Code Issues Projects Releases Packages Wiki Activity

Move global variables covered by Preferences into one structure

Browse source 
Now we can simply remember the state of all the preferences at the
beginning of preferences_dialog() and restore them if the user presses
'Cancel'.

Fixes #21

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2012-12-10 09:20:57 -08:00
parent 54919c1c4e
commit 92c0d8c516
10 changed files with 191 additions and 176 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dive.c
View file

@ -34,8 +34,9 @@ int get_pressure_units(unsigned int mb, const char **units)
{
int pressure;
const char* unit;
struct units *output_units_p = get_output_units();
switch (output_units.pressure) {
switch (output_units_p->pressure) {
case PASCAL:
pressure = mb * 100;
unit = _("pascal");
@ -58,8 +59,9 @@ double get_temp_units(unsigned int mk, const char **units)
{
double deg;
const char *unit;
struct units *output_units_p = get_output_units();
if (output_units.temperature == FAHRENHEIT) {
if (output_units_p->temperature == FAHRENHEIT) {
deg = mkelvin_to_F(mk);
unit = UTF8_DEGREE "F";
} else {
@ -76,8 +78,9 @@ double get_volume_units(unsigned int ml, int *frac, const char **units)
int decimals;
double vol;
const char *unit;
struct units *output_units_p = get_output_units();
switch (output_units.volume) {
switch (output_units_p->volume) {
case LITER:
vol = ml / 1000.0;
unit = _("l");
@ -101,8 +104,9 @@ double get_depth_units(unsigned int mm, int *frac, const char **units)
int decimals;
double d;
const char *unit;
struct units *output_units_p = get_output_units();
switch (output_units.length) {
switch (output_units_p->length) {
case METERS:
d = mm / 1000.0;
unit = _("m");
@ -126,8 +130,9 @@ double get_weight_units(unsigned int grams, int *frac, const char **units)
int decimals;
double value;
const char* unit;
struct units *output_units_p = get_output_units();
if (output_units.weight == LBS) {
if (output_units_p->weight == LBS) {
value = grams_to_lbs(grams);
unit = _("lbs");
decimals = 0;