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: in no cloud mode, save to a default local repo

Browse source 
And set that up as the default file to load at start.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
This commit is contained in:
Dirk Hohndel 2016-04-22 07:08:23 -07:00
parent 9ba090c31f
commit 7c156f3ba1
1 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
mobile-widgets/qmlmanager.cpp
View file

@ -19,6 +19,7 @@
#include "core/qt-gui.h" #include "core/qt-gui.h"
#include "core/git-access.h" #include "core/git-access.h"
#include "core/cloudstorage.h" #include "core/cloudstorage.h"
#include "core/subsurface-qt/SettingsObjectWrapper.h"
QMLManager *QMLManager::m_instance = NULL; QMLManager *QMLManager::m_instance = NULL;
@ -794,7 +795,20 @@ void QMLManager::saveChangesLocal()
{ {
if (unsaved_changes()) { if (unsaved_changes()) {
git_storage_update_progress(true, "saving dives locally"); // reset the timers git_storage_update_progress(true, "saving dives locally"); // reset the timers
if (!loadFromCloud()) { if (credentialStatus() == NOCLOUD) {
if (same_string(existing_filename, "")) {
QString filename(system_default_directory());
filename += "/cloudstorage/localrepo";
if (git_create_local_repo(qPrintable(filename)))
appendTextToLog(get_error_string());
filename += "[master]";
set_filename(qPrintable(filename), true);
GeneralSettingsObjectWrapper s(this);
s.setDefaultFilename(filename);
s.setDefaultFileBehavior(LOCAL_DEFAULT_FILE);
qDebug() << "setting default file to" << filename;
}
} else if (!loadFromCloud()) {
// this seems silly, but you need a common ancestor in the repository in // this seems silly, but you need a common ancestor in the repository in
// order to be able to merge che changes later // order to be able to merge che changes later
appendTextToLog("Don't save dives without loading from the cloud, first."); appendTextToLog("Don't save dives without loading from the cloud, first.");
@ -809,6 +823,7 @@ void QMLManager::saveChangesLocal()
prefs.git_local_only = true; prefs.git_local_only = true;
if (save_dives(existing_filename)) { if (save_dives(existing_filename)) {
appendTextToLog(get_error_string()); appendTextToLog(get_error_string());
set_filename(NULL, true);
setAccessingCloud(-1); setAccessingCloud(-1);
prefs.git_local_only = glo; prefs.git_local_only = glo;
alreadySaving = false; alreadySaving = false;