mifr/subsurface
1
0
Fork 0
mirror of https://github.com/subsurface/subsurface.git synced 2024-12-12 03:51:29 +00:00
Code Issues Projects Releases Packages Wiki Activity
subsurface/packaging/ios/Subsurface-mobile.pro

332 lines
11 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
build-system/iOS: create correct bundle ID If you are building your own flavor you'll need to change that, of course. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-02-16 23:56:57 +00:00
QMAKE_TARGET_BUNDLE_PREFIX = org.subsurface-divelog
QMAKE_BUNDLE = subsurface-mobile
build-system: iOS, activate qml compiler Activate use of qml compiler, which provides: - more error detection at compile time - fast qml - smaller footprint Signed-off-by: Jan Iversen <jani@apache.org>
2019-12-21 13:51:23 +00:00
CONFIG += qtquickcompiler
QTQUICK_COMPILER_SKIPPED_RESOURCES +=
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
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 \
mobile/undo: compile undo commands and call undo command for deletion. First steps towards full undo on mobile. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-11-14 20:38:30 +00:00
../../commands/command_base.cpp \
../../commands/command.cpp \
../../commands/command_divelist.cpp \
../../commands/command_divesite.cpp \
../../commands/command_edit.cpp \
../../commands/command_edit_trip.cpp \
undo: implement undo of setting a picture time by drag&drop Even though the functionality is seemingly trivial, this is a bit invasive, as the code has to be split into two distinct parts: 1) Post undo command 2) React to changes to the divelist Don't compile that code on mobile. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-04-14 20:07:00 +00:00
../../commands/command_pictures.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/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/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 \
filter: compile fulltext index on mobile The code is not used yet. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-02-18 15:25:01 +00:00
../../core/fulltext.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/subsurfacestartup.c \
../../core/ios.cpp \
../../core/profile.c \
cleanup: fold core/divecomputer.cpp into core/device.c core/device.h was declaring a number of functions that were related to divecomputers (dcs): creating a fake dc for manually entered dives and registering / accessing dc nicknames. On could argue whether these should be lumped together, but it is what it is. However, part of that was implemented in C++/Qt code in a separate core/divecomputer.cpp file. Some function therein where only accessible to C++ and declared in core/divecomputer.h. All in all, a big mess. Let's simply combine the files and conditionally compile the C++-only functions depending on the __cplusplus define. Yes, that means turning device.c into device.cpp. A brave soul might turn the C++/Qt code into C code if they whish later on. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-09-13 17:08:41 +00:00
../../core/device.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/dive.c \
filter: compile fulltext index on mobile The code is not used yet. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-02-18 15:25:01 +00:00
../../core/divefilter.cpp \
filter: add filter constraint object to the core Adds a filter constraint object to the core, which represents one constraint the user can filter dives with. The plan is to write these constraints to the XML and git logs. Therefore, this code is written in C-style except when it comes to handling strings and dates, which is just too painful in plain C. There is one pointer to QStringList in the class, though when compiled with C, this is simply transformed into a pointer to void. Granted, that smells of an ugly hack. However it's more pragmatic than self-flaggelation with C string and list handling. A filter constraint is supposed to be a very general thing, which can filter for strings, multiple-choice lists, numerical ranges and date ranges. Range constraints have a range mode: less-or-equal, greater-or-equal or in-range. Text constraints have a string mode: startswith, substring or exact. All the data are accessed via setter and getter functions for at least basic levels of isolation, despite being written with a C-interface in mind. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-05-13 13:34:25 +00:00
../../core/filterconstraint.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/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 \
media: move picture function from dive.c to picture.c Currently, move only those functions that do not access dive structures. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-04-10 07:42:14 +00:00
../../core/picture.c \
media: add small C++ helper describing a picture struct By using a std::string instead of a C-string, memory management becomes so much simpler! This class will be used for keeping track of deleted/added pictures in the undo system. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-04-17 14:49:15 +00:00
../../core/pictureobj.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/import-suunto.c \
../../core/import-shearwater.c \
Implement Seac SeacSync databaser parser. Dives for the seac action computer are imported by the seacsync program into two tables in an sqlite3 database. The dive information is read from the headers_dive table. The dive_data table is then queried for each dive to get samples. The seac action computer is the only current supported computer by the seacsync program. It only supports two gas mixes, so the parser will toggle between two cylinders whenever it detects a change in the active O2 mix. Dive start time is stored in UTC with a timezone offset. A helper function to read this was added to qthelper. Default cases have been added to some switch statements to assist in future development for other dive types and salinity. Example database has been added to ./dives/TestDiveSeacSync.db Signed-off-by: James Wobser <james.wobser@gmail.com>
2020-07-17 01:40:46 +00:00
../../core/import-seac.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/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 \
Selection: move selection functions from divelist.c to selection.c Since we now have a selection.c translation unit, put the selection- related functions there. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-11-24 14:02:34 +00:00
../../core/selection.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/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 \
build-system: add uploadDiveShare to iOS build Update iOS project solution file Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-08 10:50:19 +00:00
../../core/uploadDiveShare.cpp \
build-system: add uploadDiveLogsDE to iOS build Update iOS project solution file Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-11-30 19:14:32 +00:00
../../core/uploadDiveLogsDE.cpp \
packaging/ios: add new export files in core to project Update Subsurface-mobile.pro to contain the new exportfuncs and referenced files. Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-11-20 17:12:20 +00:00
../../core/save-profiledata.c \
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 \
Preferences UI: final cleanup This commit does some final cleaning up to the code, mostly deleting white space and comments. Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-12 08:28:04 +00:00
../../core/settings/qPrefEquipment.cpp \
../../core/settings/qPrefLog.cpp \
../../core/settings/qPrefMedia.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 \
Cleanup: lower-case filenames in core/subsurface-qt/ We tend to use lower-case filenames. Let's do it for these files as well. Simple search & replace. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-02-03 18:33:06 +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 \
build-system: move exportfuncs to backend-shared WARNING: multi directory commit, needed to secure it builds. move the core/exportfuncs.* to backend-shared. update backend-shared/CMakeLists.txt to generate backend-shared lib update CMakeLists.txt to include backend-shared lib in link process. update ios project to reflect new directory Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-14 20:56:31 +00:00
../../backend-shared/exportfuncs.cpp \
build-system: move plannerShared to backend-shared WARNING: multi directory commit, needed to secure it builds. move the core/plannerShared.* to backend-shared. update CMakeLists.txt to include backend-shared lib in link process. update ios project to reflect new directory Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-14 22:12:26 +00:00
../../backend-shared/plannershared.cpp \
mobile-widgets: add pure interface for passing values to QML Add a header file that contains a duplicate of the enums, that are needed in QML in one class. the unit enums are added imidiatly, since they are needed or will be neede shortly in Settings and DivePlannerSettings This class will also contain Q_PROPERTY and signal/slot for variables used in QML. This is done to allow e.g. deco_mode qPrefUnits::planner_deco_mode() void qPrefUnits::set_planner_deco_mode(deco_mode) as strongly typed in C++ and DECO_MODE planner_deco_mode() void set_planner_deco_mode(DECO_MODE) as strongly typed in QML Remark: wrong assignments gives errors in QML The advantage over using strings or the value directly is that QML detects typos and flags them as errors/warnings. It is important to note that the class may only contain a) a function call to the implementation b) a reference to a global variable e.g. prefs. Added note to the original definitions of the enums that they have been duplicated. Signed-off-by: jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-01-04 08:26:09 +00:00
../../mobile-widgets/qmlinterface.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-widgets: add themeInterface Currently subsurfaceTheme resides in main.qml, where it does not naturally belong. Add C++ class that will replace subsurfaceTheme in main.qml in a 1-1 manner. This opens future posibilities - on top of the 3 themes, allow users to select colors/fonts - add stylesheets to Template* components - make day/night shift automatically. Signed-off-by: jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-11 15:13:01 +00:00
../../mobile-widgets/themeinterface.cpp \
mobile/summary: create DiveSummaryModel Instead of passing the dive summary via a completely unstructured QStringList to QML, implement a dynamic model. For potential reuse on desktop (though somewhat unlikely) the model has two interfaces, one for QtWidgets and one for QML. The former is based on columns, whereas the later is based on roles. The number of columns is set dynamically. The roles currently support access to two columns. If more columns should be accessed from QML, more roles have to be added manually. This commit only creates the model and hooks it into QMLs global context, but does not yet change the QML page. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-02-08 11:06:57 +00:00
../../qt-models/divesummarymodel.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/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 \
build-system: add missing models for iOS build Append missing models to Qt creator project Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-16 09:08:40 +00:00
../../qt-models/diveplannermodel.cpp \
mobile/divelist: add first version of new MobileListModel proxy model Create a model which represents all top-level items and, potentially, one expanded trip as a flat list. Pass down roles to the source model and let the source model handle that. We'll have to do some ifdef-ery, but so be it. Additionally, compile the base model on mobile as well. This contains a couple of hacks to make things compile at all. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-11-11 20:16:48 +00:00
../../qt-models/divetripmodel.cpp \
../../qt-models/mobilelistmodel.cpp \
build-system: add missing models for iOS build Append missing models to Qt creator project Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-16 09:08:40 +00:00
../../qt-models/cylindermodel.cpp \
../../qt-models/cleanertablemodel.cpp \
../../qt-models/tankinfomodel.cpp \
../../qt-models/models.cpp \
mobile/undo: compile WSInfoModel The weight-undo commands need this. Therefore, we have to compile the WSInfoModel if we want to access the undo commands from mobile. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-11 09:37:15 +00:00
../../qt-models/weightsysteminfomodel.cpp \
filter: add filter constraint model Add a model that keeps track of a list of filter constraint and makes them accessible from Qt. Sadly, this is mostly repetitive boiler-plate code, but this is due to Qt's model/view-API, which is a perfect example of how *not* to design a reasonable modern API. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-05-15 15:05:34 +00:00
../../qt-models/filterconstraintmodel.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
build-system: iOS, change location of install-root move from build-ios/install-root/<arch> to SSRF_CLONE/install-root/ios/<arch> move fat libraries, include and bin to SSRF_CLONE/install-root/ios Call "make" and not "make qmake_all" which is just a FORCE dependency. Signed-off-by: Jan Iversen <jani@apache.org>
2019-12-16 13:44:44 +00:00
LIBS += ../../../../install-root/ios/lib/libdivecomputer.a \
../../../../install-root/ios/lib/libgit2.a \
../../../../install-root/ios/lib/libzip.a \
../../../../install-root/ios/lib/libxslt.a \
build-system: iOS, change location of 3rd party builds move location of 3rd build to follow same pattern as desktop/mobile build update central .gitignore to silence libdivecomputer/build-ios, this should really be in libdivecomputer, but it is more easy to put it in a subsurface controlled file. Signed-off-by: Jan Iversen <jani@apache.org>
2019-12-17 10:47:21 +00:00
../../../../googlemaps/build-ios/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
build-system: iOS, change location of install-root move from build-ios/install-root/<arch> to SSRF_CLONE/install-root/ios/<arch> move fat libraries, include and bin to SSRF_CLONE/install-root/ios Call "make" and not "make qmake_all" which is just a FORCE dependency. Signed-off-by: Jan Iversen <jani@apache.org>
2019-12-16 13:44:44 +00:00
INCLUDEPATH += ../../../install-root/ios/include/ \
../../../install-root/lib/libzip/include \
../../../install-root/ios/include/libxstl \
../../../install-root/ios/include/libexstl \
../../../install-root/ios/include/openssl \
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 \
../../mobile-widgets/qml/kirigami/src/libkirigami \
/usr/include/libxml2
HEADERS += \
mobile/undo: compile undo commands and call undo command for deletion. First steps towards full undo on mobile. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-11-14 20:38:30 +00:00
../../commands/command_base.h \
../../commands/command.h \
../../commands/command_divelist.h \
../../commands/command_divesite.h \
../../commands/command_edit.h \
../../commands/command_edit_trip.h \
undo: implement undo of setting a picture time by drag&drop Even though the functionality is seemingly trivial, this is a bit invasive, as the code has to be split into two distinct parts: 1) Post undo command 2) React to changes to the divelist Don't compile that code on mobile. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-04-14 20:07:00 +00:00
../../commands/command_pictures.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/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 \
media: move picture function from dive.c to picture.c Currently, move only those functions that do not access dive structures. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-04-10 07:42:14 +00:00
../../core/picture.h \
media: add small C++ helper describing a picture struct By using a std::string instead of a C-string, memory management becomes so much simpler! This class will be used for keeping track of deleted/added pictures in the undo system. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-04-17 14:49:15 +00:00
../../core/pictureobj.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/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 \
filter: compile fulltext index on mobile The code is not used yet. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-02-18 15:25:01 +00:00
../../core/divefilter.h \
filter: add filter constraint object to the core Adds a filter constraint object to the core, which represents one constraint the user can filter dives with. The plan is to write these constraints to the XML and git logs. Therefore, this code is written in C-style except when it comes to handling strings and dates, which is just too painful in plain C. There is one pointer to QStringList in the class, though when compiled with C, this is simply transformed into a pointer to void. Granted, that smells of an ugly hack. However it's more pragmatic than self-flaggelation with C string and list handling. A filter constraint is supposed to be a very general thing, which can filter for strings, multiple-choice lists, numerical ranges and date ranges. Range constraints have a range mode: less-or-equal, greater-or-equal or in-range. Text constraints have a string mode: startswith, substring or exact. All the data are accessed via setter and getter functions for at least basic levels of isolation, despite being written with a C-interface in mind. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-05-13 13:34:25 +00:00
../../core/filterconstraint.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/divelist.h \
../../core/divelogexportlogic.h \
../../core/divesitehelpers.h \
../../core/exif.h \
../../core/file.h \
filter: compile fulltext index on mobile The code is not used yet. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-02-18 15:25:01 +00:00
../../core/fulltext.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/gaspressures.h \
../../core/gettext.h \
../../core/gettextfromc.h \
../../core/membuffer.h \
../../core/metrics.h \
../../core/qt-gui.h \
Selection: move selection functions from divelist.c to selection.c Since we now have a selection.c translation unit, put the selection- related functions there. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2019-11-24 14:02:34 +00:00
../../core/selection.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/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 \
packaging/ios: add new export files in core to project Update Subsurface-mobile.pro to contain the new exportfuncs and referenced files. Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-11-20 17:12:20 +00:00
../../core/save-profiledata.h \
build-system: add uploadDiveShare to iOS build Update iOS project solution file Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-08 10:50:19 +00:00
../../core/uploadDiveShare.h \
build-system: add uploadDiveLogsDE to iOS build Update iOS project solution file Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-11-30 19:14:32 +00:00
../../core/uploadDiveLogsDE.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 \
Preferences UI: final cleanup This commit does some final cleaning up to the code, mostly deleting white space and comments. Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-12 08:28:04 +00:00
../../core/settings/qPrefEquipment.h \
../../core/settings/qPrefLog.h \
../../core/settings/qPrefMedia.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 \
Cleanup: lower-case filenames in core/subsurface-qt/ We tend to use lower-case filenames. Let's do it for these files as well. Simple search & replace. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-02-03 18:33:06 +00:00
../../core/subsurface-qt/cylinderobjecthelper.h \
../../core/subsurface-qt/diveobjecthelper.h \
../../core/subsurface-qt/divelistnotifier.h \
build-system: move exportfuncs to backend-shared WARNING: multi directory commit, needed to secure it builds. move the core/exportfuncs.* to backend-shared. update backend-shared/CMakeLists.txt to generate backend-shared lib update CMakeLists.txt to include backend-shared lib in link process. update ios project to reflect new directory Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-14 20:56:31 +00:00
../../backend-shared/exportfuncs.h \
build-system: move plannerShared to backend-shared WARNING: multi directory commit, needed to secure it builds. move the core/plannerShared.* to backend-shared. update CMakeLists.txt to include backend-shared lib in link process. update ios project to reflect new directory Signed-off-by: Jan Iversen <jan@casacondor.com>
2019-12-14 22:12:26 +00:00
../../backend-shared/plannershared.h \
mobile-widgets: add pure interface for passing values to QML Add a header file that contains a duplicate of the enums, that are needed in QML in one class. the unit enums are added imidiatly, since they are needed or will be neede shortly in Settings and DivePlannerSettings This class will also contain Q_PROPERTY and signal/slot for variables used in QML. This is done to allow e.g. deco_mode qPrefUnits::planner_deco_mode() void qPrefUnits::set_planner_deco_mode(deco_mode) as strongly typed in C++ and DECO_MODE planner_deco_mode() void set_planner_deco_mode(DECO_MODE) as strongly typed in QML Remark: wrong assignments gives errors in QML The advantage over using strings or the value directly is that QML detects typos and flags them as errors/warnings. It is important to note that the class may only contain a) a function call to the implementation b) a reference to a global variable e.g. prefs. Added note to the original definitions of the enums that they have been duplicated. Signed-off-by: jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-01-04 08:26:09 +00:00
../../mobile-widgets/qmlinterface.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-widgets: add themeInterface Currently subsurfaceTheme resides in main.qml, where it does not naturally belong. Add C++ class that will replace subsurfaceTheme in main.qml in a 1-1 manner. This opens future posibilities - on top of the 3 themes, allow users to select colors/fonts - add stylesheets to Template* components - make day/night shift automatically. Signed-off-by: jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-02-11 15:13:01 +00:00
../../mobile-widgets/themeinterface.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 \
mobile/summary: create DiveSummaryModel Instead of passing the dive summary via a completely unstructured QStringList to QML, implement a dynamic model. For potential reuse on desktop (though somewhat unlikely) the model has two interfaces, one for QtWidgets and one for QML. The former is based on columns, whereas the later is based on roles. The number of columns is set dynamically. The roles currently support access to two columns. If more columns should be accessed from QML, more roles have to be added manually. This commit only creates the model and hooks it into QMLs global context, but does not yet change the QML page. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2020-02-08 11:06:57 +00:00
../../qt-models/divesummarymodel.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
../../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 \
build-system: add missing models for iOS build Append missing models to Qt creator project Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-16 09:08:40 +00:00
../../qt-models/diveplannermodel.h \
mobile/divelist: add first version of new MobileListModel proxy model Create a model which represents all top-level items and, potentially, one expanded trip as a flat list. Pass down roles to the source model and let the source model handle that. We'll have to do some ifdef-ery, but so be it. Additionally, compile the base model on mobile as well. This contains a couple of hacks to make things compile at all. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-11-11 20:16:48 +00:00
../../qt-models/divetripmodel.h \
../../qt-models/mobilelistmodel.h \
build-system: add missing models for iOS build Append missing models to Qt creator project Signed-off-by: Jan Iversen <jan@casacondor.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-16 09:08:40 +00:00
../../qt-models/cylindermodel.h \
../../qt-models/cleanertablemodel.h \
../../qt-models/tankinfomodel.h \
../../qt-models/models.h \
mobile/undo: compile WSInfoModel The weight-undo commands need this. Therefore, we have to compile the WSInfoModel if we want to access the undo commands from mobile. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2019-12-11 09:37:15 +00:00
../../qt-models/weightsysteminfomodel.h \
filter: add filter constraint model Add a model that keeps track of a list of filter constraint and makes them accessible from Qt. Sadly, this is mostly repetitive boiler-plate code, but this is due to Qt's model/view-API, which is a perfect example of how *not* to design a reasonable modern API. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-05-15 15:05:34 +00:00
../../qt-models/filterconstraintmodel.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: use -Wno-inconsistent-missing-override in Subsurface-mobile.pro The inconsistent-missing-override warning is annoying as it prevents us from adding "override" modifiers: It will warn if we do this only for selected functions. Sadly, this is the default on clang. Therefore, we disable this warning for quite some time in CMakeLists.txt. For consistency also do this in the Subsurface-mobile.pro file. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2020-04-01 16:32:50 +00:00
QMAKE_CXXFLAGS += -Wno-shorten-64-to-32 -Wno-missing-field-initializers -Wno-inconsistent-missing-override
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_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