aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-07-07build-system/macOS: don't get libgit2 from pkgconfig when building it ourselvesGravatar Dirk Hohndel
Doing that confuses the build setup and as a result the library isn't found at runtime without some fixups. Fixes #1469 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-07build-system/macOS: fix up the id of libssh2 as wellGravatar Dirk Hohndel
For some reason we only tried to fix libgit2 but not the libssh2 that it depend on. Weird. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-07build-system/macOS: correctly test if we need to adjust the id of libgit2Gravatar Dirk Hohndel
The existing test was backwards and never worked. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-07core: update qPrefDisplay.cpp to use all qPref macros.Gravatar jan Iversen
change qPrefDisplay.cpp to use qPref_private macros, for each variable. The macros used depend on how standard the variable is handled. Remark: this commit is production code, but qPrefDisplay is NOT integrated into SettingsObjectWrapper and thus not active in the live system Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-07core: add macros to handle get/set/loadsync functionsGravatar jan Iversen
Add macros to handle get/set/loadsync function set functions in qPref These macros are only convinience functions to write less for all those variables who are traited standardized. Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-07core: add macros to handle setter functionsGravatar jan Iversen
Add macros to handle full function set functions in qPref Remark: the function name is fixed to be "set_<name>" where name is identical to the variable in struct preferences This is not our standard naming, but is consistent with struct preferences (that also use different name schemes). Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-07core: add macros to replace getter functionsGravatar jan Iversen
Add macros to handle full getter functions Remark: it is assumed the name of getter function is identical to the name in struct preferences. Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-07core: qPref private add macros to replace disk* functionsGravatar jan Iversen
Use a private QSettings variable, instead of declaring it each time Add macros to handle full disk* functions Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-07core: copy Display from SettingsObjectWrapper to qPref as its own classGravatar jan Iversen
copy Display from SettingsObjectWrapper to qPref as its own class file. Update Display to use a common load/sync scheme. Update set/get functions to follow common name scheme: - get function have same name as in struct preferences - set function have set_<name in struct preferences> - signal function have <name in struct preferences>_changed one class one .h/.cpp is the C++ idiom. Having load/sync of each variable in 1 functions (in contrast to the distributed way SettingsObjectWrapper handles it) secures the same storage name is used. Having the set/get/load/sync functions grouped together makes it easier to get an overview. REMARK: this commit are made to show the use of the low level LOADSYNC macros, which will be used for special cases. This class is NOT linked into the live system. Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-07core: pref.h rename showDeveloper to show_developerGravatar jan Iversen
change to use same name pattern as other variables. Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-07git storage: avoid warning about "Unmatched action 'hash'"Gravatar Dirk Hohndel
In commit f3ef38ca0d ("Dive pictures: remove hashes") we removed picture hashes, but removing them from the git parser causes an ugly red warning when opening an existing cloud storage repo. With this patch we just silently ignore the hash. Fixes #1473 Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-06core: don't crash on merge of non-existing dive siteGravatar Dirk Hohndel
While we shouldn't have a dive that references a dive site that doesn't exist, if we do, we shouldn't crash. And a dive site that doesn't exist is most definitely 'empty'. Reported-by: Benjamin Fogel <nystire@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-06build-system/macOS: remove outdated message about errorsGravatar Dirk Hohndel
This hasn't been true for a long time. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-06build-system/macOS: update the signing scriptGravatar Dirk Hohndel
This really isn't useful for anyone but me as I create official binaries. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-06build-system/macOS: copy one more library when building against Qt5.11Gravatar Dirk Hohndel
I don't quite understand why this one is missing, but otherwise the map doesn't work. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-06build-system/macOS: update make-package.sh to use macOS 10.11 as base versionGravatar Dirk Hohndel
Qt 5.11 no longer supports macOS 10.10. Also use the new long path to identify the SDK. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-06build-system/macOS: try both possitble locations for googlemapsGravatar Dirk Hohndel
And don't show an error for the one where it isn't. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-06ssrf: remove LIBRARY_PATH from makefileGravatar jan Iversen
build.sh (line 468,469) uses LIBRARY_PATH, but make can do without. Removed LIBRARY_PATH Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-06ssrf: add "make check" to central makefileGravatar jan Iversen
extend ssrf/makefile with "make check" option. This is just a convinience function, to not need to "cd build" first Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-06tests: make testpreferences.h loadable independent of testdiveGravatar jan Iversen
set #ifdef TESTPREFERENCES in testpreferences.h so it can be loaded with other header files Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-05mobile-widgets: solve cloudstatus register problemGravatar jan Iversen
Use Q_ENUM instad of Q_ENUMS (which is depreciated) since it does the meta registration for all Qt platforms. Q_ENUM require the enum to be defined in the class and cannot refer to a global class, therefore copied enum to class. This commit is made to get the release to work, with minimal changes, this class will be moved to qPref and the double definition solved Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-04ShellcheckGravatar Joakim Bygdell
Code cleanup using shellcheck. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-04Update INSTALL fileGravatar Jocke
Update the install file to reflect the new build process. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-04Update android build env.Gravatar Joakim Bygdell
Update the scripts used to build subsurface-mobile for andriod to use the variables file. Removed checks for obsolete Qt versions. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-04Add build variables fileGravatar Joakim Bygdell
This adds a file that contains the variables used in the android-build-wrapper and build scripts. This gives a single location for setting which versions of Qt, NDK and SDK we use when building the mobile app on linux. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com>
2018-07-04Latest translationsGravatar Dirk Hohndel
Because of the code cleanup in commit 57c01f7a66 ("Translations: unify gettextFromC::tr() and QObject::tr()") a lot of text has moved to new context. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-03Update translation source stringsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-03Update CHANGELOG.mdGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-03Bump Subsurface-mobile versionGravatar Dirk Hohndel
Otherwise the Apple app store doesn't let me upload new test binaries. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-03iOS: find translations againGravatar Dirk Hohndel
commit ec0511e824 ("ios: concentrate build dirs") moved the translations around without updating the way they are accessed, causing our release 2.1.0 on iOS to not be localized. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-03macOS: we don't need to bundle QtDBusGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-03macOS: we no longer need libssh2Gravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-03Allow to split dives with more than one dive computerGravatar Robert C. Helling
Only the first computer is taken into account to find surface intervals. All further dive computers are split according to time. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2018-07-03CHANGELOG entryGravatar Robert C. Helling
Signed-off-by: Robert C. Helling <helling@atdotde.de>
2018-07-03Profile context menu entry to split a diveGravatar Robert C. Helling
Allow the user to manually split a dive in two. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2018-07-03Include cylinder pressures upon force_fixup()Gravatar Robert C. Helling
Try to recompute cylinder start and end pressures from sample data. Signed-off-by: Robert C. Helling <helling@atdotde.de>
2018-07-04Translations: unify gettextFromC::tr() and QObject::tr()Gravatar Berthold Stoeger
There were two catch-all classes for translations outside of class context. gettextFromC was used exclusively from C, but C++ used both, gettextFromC and QObject. Some of the string were even present in both. Therefore, unify to gettextFromC throughout the code base. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-04core: remove double definition of enum cloud_storage_statusGravatar jan Iversen
Remove cloud_storage_status from qmlprefs.h. usage to qPref:: enum cloud_storage_status is not used from C, but only from C++, and having the same structure defined multiple times is a maintenance challenge. Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-04core: add qPref.h_and qPrefprivate.hGravatar jan Iversen
add 2 header files and 1 cpp file (qPrefPrivate does not have an implementation) The rewrite/consoliadation of SettingsObjectWrapper, qmlmanager, qmlpref and planner needs a place to put common private parts (qPrefPrivate) and 1 common class (qPref). Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-04core: sort CMakeLists.txtGravatar jan Iversen
sort .c and .cpp files in CMakeLists.txt The .c and .cpp files in CMakeLists.txt had no obvious sequence, sorting it at least gives one understandable sequence Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-04core/profile: move PP_GRAPHS_ENABLED from pref.hGravatar jan Iversen
PP_GRAPHS_ENABLED is only used in profilewidget2.cpp make local to profilewidget.cpp Signed-off-by: Jan Iversen <jani@apache.org>core/profile: move PP_GRAPHS_ENABLED from pref.h
2018-07-04core: sort struct preferencesGravatar jan Iversen
sort prefs, making it possible to find variables add a few missing variables Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-03Codingstyle: fix typoGravatar Dirk Hohndel
Reported-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-03build-system: tell Travis to wait longer for downloadsGravatar Dirk Hohndel
But simply ignore when building outside of Travis. Of course since we are building Android in a container, we need to first pass the environment variable to the container... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-03build-system: add travis_wait shell functionsGravatar Dirk Hohndel
These come originally from https://github.com/travis-ci/travis-build and are available when running on Travis, but not when running inside a Docker container on Travis as we do in order to build for Android. The goal is to provide a quasi heart-beat on STDOUT during very long running commands - without this the wget to download Qt often times out, so that's where we are going to use this. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-07-04Codingstyle: add comment on "auto".Gravatar Berthold Stoeger
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-04Update CHANGELOG.mdGravatar Berthold Stoeger
Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-04Manual: Adapt description of "find moved images" functionalityGravatar Berthold Stoeger
Adapt description and add example image. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-04Dive pictures: implement FindMovedImagesDialogGravatar Berthold Stoeger
Move the find-moved-images functions into a new translation unit and present the user with the identified matches before applying them. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-07-04Dive pictures: remove hashesGravatar Berthold Stoeger
In the last commits, the canonical-to-local filename map was made independent from the image hashes and the location of moved images was based on filename not hashes. The hashes are now in principle unused (except for conversion of old-style local filename lookups). Therefore, remove the hashes in this commit. This makes addition of images distinctly faster. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>