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

Merge informational_prefs into git_prefs

Browse source 
There is no need to have two variables for the same purpose.

[Dirk Hohndel: changed to keep the two separate functions as otherwise
               we no longer parse existing repos successfully]

Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Joakim Bygdell 2017-02-04 17:55:25 +01:00 • committed by Dirk Hohndel
parent 12c33a038f
commit 0277d5aacc
5 changed files with 39 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

39
core/dive.c
View file

@ -3406,38 +3406,39 @@ void set_userid(char *rUserId)
void set_informational_units(char *units) void set_informational_units(char *units)
{ {
if (strstr(units, "METRIC")) { if (strstr(units, "METRIC")) {
informational_prefs.unit_system = METRIC; git_prefs.unit_system = METRIC;
} else if (strstr(units, "IMPERIAL")) { } else if (strstr(units, "IMPERIAL")) {
informational_prefs.unit_system = IMPERIAL; git_prefs.unit_system = IMPERIAL;
} else if (strstr(units, "PERSONALIZE")) { } else if (strstr(units, "PERSONALIZE")) {
informational_prefs.unit_system = PERSONALIZE; git_prefs.unit_system = PERSONALIZE;
if (strstr(units, "METERS")) if (strstr(units, "METERS"))
informational_prefs.units.length = METERS; git_prefs.units.length = METERS;
if (strstr(units, "FEET")) if (strstr(units, "FEET"))
informational_prefs.units.length = FEET; git_prefs.units.length = FEET;
if (strstr(units, "LITER")) if (strstr(units, "LITER"))
informational_prefs.units.volume = LITER; git_prefs.units.volume = LITER;
if (strstr(units, "CUFT")) if (strstr(units, "CUFT"))
informational_prefs.units.volume = CUFT; git_prefs.units.volume = CUFT;
if (strstr(units, "BAR")) if (strstr(units, "BAR"))
informational_prefs.units.pressure = BAR; git_prefs.units.pressure = BAR;
if (strstr(units, "PSI")) if (strstr(units, "PSI"))
informational_prefs.units.pressure = PSI; git_prefs.units.pressure = PSI;
if (strstr(units, "PASCAL")) if (strstr(units, "PASCAL"))
informational_prefs.units.pressure = PASCAL; git_prefs.units.pressure = PASCAL;
if (strstr(units, "CELSIUS")) if (strstr(units, "CELSIUS"))
informational_prefs.units.temperature = CELSIUS; git_prefs.units.temperature = CELSIUS;
if (strstr(units, "FAHRENHEIT")) if (strstr(units, "FAHRENHEIT"))
informational_prefs.units.temperature = FAHRENHEIT; git_prefs.units.temperature = FAHRENHEIT;
if (strstr(units, "KG")) if (strstr(units, "KG"))
informational_prefs.units.weight = KG; git_prefs.units.weight = KG;
if (strstr(units, "LBS")) if (strstr(units, "LBS"))
informational_prefs.units.weight = LBS; git_prefs.units.weight = LBS;
if (strstr(units, "SECONDS")) if (strstr(units, "SECONDS"))
informational_prefs.units.vertical_speed_time = SECONDS; git_prefs.units.vertical_speed_time = SECONDS;
if (strstr(units, "MINUTES")) if (strstr(units, "MINUTES"))
informational_prefs.units.vertical_speed_time = MINUTES; git_prefs.units.vertical_speed_time = MINUTES;
} }
} }
void set_git_prefs(char *prefs) void set_git_prefs(char *prefs)
@ -3446,6 +3447,12 @@ void set_git_prefs(char *prefs)
git_prefs.tankbar = 1; git_prefs.tankbar = 1;
if (strstr(prefs, "DCCEILING")) if (strstr(prefs, "DCCEILING"))
git_prefs.dcceiling = 1; git_prefs.dcceiling = 1;
if (strstr(prefs, "SHOW_SETPOINT"))
git_prefs.show_ccr_setpoint = 1;
if (strstr(prefs, "SHOW_SENSORS"))
git_prefs.show_ccr_sensors = 1;
if (strstr(prefs, "PO2_GRAPH"))
git_prefs.pp_graphs.po2 = 1;
} }
void average_max_depth(struct diveplan *dive, int *avg_depth, int *max_depth) void average_max_depth(struct diveplan *dive, int *avg_depth, int *max_depth)

