aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-07-22Always use "csv" parsing for SeabearGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-22Strip unit from Seabear sample interval valueGravatar Miika Turkia
XSLT parsing treats this as numeric value, thus we need to strip out the " s" part. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-22Fix Seabear import if line ends with NLGravatar Miika Turkia
We need to start second search from the start of the buffer if \r\n search returns nothing. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-22Add a known type for second DC on APD importGravatar Miika Turkia
This patch adds importing of sensor values from the second DC on APD log import. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-22Import sensor values for autodetected APD filesGravatar Miika Turkia
If APD Log Viewer format is automatically detected, we should set the sensor values to be imported properly. These need to be added to the firstline and since we convert the number 2 from column headers to subscript, this step must be skipped for the APD import. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-22CSV import test wrong valuesGravatar Miika Turkia
We need to test for the sensor values on CSV import, not the po2. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-22Clean hard coded values on divelog CSV importGravatar Miika Turkia
Hard coding the values of known imports is quite awkward if we add these. Thus switching to use enum and names instead. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-22Increase the recursion for Seabear CSV importGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-22Cloud storage: enable password updateGravatar Dirk Hohndel
This now allows the user to set a new password for the cloud service. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-22QML UI: Sort dives by dateGravatar Grace Karanja
Sort the dives by date, with the latest one appearing before the others. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-22Add UI for cloud password changeGravatar Dirk Hohndel
This isn't hooked up yet, just the UI elements. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-22QML UI: Move DiveDetails to the StackViewGravatar Grace Karanja
Add a DiveDetails.qml to hold the dive details, and display it in the stack view when the user taps on a dive. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-22QML UI: Implement saving of cloud passwordGravatar Grace Karanja
If the user ticks the 'Save Password' box, then we save the password for future use. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-21Add setpoint support for CSV importGravatar Miika Turkia
The import of setpoint values is tested with Seabear data. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-21Add setpoint support on CSV import (XSLT parsing)Gravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-21Default to first tab on exportGravatar Miika Turkia
The divelog export dialog was changed to default to the HTML export when changing the layout to resemble other dialogs (commit 42acaa40). However, the default tab should be the first one with most of the export formats and options. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Use correct colors on selectionGravatar Tomaz Canabrava
I was wondering why the colors where wrong on mac, it took me a while to find the correct spot to fix. It seems that the Brush is not used to paint the fonts, but the Pen is. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Try to fix paint issues on windowsGravatar Tomaz Canabrava
Davide complained about a flickr on windows, I think it has to do with the QPainter now knowing the right size of it's paint rect. this should fix it. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Code uneeded because the drawControw does this by itselfGravatar Tomaz Canabrava
Removing dead code. the call above this does that already. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Documentation: update french translation of user-manualGravatar Guillaume GARDET
Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Add tooltip for geolocation lookupGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Only enable Bluetooth support if building against Qt5.4 or newerGravatar Dirk Hohndel
Also remove the quick hack from commit 947fda14c5d1 ("Bluetooth support: quick build fix for Qt5.2"). I should have thought this through before pushing that commit, but oh well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Bluetooth support: quick build fix for Qt5.2Gravatar Dirk Hohndel
The InvalidBluetoothAdapterError error code wasn't introduced until Qt5.3, so let's not test for it on older versions of Qt. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Merge branch 'custom-print' of github.com:neolit123/subsurfaceGravatar Dirk Hohndel
2015-07-20Enable Android build on MacGravatar Joakim Bygdell
This Changes the NDK, SDK, JAVA_HOME and ant to the appropriate versions and locations when the script runs on a Mac. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Update the message shown on pairing erorrsGravatar Claudiu Olteanu
Advice the user to use his operating system for the pairing step if the remote device requires a custom PIN code. Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Fix typos on Bluetooth selection widgetGravatar Claudiu Olteanu
Fix "lable" typos from Bluetooth selection widget. Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Hide the local BT combobox if there is only one deviceGravatar Claudiu Olteanu
If there is only one local Bluetooth adapter, then hide the selection combobox and the label. Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Use SPP's uuid to connect to a device on Apple platformsGravatar Claudiu Olteanu
Use the uuid of the Serial Port Profile service to connect to a remote Bluetooth device on OS X (and iOS) platforms with a Qt version greater than 5.5.0. In the future the same section should be used for BT connectivity on Linux platforms. Currently there is a problem with the SDP discovery and it doesn't work as expected. [Dirk Hohndel: modified OS check for consistency] Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Don't close the BT selection Widget if the local BT adapter is invalidGravatar Claudiu Olteanu
Don't close the Bluetooth selection widget if the default local Bluetooth adapter is invalid. Maybe there is a problem with the default Bluetooth device and the user has another one (a BT dongle) which can be used. If the selected device is invalid then update the UI information, disable the available buttons and announce the user about the problem. Also move the device changed logging message before we call the update information method. In this way the logging message with the problem will not be overwritten. Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Log errors which occur during Bluetooth device discoveryGravatar Claudiu Olteanu
Register to the signal emmited when an error occurs during Bluetooth device discovery and log a description of the error which can be used to identify problem's cause. Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Reinitialize the BT discovery agent when a new adapter is selectedGravatar Claudiu Olteanu
Reinitialize the Bluetooth device discovery agent when the user selects a new local Bluetooth adapter using the address of the selected device. Before this patch the agent was always using the local default Bluetooth adapter. Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Add combobox for Bluetooth local device selectionGravatar Claudiu Olteanu
Add a combobox which can be used to list/select the available local Bluetooth devices. In this way, if a user has more than one local Bluetooth devices (integrated, dongles, etc.) he can choose which one he wants to use. Before this patch, only the default local Bluetooth device could be used. Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Don't block the save button for Bluetooth device selectionGravatar Claudiu Olteanu
After commit 619e97ee4fcd ("Stop the SDP agent if the Clear/Save button was pressed") we don't need to block the save button anymore for scanning completion because the SDP agent will be stopped manually if the Save button was pressed. Signed-off-by: Claudiu Olteanu <olteanu.claudiu@ymail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-20Printing: export grayscale filter value to templateGravatar Gehad elrobey
Export grayscale value to Grantlee template, So we must declare print_options as QMetatype. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: add css filter to templatesGravatar Gehad elrobey
Filter HTML body with grayscale value, add background-color to div inside body so filter can be applied to it. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: transfer profile to QImage if grayscaleGravatar Gehad elrobey
Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: add default case to switchGravatar Gehad elrobey
Add default case to fix switch warning. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: change 'Discard' to 'Cancel' buttonGravatar Gehad elrobey
Cancel button is more relevant to the dialog message. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: add custom color paletteGravatar Gehad elrobey
We can use custom color palette to edit current color palette. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: make templates support custom colorsGravatar Gehad elrobey
Use template_options colors instead of static colors. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: export color settings to grantleeGravatar Gehad elrobey
Export color palette selected to grantlee backend. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: save custom color palette to QSettingsGravatar Gehad elrobey
- save custom colors to QSettings. - load custom colors from QSettings. - set almond color palette as default palette. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: implement edit buttons in color tabGravatar Gehad elrobey
Add button group and attached edit buttons to it. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: show colors in edit tabGravatar Gehad elrobey
- Add default color struct - Init the color struct with default colors - Show color text in labels - Preview colors Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: add colors tab to edit windowGravatar Gehad elrobey
Select custom colors for print templates, by default there are five colors that can be used dynamically in prints. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: update preview on field changesGravatar Gehad elrobey
- Trigger re-rendering on the QPixmap if fields changed. - Change template selection to custom if template text changed. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: update preview on apply settingsGravatar Gehad elrobey
On update call Printer to render on the QPixmap. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: add apply button to TemplateEdit classGravatar Gehad elrobey
Add apply button to the dialog, Update the preview after applying the new settings. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
2015-07-20Printing: save only if data is changed in template_optionsGravatar Gehad elrobey
Check if data is changed before saving the new settings. Signed-off-by: Gehad elrobey <gehadelrobey@gmail.com> Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>