mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-11-28 13:10:19 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/packaging/ios/Subsurface-mobile.pro

265 lines
8.3 KiB
Prolog
Raw Normal View History

iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
TEMPLATE = app
QT += qml quick quickcontrols2 widgets positioning concurrent svg bluetooth
DEFINES += SUBSURFACE_MOBILE BT_SUPPORT BLE_SUPPORT
CONFIG += c++11
SOURCES += ../../subsurface-mobile-main.cpp \
ssrf: move functions from mobile-helper to mobile-main Move few mobile only functions from mobile-helper to mobile-main remove subsurface-mobile-helper file structure is now subsurface-*-main.cpp + subsurface-helper.cpp Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-11 10:54:00 +00:00
../../subsurface-helper.cpp \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../map-widget/qmlmapwidgethelper.cpp \
../../core/cloudstorage.cpp \
../../core/configuredivecomputerthreads.cpp \
../../core/devicedetails.cpp \
../../core/gpslocation.cpp \
../../core/imagedownloader.cpp \
../../core/downloadfromdcthread.cpp \
../../core/qtserialbluetooth.cpp \
../../core/plannernotes.c \
../../core/uemis-downloader.c \
Turn application state into enum The application state was encoded in a QByteArray. Thus, there was no compile-time checking. Typos would lead to silent failures. Turn the application state into an enum. Use the enum-class construct, so that the values don't polute the global namespace. Moreover, this makes them strongly typed, i.e. they don't auto-convert to integers. A disadvantage is that the enums now have to be cast to int explicitly when used to index an array. Replace two hash-maps in MainWindow to arrays of fixed sizes. Move the application-state details into their own files. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-05-10 17:51:43 +00:00
../../core/applicationstate.cpp \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../core/qthelper.cpp \
../../core/checkcloudconnection.cpp \
../../core/color.cpp \
../../core/configuredivecomputer.cpp \
../../core/divecomputer.cpp \
../../core/divelogexportlogic.cpp \
../../core/divesitehelpers.cpp \
../../core/errorhelper.c \
../../core/exif.cpp \
../../core/format.cpp \
../../core/gettextfromc.cpp \
../../core/metrics.cpp \
../../core/qt-init.cpp \
../../core/subsurfacesysinfo.cpp \
../../core/windowtitleupdate.cpp \
../../core/file.c \
../../core/subsurfacestartup.c \
../../core/ios.cpp \
../../core/profile.c \
../../core/device.c \
../../core/dive.c \
../../core/divelist.c \
../../core/gas-model.c \
../../core/gaspressures.c \
../../core/git-access.c \
../../core/liquivision.c \
../../core/load-git.c \
../../core/parse-xml.c \
../../core/parse.c \
../../core/import-suunto.c \
../../core/import-shearwater.c \
../../core/import-cobalt.c \
../../core/import-divinglog.c \
../../core/import-csv.c \
../../core/save-html.c \
../../core/statistics.c \
../../core/worldmap-save.c \
../../core/libdivecomputer.c \
../../core/version.c \
../../core/save-git.c \
../../core/datatrak.c \
../../core/ostctools.c \
../../core/planner.c \
../../core/save-xml.c \
../../core/cochran.c \
../../core/deco.c \
../../core/divesite.c \
../../core/equipment.c \
Cleanup: move gas-functions to own translation unit But only functions that operate only on gases. Functions concerning cylinders or dives remain in dive.c or are moved to equipment.c Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-06-04 11:52:48 +00:00
../../core/gas.c \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../core/membuffer.c \
../../core/sha1.c \
../../core/strtod.c \
Cleanup: move tag functions into own translation unit Make dive.h a bit slimmer. It's only a drop in the bucket - but at least when modifying tag functions not the *whole* application is rebuilt anymore. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-05-30 16:29:36 +00:00
../../core/tag.c \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../core/taxonomy.c \
../../core/time.c \
Cleanup: move trip-related functions into own translation unit These functions were spread out over dive.c and divelist.c. Move them into their own file to make all this a bit less monolithic. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-05-31 14:09:14 +00:00
../../core/trip.c \
Cleanup: move unit-related functions to own translation unit Create a units.c translation unit. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-06-04 07:05:17 +00:00
../../core/units.c \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../core/uemis.c \
../../core/btdiscovery.cpp \
../../core/connectionlistmodel.cpp \
../../core/qt-ble.cpp \
core: add qPref.h_and qPrefprivate.h 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-06-16 14:03:31 +00:00
../../core/settings/qPref.cpp \
core: create qPrefCloudStorage from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct preferences - set function have set_<name> (from struct preferences>) - signal function have <name>_changed (from struct preferences>) 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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12 19:01:31 +00:00
../../core/settings/qPrefCloudStorage.cpp \
core: copy Display from SettingsObjectWrapper to qPref as its own class 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-06-15 08:53:42 +00:00
../../core/settings/qPrefDisplay.cpp \
core: create qPrefDiveComputer from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-15 16:15:40 +00:00
../../core/settings/qPrefDiveComputer.cpp \
core: create qPrefDivePlanner from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-01 15:14:04 +00:00
../../core/settings/qPrefDivePlanner.cpp \
core: create qPrefGeneral from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-12 15:57:45 +00:00
../../core/settings/qPrefGeneral.cpp \
core: create qPrefGeocoding from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct preferences - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-06 17:25:06 +00:00
../../core/settings/qPrefGeocoding.cpp \
core: create qPrefLanguage from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct preferences - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-06 17:39:35 +00:00
../../core/settings/qPrefLanguage.cpp \
core: create qPrefLocationService from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct prefs - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-05 13:59:28 +00:00
../../core/settings/qPrefLocationService.cpp \
core: create qPrefPartialPressureGas from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-10 19:18:40 +00:00
../../core/settings/qPrefPartialPressureGas.cpp \
core: remove QSettings in qPref* and use a shared variable Add qPrefPrivate class which contains one QSettings variable, delete QSettings from qPref* class definitions this secures there are only instance of QSettings (QSettings needs to be in a QObject class to work) Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-17 13:22:51 +00:00
../../core/settings/qPrefPrivate.cpp \
core: create qPrefProxy from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct prefs - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-27 08:25:43 +00:00
../../core/settings/qPrefProxy.cpp \
core: create qPrefTechnicalDetails from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-04 10:02:29 +00:00
../../core/settings/qPrefTechnicalDetails.cpp \
core: create qPrefUnit from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-31 13:04:12 +00:00
../../core/settings/qPrefUnit.cpp \
core: create qPrefUpdateManager from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-03 17:24:53 +00:00
../../core/settings/qPrefUpdateManager.cpp \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../core/subsurface-qt/CylinderObjectHelper.cpp \
../../core/subsurface-qt/DiveObjectHelper.cpp \
Build: add DiveListNotifier.cpp to qmake project file In the future, we will need DiveListNotifier.cpp in mobile builds. Therefore, add it to the qmake project file for iOS. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-04-10 18:09:39 +00:00
../../core/subsurface-qt/DiveListNotifier.cpp \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../mobile-widgets/qmlmanager.cpp \
mobile: add qmlprefs class add class to cmake and pro register class Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-12 08:29:40 +00:00
../../mobile-widgets/qmlprefs.cpp \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../qt-models/divelistmodel.cpp \
../../qt-models/diveplotdatamodel.cpp \
../../qt-models/gpslistmodel.cpp \
../../qt-models/completionmodels.cpp \
../../qt-models/divelocationmodel.cpp \
../../qt-models/maplocationmodel.cpp \
../../qt-models/diveimportedmodel.cpp \
../../qt-models/messagehandlermodel.cpp \
profile: make profile self contained move qmlprofile.* to profile dir, to keep all parts of the widget in one place. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08 10:56:23 +00:00
../../profile-widget/qmlprofile.cpp \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../profile-widget/divecartesianaxis.cpp \
../../profile-widget/diveeventitem.cpp \
../../profile-widget/diveprofileitem.cpp \
../../profile-widget/profilewidget2.cpp \
../../profile-widget/ruleritem.cpp \
../../profile-widget/animationfunctions.cpp \
../../profile-widget/divepixmapitem.cpp \
../../profile-widget/divetooltipitem.cpp \
../../profile-widget/tankitem.cpp \
../../profile-widget/divelineitem.cpp \
../../profile-widget/diverectitem.cpp \
../../profile-widget/divetextitem.cpp
mobile: remove MapWidget from mobile-resources.qrc remove MapWidget entries from mobile-resources.qrc, and reference map-widget.qrc in Subsurface-mobile.pro for iOS Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-20 13:53:59 +00:00
RESOURCES += ./qml.qrc \
../../mobile-widgets/qml/mobile-resources.qrc \
../../map-widget/qml/map-widget.qrc \
./translations.qrc
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
LIBS += ./install-root/lib/libdivecomputer.a \
./install-root/lib/libgit2.a \
./install-root/lib/libzip.a \
./install-root/lib/libxslt.a \
ios: concentrate build dirs update build.sh to make all builds in build-ios to keep the git dir as clean as possible Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08 15:52:11 +00:00
./build-ios/googlemaps-build/libqtgeoservices_googlemaps.a \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
-liconv \
-lsqlite3 \
-lxml2
INCLUDEPATH += ./install-root/include/ \
./install-root/lib/libzip/include \
./install-root/include/libxstl \
./install-root/include/libexstl \
./install-root/include/openssl \
../.. \
../../core \
../../mobile-widgets/qml/kirigami/src/libkirigami \
/usr/include/libxml2
HEADERS += \
../../core/libdivecomputer.h \
../../core/cloudstorage.h \
../../core/configuredivecomputerthreads.h \
../../core/device.h \
../../core/devicedetails.h \
../../core/dive.h \
../../core/git-access.h \
../../core/gpslocation.h \
../../core/imagedownloader.h \
../../core/pref.h \
../../core/profile.h \
../../core/qthelper.h \
../../core/save-html.h \
../../core/statistics.h \
../../core/units.h \
../../core/version.h \
../../core/planner.h \
../../core/divesite.h \
../../core/checkcloudconnection.h \
../../core/cochran.h \
../../core/color.h \
../../core/configuredivecomputer.h \
../../core/datatrak.h \
../../core/deco.h \
../../core/display.h \
../../core/divecomputer.h \
../../core/divelist.h \
../../core/divelogexportlogic.h \
../../core/divesitehelpers.h \
../../core/exif.h \
../../core/file.h \
../../core/gaspressures.h \
../../core/gettext.h \
../../core/gettextfromc.h \
../../core/membuffer.h \
../../core/metrics.h \
../../core/qt-gui.h \
../../core/sha1.h \
../../core/strndup.h \
../../core/subsurfacestartup.h \
../../core/subsurfacesysinfo.h \
../../core/taxonomy.h \
../../core/uemis.h \
../../core/webservice.h \
../../core/windowtitleupdate.h \
../../core/worldmap-options.h \
../../core/worldmap-save.h \
../../core/downloadfromdcthread.h \
../../core/btdiscovery.h \
../../core/connectionlistmodel.h \
../../core/qt-ble.h \
core: add qPref.h_and qPrefprivate.h 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-06-16 14:03:31 +00:00
../../core/settings/qPref.h \
core: create qPrefCloudStorage from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct preferences - set function have set_<name> (from struct preferences>) - signal function have <name>_changed (from struct preferences>) 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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-12 19:01:31 +00:00
../../core/settings/qPrefCloudStorage.h \
core: copy Display from SettingsObjectWrapper to qPref as its own class 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-06-15 08:53:42 +00:00
../../core/settings/qPrefDisplay.h \
core: create qPrefDiveComputer from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-15 16:15:40 +00:00
../../core/settings/qPrefDiveComputer.h \
core: create qPrefDivePlanner from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-01 15:14:04 +00:00
../../core/settings/qPrefDivePlanner.h \
core: create qPrefGeneral from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-12 15:57:45 +00:00
../../core/settings/qPrefGeneral.h \
core: create qPrefGeocoding from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct preferences - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-06 17:25:06 +00:00
../../core/settings/qPrefGeocoding.h \
core: create qPrefLanguage from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct preferences - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-06 17:39:35 +00:00
../../core/settings/qPrefLanguage.h \
core: create qPrefLocationService from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct prefs - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-05 13:59:28 +00:00
../../core/settings/qPrefLocationService.h \
core: create qPrefPartialPressureGas from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-10 19:18:40 +00:00
../../core/settings/qPrefPartialPressureGas.h \
core: remove QSettings in qPref* and use a shared variable Add qPrefPrivate class which contains one QSettings variable, delete QSettings from qPref* class definitions this secures there are only instance of QSettings (QSettings needs to be in a QObject class to work) Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-17 13:22:51 +00:00
../../core/settings/qPrefPrivate.h \
core: create qPrefProxy from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct prefs - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-27 08:25:43 +00:00
../../core/settings/qPrefProxy.h \
core: create qPrefTechnicalDetails from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-04 10:02:29 +00:00
../../core/settings/qPrefTechnicalDetails.h \
core: create qPrefUnit from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-07-31 13:04:12 +00:00
../../core/settings/qPrefUnit.h \
core: create qPrefUpdateManager from SettingsObjectWrapper Update set/get functions to follow common name scheme: - get function have same name as in struct diveComputer - set function have set_<name> - signal function have <name>_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 only defines the class, it is not active in production Signed-off-by: Jan Iversen <jani@apache.org>
2018-08-03 17:24:53 +00:00
../../core/settings/qPrefUpdateManager.h \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../core/subsurface-qt/CylinderObjectHelper.h \
../../core/subsurface-qt/DiveObjectHelper.h \
Build: add DiveListNotifier.cpp to qmake project file In the future, we will need DiveListNotifier.cpp in mobile builds. Therefore, add it to the qmake project file for iOS. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-04-10 18:09:39 +00:00
../../core/subsurface-qt/DiveListNotifier.h \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../mobile-widgets/qmlmanager.h \
mobile: add qmlprefs class add class to cmake and pro register class Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-12 08:29:40 +00:00
../../mobile-widgets/qmlprefs.h \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../map-widget/qmlmapwidgethelper.h \
../../qt-models/divelistmodel.h \
../../qt-models/diveplotdatamodel.h \
../../qt-models/gpslistmodel.h \
../../qt-models/divelocationmodel.h \
../../qt-models/completionmodels.h \
../../qt-models/weightsysteminfomodel.h \
../../qt-models/maplocationmodel.h \
../../qt-models/diveimportedmodel.h \
../../qt-models/messagehandlermodel.h \
profile: make profile self contained move qmlprofile.* to profile dir, to keep all parts of the widget in one place. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08 10:56:23 +00:00
../../profile-widget/qmlprofile.h \
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
../../profile-widget/diveprofileitem.h \
../../profile-widget/profilewidget2.h \
../../profile-widget/ruleritem.h \
../../profile-widget/diveeventitem.h \
../../profile-widget/divetooltipitem.h \
../../profile-widget/tankitem.h \
../../profile-widget/animationfunctions.h \
../../profile-widget/divecartesianaxis.h \
../../profile-widget/divelineitem.h \
../../profile-widget/divepixmapitem.h \
../../profile-widget/diverectitem.h \
../../profile-widget/divetextitem.h
# Additional import path used to resolve QML modules in Qt Creator's code model
QML_IMPORT_PATH =
# Default rules for deployment.
include(./deployment.pri)
include(../../mobile-widgets/qml/kirigami/kirigami.pri)
# Supress some warnings
build-system: iOS only turn off specific warnings Turning off all warnings (-w) was too radical. Only turning off specific warnings. Signed-off-by: Jan Iversen <jani@apache.org>
2018-05-21 06:12:40 +00:00
QMAKE_CXXFLAGS += -Wno-shorten-64-to-32 -Wno-missing-field-initializers
QMAKE_CFLAGS += -Wno-shorten-64-to-32 -Wno-missing-field-initializers
iOS: get rid of ios/Subsurface-mobile Having a split between ios and ios/Subsurface-mobile is just confusing and without a practical reason Move files from ios/Subsurface-mobile to ios and update .gitignore Signed-off-by: Jan Iversen <jani@apache.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-05-20 10:57:14 +00:00
ios {
QMAKE_ASSET_CATALOGS += ./storeIcon.xcassets
app_launch_images.files = ./SubsurfaceMobileLaunch.xib $$files(./SubsurfaceMobileLaunchImage*.png)
images.files = ../../icons/subsurface-mobile-icon.png
QMAKE_BUNDLE_DATA += app_launch_images images
QMAKE_INFO_PLIST = ./Info.plist
QMAKE_IOS_DEPLOYMENT_TARGET = 10.0
}
Reference in a new issue Copy permalink