2
core/load-git.c
View file

@ -996,7 +996,7 @@ static void trip_parser(char *line, struct membuffer *str, void *_trip)
static struct keyword_action settings_action[] = { static struct keyword_action settings_action[] = {
#undef D #undef D
#define D(x) { #x, parse_settings_ ## x } #define D(x) { #x, parse_settings_ ## x }
D(autogroup), D(divecomputerid), D(subsurface), D(prefs), D(units), D(userid), D(version) D(autogroup), D(divecomputerid), D(prefs), D(subsurface), D(units), D(userid), D(version)
}; };
static void settings_parser(char *line, struct membuffer *str, void *_unused) static void settings_parser(char *line, struct membuffer *str, void *_unused)

2
core/pref.h
View file

@ -173,7 +173,7 @@ enum cloud_status {
CS_VERIFIED CS_VERIFIED
}; };
extern struct preferences prefs, default_prefs, informational_prefs, git_prefs; extern struct preferences prefs, default_prefs, git_prefs;
#define PP_GRAPHS_ENABLED (prefs.pp_graphs.po2 || prefs.pp_graphs.pn2 || prefs.pp_graphs.phe) #define PP_GRAPHS_ENABLED (prefs.pp_graphs.po2 || prefs.pp_graphs.pn2 || prefs.pp_graphs.phe)

6
core/save-git.c
View file

@ -865,6 +865,12 @@ static void save_settings(git_repository *repo, struct dir *tree)
put_string(&b, "prefs TANKBAR\n"); put_string(&b, "prefs TANKBAR\n");
if (prefs.dcceiling) if (prefs.dcceiling)
put_string(&b, "prefs DCCEILING\n"); put_string(&b, "prefs DCCEILING\n");
if (prefs.show_ccr_setpoint)
put_string(&b, "prefs SHOW_SETPOINT\n");
if (prefs.show_ccr_sensors)
put_string(&b, "prefs SHOW_SENSORS\n");
if (prefs.pp_graphs.po2)
put_string(&b, "prefs PO2_GRAPH\n");
blob_insert(repo, tree, &b, "00-Subsurface"); blob_insert(repo, tree, &b, "00-Subsurface");
} }

16
mobile-widgets/qmlmanager.cpp
View file

@ -151,10 +151,10 @@ void QMLManager::openLocalThenRemote(QString url)
// if we can load from the cache, we know that we have at least a valid email // if we can load from the cache, we know that we have at least a valid email
if (credentialStatus() == UNKNOWN) if (credentialStatus() == UNKNOWN)
setCredentialStatus(VALID_EMAIL); setCredentialStatus(VALID_EMAIL);
prefs.unit_system = informational_prefs.unit_system; prefs.unit_system = git_prefs.unit_system;
if (informational_prefs.unit_system == IMPERIAL) if (git_prefs.unit_system == IMPERIAL)
informational_prefs.units = IMPERIAL_units; git_prefs.units = IMPERIAL_units;
prefs.units = informational_prefs.units; prefs.units = git_prefs.units;
prefs.tankbar = git_prefs.tankbar; prefs.tankbar = git_prefs.tankbar;
prefs.dcceiling = git_prefs.dcceiling; prefs.dcceiling = git_prefs.dcceiling;
process_dives(false, false); process_dives(false, false);
@ -538,10 +538,10 @@ void QMLManager::revertToNoCloudIfNeeded()
void QMLManager::consumeFinishedLoad(timestamp_t currentDiveTimestamp) void QMLManager::consumeFinishedLoad(timestamp_t currentDiveTimestamp)
{ {
prefs.unit_system = informational_prefs.unit_system; prefs.unit_system = git_prefs.unit_system;
if (informational_prefs.unit_system == IMPERIAL) if (git_prefs.unit_system == IMPERIAL)
informational_prefs.units = IMPERIAL_units; git_prefs.units = IMPERIAL_units;
prefs.units = informational_prefs.units; prefs.units = git_prefs.units;
prefs.tankbar = git_prefs.tankbar; prefs.tankbar = git_prefs.tankbar;
prefs.dcceiling = git_prefs.dcceiling; prefs.dcceiling = git_prefs.dcceiling;
DiveListModel::instance()->clear(); DiveListModel::instance()->clear();