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

QML UI: don't load dives before the UI has been instantiated

Browse source 
This should deal with a big part of the delay when starting the app.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2015-11-30 10:15:04 -08:00
parent 2f2e9da2cd
commit f6ae8bf3ea
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
qt-mobile/qml/main.qml
View file

@ -272,5 +272,6 @@ MobileComponents.ApplicationWindow {
Component.onCompleted: { Component.onCompleted: {
print("MobileComponents.Units.gridUnit is: " + MobileComponents.Units.gridUnit); print("MobileComponents.Units.gridUnit is: " + MobileComponents.Units.gridUnit);
manager.loadDives();
} }
} }

8
qt-mobile/qmlmanager.cpp
View file

@ -33,8 +33,6 @@ QMLManager::QMLManager() :
setDistanceThreshold(prefs.distance_threshold); setDistanceThreshold(prefs.distance_threshold);
setTimeThreshold(prefs.time_threshold / 60); setTimeThreshold(prefs.time_threshold / 60);
if (!same_string(prefs.cloud_storage_email, "") && !same_string(prefs.cloud_storage_password, ""))
loadDives();
} }
QMLManager::~QMLManager() QMLManager::~QMLManager()
@ -90,6 +88,12 @@ void QMLManager::savePreferences()
void QMLManager::loadDives() void QMLManager::loadDives()
{ {
if (same_string(prefs.cloud_storage_email, "") || same_string(prefs.cloud_storage_password, "")) {
qmlUiShowMessage("Please set up cloud storage credentials");
appendTextToLog("Unable to load dives; cloud storage credentials missing");
return;
}
qmlUiShowMessage("Loading dives..."); qmlUiShowMessage("Loading dives...");
appendTextToLog("Loading dives..."); appendTextToLog("Loading dives...");
QString url; QString url;