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

Edit depth/duration dialog incorrectly always used metric

Browse source 
The label changed, but when the value was pre-set, it was always set as
metric (but then "correctly" interpreted as ft when reading it back - i.e.
it was incorrectly devided by 3.3).

Reported-by: Thomas Maisl <tom@maisl.net>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2013-05-15 12:47:05 -04:00
parent ac16444544
commit b6ec313096
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
info-gtk.c
View file

@ -925,8 +925,13 @@ static int dive_time_widget(struct dive *dive, edit_control_t editing)
depthinterval = 0.1; depthinterval = 0.1;
} }
depth = gtk_spin_button_new_with_range (0.0, 1000.0, depthinterval); depth = gtk_spin_button_new_with_range (0.0, 1000.0, depthinterval);
if (editing != EDIT_NEW_DIVE) if (editing != EDIT_NEW_DIVE) {
gtk_spin_button_set_value(GTK_SPIN_BUTTON(depth), dive->dc.maxdepth.mm / 1000.0); if (prefs.units.length == FEET) {
gtk_spin_button_set_value(GTK_SPIN_BUTTON(depth), mm_to_feet(dive->dc.maxdepth.mm));
} else {
gtk_spin_button_set_value(GTK_SPIN_BUTTON(depth), dive->dc.maxdepth.mm / 1000.0);
}
}
gtk_box_pack_end(GTK_BOX(box), depth, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(box), depth, FALSE, FALSE, 0);
box = frame_box(hbox, _("Avg Depth (%s):"), prefs.units.length == FEET ? _("ft") : _("m")); box = frame_box(hbox, _("Avg Depth (%s):"), prefs.units.length == FEET ? _("ft") : _("m"));
@ -936,8 +941,13 @@ static int dive_time_widget(struct dive *dive, edit_control_t editing)
depthinterval = 0.1; depthinterval = 0.1;
} }
avgdepth = gtk_spin_button_new_with_range (0.0, 1000.0, depthinterval); avgdepth = gtk_spin_button_new_with_range (0.0, 1000.0, depthinterval);
if (editing != EDIT_NEW_DIVE) if (editing != EDIT_NEW_DIVE) {
gtk_spin_button_set_value(GTK_SPIN_BUTTON(avgdepth), dive->dc.meandepth.mm / 1000.0); if (prefs.units.length == FEET) {
gtk_spin_button_set_value(GTK_SPIN_BUTTON(avgdepth), mm_to_feet(dive->dc.meandepth.mm));
} else {
gtk_spin_button_set_value(GTK_SPIN_BUTTON(avgdepth), dive->dc.meandepth.mm / 1000.0);
}
}
gtk_box_pack_end(GTK_BOX(box), avgdepth, FALSE, FALSE, 0); gtk_box_pack_end(GTK_BOX(box), avgdepth, FALSE, FALSE, 0);
} }
/* All done, show it and wait for editing */ /* All done, show it and wait for editing */