aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2018-06-17Fix an error around translation of dive modes in the UIGravatar Stefan Fuchs
This fixes an mistake introduced in 3d1072f8862e4c329dc2678df52a24137b8d4704 Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2018-06-17Enable translation for even name "modechange"Gravatar Stefan Fuchs
Enable translations for dive event name "modechange". But clearly don't do this for the string which is used internally but only push "modechange" to the translation system to be able to translate it in the UI. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2018-06-17Remove a useless translation in diveeventitem.cppGravatar Stefan Fuchs
Giving the string ": %1" to translation makes no sense. And it's also not consistent with code a few lines below this line. Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2018-06-17Code cleanup: Correct typo "Swith" to "Switch"Gravatar Stefan Fuchs
Signed-off-by: Stefan Fuchs <sfuchs@gmx.de>
2018-06-17desktop: better handling of progress dialog widthGravatar Dirk Hohndel
We shouldn't need to manually set it, but it appears we do. To avoid constant resizing, let's only grow it - and let's set the size before we update the text. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-16Cleanup: Don't clear WA_QuitOnClose attribute on dialogsGravatar Berthold Stoeger
According to Qt's documentation, the application exits if all windows with the WA_QuitOnClose attribute are closed. This attribute was cleared for three dialogs. This seems not necessary because: 1) The application can't be closed as long as the modal dialog is shown. 2) The flag only concerns primary windows, which these are not. See: http://doc.qt.io/qt-5/qguiapplication.html#quitOnLastWindowClosed-prop Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-06-16mobile: fix reference to credentialStatus propertyGravatar Murillo Bernardes
Commit b8eb348f moved credentialStatus but missed one spot. When starting from a fresh install, clicking "No cloud mode” fails because of this. Signed-off-by: Murillo Bernardes <mfbernardes@gmail.com>
2018-06-16QML UI: fix variable referenceGravatar Dirk Hohndel
Looks like commit 807571a588 ("core: update deviceData default from qml") never actually was tested with dive computer download. This looks rather like an automatic renaming gone wrong. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-15DM5 import: support for larger sample sizeGravatar Miika Turkia
Suunto has updated SampleBlob to use 30 byte blobs. This adds support for the increased size. Note that this only parses the same fields we have parsed before. (Currently I have no idea what the increased size is used for.) Note also that I do not currently have data with the new format so I only tested this still works with old data. Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
2018-06-15Update translation source stringsGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-15mobile: move settings from qmlmanager to qmlprefsGravatar jan Iversen
add settings variables/functions to qmlprefs remove settings variables/functions from qmlmanager change manager. to prefs. in qml files for setting variables/functions Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-15mobile: move NOCLOUD_LOCALSTORAGE from qmlmanager.cpp to .hGravatar jan Iversen
Make NOCLOUD_LOCALSTORAGE public for other qml functions Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-15mobile: add qmlprefs classGravatar jan Iversen
add class to cmake and pro register class Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-15core: make prefs-macros compile safe.Gravatar jan Iversen
add {} in each macro to secure it works as a single statement, to avoid problems like if (1) GET_TEXT(); Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-15ssrf: add makefile at ssrf levelGravatar jan Iversen
add makefile at ssrf level to ease make calls it can be called as: make make all - will generate both desktop and mobile make mobile - will mobile make - will generate desktop Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-13Dive pictures: Make failure of loading images less noisyGravatar Berthold Stoeger
For debug reasons, failure to load the original image was spilled to the console, even if the local file was then found. Only print a message, when also the local image failed loading. This needed a bit of code reshuffling. To know when to print a failed-loading message, the URL is now checked at the Thumbnailer level, not the ImageDownloader level. The ImageDownloader is passed the URL and the original filename (if different). The image is loaded from the URL, but the signals send the original filename, so that the thumbnail can be associated to the proper image. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-06-13documentation: add mail conversion to .mailmapGravatar jan Iversen
change to use correct mail addr. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-13[snap] add raw-usb interfaceGravatar Michał Sawicz
With snapd 2.33 it will allow working with /dev/ttyUSB* devices: https://github.com/snapcore/snapd/pull/5282 Signed-off-by: Michał Sawicz <michal@sawicz.net>
2018-06-13[snap] update to base on core18Gravatar Michał Sawicz
Signed-off-by: Michał Sawicz <michal@sawicz.net>
2018-06-13Add snap packagingGravatar Michał Sawicz
Signed-off-by: Michał Sawicz <michal@sawicz.net>
2018-06-11ios: add -all to build.shGravatar jan Iversen
-all will build debug and release for the choosen architectures armv7,arm64,x86_64 without extra parameter and only x86_64 with -simulator Use -all to prebuild all 6 variants we support. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-11Mobile: correct wrong C++ ref in qmlGravatar jan Iversen
change data() to manager. correct comboDevice -> comboConnection Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09core: remove qml properties from downloadfromcthreadGravatar jan Iversen
Remove Q_OBJECT and qml properties from DCDeviceData class Remove DCDeviceData register from mobile-helper.cpp Change DCDeviceData constructor to be without parameters Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09core: update deviceData default from qmlGravatar jan Iversen
remove setting default in qml to C++ Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09mobile: add DCDeviceData properties to qmlmanagerGravatar jan Iversen
add DCDeviceData qml properties etc. to qmlmanager Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09core: remove qml properties from desktop compileGravatar jan Iversen
add #ifdef SUBSURFACE_MOBILE to secure qml macros are not compiled with desktop Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09mobile: remove context iconsGravatar jan Iversen
Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09mobile: remove png/svg icons not usedGravatar jan Iversen
Delete icons that are taken from kirigami Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09build-system: download libzip from our own serverGravatar Dirk Hohndel
The libzip.org server often times out and causes build failures. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2018-06-09ios: concentrate build dirsGravatar jan Iversen
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-09ios: share clones with desktopGravatar jan Iversen
Change src dir for clones to subsurface/.. in order to share with desktop Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09profile: make profile self containedGravatar jan Iversen
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-09profile: clean double calls on mobile versionGravatar jan Iversen
Expanded #ifdef MOBILE with #else so that settings are only called once. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09mobile: clean use of DiveId in qmlprofileGravatar jan Iversen
Remove unused signal and simplify qml access to m_diveId Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09mobile: do not call plotDive during startupGravatar jan Iversen
Check in profile if visible before calling plotDive Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09mobile: white space clean in DiveDetailsView.qmlGravatar jan Iversen
Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-09Cleanup: make lastUsedDir() functions static and non-slot, respectivelyGravatar Berthold Stoeger
The lastUsedDir() functions of MainWindow and Smrtk2ssrfcWindow don't use any member-objects and are only used in their respective translation units. Therefore, remove them from the class and made of static linkage. The lastUsedImageDir() function was declared as a slog, which makes no sense. Make it a normal static function (though one might argue why it is assiociated with the DiveListView class in the first place). Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-06-08mobile: decoupled ssrf.qrc and mobile.qrcGravatar jan Iversen
remove /subsurface.qrc from .pro copy missing mapwidget icon references to mobile-resources.pro Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08mobile: main.qml, change load of dive.jpgGravatar jan Iversen
change load of dive.jpg to reflect new location. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08mobile: mobile unreferenced ic iconsGravatar jan Iversen
Remove 24px icons not referenced. update README.license Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08mobile: remove unneeded alias from mobile-resourcesGravatar jan Iversen
remove alias where alias == file rename *24px* icons and remove alias Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08mobile: clean qml dir (move dive.jpg to icons)Gravatar jan Iversen
Cleanup qml dir by moving dive.jpg to the icon dir Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08mobile: sort mobile-resources.qrcGravatar jan Iversen
Sort to make it easier to read. Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-08Provide correct cylinder pressures for bailout divesGravatar Willem Ferguson
Calculate the correct cylinder pressures for rebreather dives with bailout. Currently the cylinder pressures for a dive are calculated assuming a single dive mode for that dive. Bailout indroduces more than one dive mode for a single dive, i.e. transitions from CCR or PSCR to OC and back. Currently the start and end pressures for each cylinder are used to interpolate cylinder pressures while that cylinder is used. However, the different gas consumption rates for OC, PSCR and CCR are not taken into account in this interpolation and the cylinder pressure is indicated by an averaged interpolation accross the rebreather and OC legs of the dive. Consequently the increased drop in cylinder pressure during OC is not shown. This PR allows differentiation between CCR/PSCR legs of the dive and the OC bailout segments, showing realistic interpolation that indicate the increased rate of gas use during OC. Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
2018-06-07mobile: correct comboProduct if model changesGravatar jan Iversen
update onModelChanged in comboProduct to read the current index Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-07iOS: move get-dep-lib outside ARCH loopGravatar jan Iversen
Fetch all 3rd party libs before entering ARCH loop Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-07Dive pictures: remove cache_picture() call in dive_add_picture()Gravatar Berthold Stoeger
When adding a picture to a dive, cache_picture() was called, which calculated the hash of the picture in a background-thread. This made tests occasionally fail, because the tests depended on the filename-to-localfilename being overwritten in a call running in a different thread. Depending on which thread finished first, the test succeeded or failed. The easiest way to circumvent this problem is to remove the cache_picture() call. The hash will be calculated anyway with the thumbnails. And the only function of the hash is the "find moved images" function. Which is not an issue here, because the user just loaded the images from disk. Reported-by: Jan Iversen <jani@apache.org> Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>
2018-06-06Bugfix: Load PSC dive logsGravatar Willem Ferguson
The code changes to standardise the named of divemodes and to separate internal divemode names and UI divemode names introduced a bug that caused non-backward compatability with existing dive logs. The reason for this is the definition of the divemode_text strings in dive.c This change reverses that definition and brings about correct loading of PSCR dive logs as well as correct parsing of bailout events involving PSCR. Signed-off-by: Willem Ferguson <willemferguson@zoology.up.ac.za>
2018-06-05core: remove "static void copyPath" unusedGravatar jan Iversen
Remove copyPath since it is static and not called to avoid clang warning Signed-off-by: Jan Iversen <jani@apache.org>
2018-06-04Dive picture: fix toggling of picture-visibilityGravatar Berthold Stoeger
In a recent commit, the profile widget was changed to reuse DivePictureItems. This made toggling of picture-visibility disfunctional, because the visibility was set in the constructor. Only on change of dive would the setting take effect. Therefore, move the setting of the visibility up to the ProfileWidget2::plotPictures() call. This is more consistent anyway, since at this level pixmap and fileUrl are set. Signed-off-by: Berthold Stoeger <bstoeger@mail.tuwien.ac.at>