mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 05:00:20 +00:00
Code Issues Projects Releases Packages Wiki Activity

MOBILE: Read profile settings from git

Browse source 
Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
This commit is contained in:
Joakim Bygdell 2017-02-04 10:42:00 +01:00 committed by Dirk Hohndel
parent d4dbd0bee7
commit 11dcae436e
3 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/subsurfacestartup.c
View file

@ -7,7 +7,7 @@
#include "git-access.h" #include "git-access.h"
#include "libdivecomputer/version.h" #include "libdivecomputer/version.h"
struct preferences prefs, informational_prefs; struct preferences prefs, informational_prefs, git_prefs;
struct preferences default_prefs = { struct preferences default_prefs = {
.cloud_base_url = "https://cloud.subsurface-divelog.org/", .cloud_base_url = "https://cloud.subsurface-divelog.org/",
#if defined(SUBSURFACE_MOBILE) #if defined(SUBSURFACE_MOBILE)

4
mobile-widgets/qmlmanager.cpp
View file

@ -155,6 +155,8 @@ void QMLManager::openLocalThenRemote(QString url)
if (informational_prefs.unit_system == IMPERIAL) if (informational_prefs.unit_system == IMPERIAL)
informational_prefs.units = IMPERIAL_units; informational_prefs.units = IMPERIAL_units;
prefs.units = informational_prefs.units; prefs.units = informational_prefs.units;
prefs.tankbar = git_prefs.tankbar;
prefs.dcceiling = git_prefs.dcceiling;
process_dives(false, false); process_dives(false, false);
DiveListModel::instance()->clear(); DiveListModel::instance()->clear();
DiveListModel::instance()->addAllDives(); DiveListModel::instance()->addAllDives();
@ -540,6 +542,8 @@ void QMLManager::consumeFinishedLoad(timestamp_t currentDiveTimestamp)
if (informational_prefs.unit_system == IMPERIAL) if (informational_prefs.unit_system == IMPERIAL)
informational_prefs.units = IMPERIAL_units; informational_prefs.units = IMPERIAL_units;
prefs.units = informational_prefs.units; prefs.units = informational_prefs.units;
prefs.tankbar = git_prefs.tankbar;
prefs.dcceiling = git_prefs.dcceiling;
DiveListModel::instance()->clear(); DiveListModel::instance()->clear();
process_dives(false, false); process_dives(false, false);
DiveListModel::instance()->addAllDives(); DiveListModel::instance()->addAllDives();

1
subsurface-mobile-main.cpp
View file

@ -54,7 +54,6 @@ int main(int argc, char **argv)
prefs.animation_speed = 0; // we render the profile to pixmap, no animations prefs.animation_speed = 0; // we render the profile to pixmap, no animations
// always show the divecomputer reported ceiling in red // always show the divecomputer reported ceiling in red
prefs.dcceiling = 1;
prefs.redceiling = 1; prefs.redceiling = 1;
init_proxy(); init_proxy();