aboutsummaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-07-12Divinglog import: in deco?Gravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: parse depth from databaseGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: import a bit more data from DBGravatar Miika Turkia
Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: basic dive info for DB importGravatar Miika Turkia
This parses the basic metadata of a dive when importing Divinglog database. (Discarding deleted dives is my best guess as I do not have that in my sample dive.) Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: hook up processing of .sql filesGravatar Miika Turkia
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Divinglog import: add .sql extension for importGravatar Miika Turkia
Generic divelog might come with the .sql extension, thus adding that to the file filter. Signed-off-by: Miika Turkia <miika.turkia@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12QML UI: use stackView to show sub windowsGravatar Dirk Hohndel
QML on Android doesn't support multiple windows, so dialogs that work on the desktop are not a good solution on Android. A much more natural way to present sub windows is a stackView. In order to do this Preferences needs to be an item and the structure of the ApplicationWindow needs to change a bit. This also removes the hard coded sizes and instead tries to design this in a resolution independent manner. The diff appears larger than the actual change because of an increase of indentation for the ApplicationWindow content. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12QML UI: improve preferences layoutGravatar Dirk Hohndel
And make it resolution independent. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12QML UI: start making things resolution independentGravatar Dirk Hohndel
Don't hard code sizes as devices tend to have much higher pixel density than desktop computers. Instead make sizes relative to the content. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12QML UI: set window size on desktop devicesGravatar Dirk Hohndel
On Android the app figures out the size by itself. Also change the name to match our naming scheme (Subsurface mobile for the QML UI). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-12Globe: Remove workarounds for ancient Marble versionsGravatar Dirk Hohndel
We build against our own Marble, anyway. So this isn't needed anymore. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-10Don't show the update messages in the mobile appGravatar Dirk Hohndel
Android provides update notifications already. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-10Cmake: use the mobile icon for Android apkGravatar Dirk Hohndel
The first attempt missed the second spot where this was set. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-10Geo taxonomy: add higher level notion of cityGravatar Dirk Hohndel
This renames the local name for the location as town and adds the concept of a city as the level 3 admin category. In some regions (e.g. at times in Italy) the local hamlet name is shown as toponymName but the name of the actual city is given as adminName3. With this change "city" will always reflect our best guess: adminName3 if it exists, otherwise the toponymName. Whereas "town" is always the toponymName. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-10Git storage: only show geo cat if there is a valueGravatar Dirk Hohndel
Otherwise we could get mangled data since the newline isn't printed. Now a good question would be "why do we have empty values in our data", but either way, we should write invalid data to the git repository. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-10QML UI: whitespace fixGravatar Grace Karanja
Fix some whitespace issues in the QMLManager and DiveListModel classes. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10QML UI: show dive details in TextBoxesGravatar Grace Karanja
Show the dive details in editable text boxes. This will make it easier for the user to edit the displayed information. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10QML UI: move the dive list to a separate fileGravatar Grace Karanja
Move the dive list qml code to a separate file for easier management. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10QML UI: Load dives from cloudGravatar Grace Karanja
Load dives from the Subsurface cloud service using the user's saved credentials. This will display the dives in the same way as loading them from a local file. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10QML UI: add button to show the preferences windowGravatar Grace Karanja
Add a button in the main qml file to show the preferences window. This window is linked to the QMLManager class, so any changes made will be saved to the user's settings file. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10QML UI: add QML Preferences DialogGravatar Grace Karanja
This will allow the user to edit and save their Subsurface cloud credentials. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-10QML UI: add cloud credential fields to the QMLManager classGravatar Grace Karanja
These fields will be used by the QML Ui to save/retrieve the user's cloud credentials. Signed-off-by: Grace Karanja <gracie.karanja89@gmail.com>
2015-07-09Use mobile icon for subsurface-mobileGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-09FAQ: add entry about shortcut keys on UbuntuGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-09Add 1x1 transparent png to replace missing marble dataGravatar Dirk Hohndel
Marble currently tries to open non-existent files, and the way it does that causes an annoying warning on the console. The new Subsurface version of Marble will instead open this invisible PNG file whenever it can't find the bitmap it is looking for. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-09Add different icon for mobile appGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-09Teach android build about subsurface-mobileGravatar Anton Lundin
This teaches android build.sh and cmake about how to build the qml ui of subsurface-mobile as a apk. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-09Teach divemode editing about multiple dc'sGravatar Anton Lundin
This teaches the edit divemode about the fact that we can have multiple dc's with different divemodes. The previous code always just edited the first dc. This was reported by Ian Pitt in: https://groups.google.com/forum/#!category-topic/subsurface-divelog/4Zf47KS4Ifk Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Use qt-android-cmake to produce a android apkGravatar Anton Lundin
This introduces code to use qt-android-cmake to produce a working apk. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Make the libssh linking optionalGravatar Anton Lundin
Due to bugs in libgit2, we force linking with libssh2 to add git-over-ssh support. On android we currency don't want libssh2 due to its dependency chain, so this makes the libssh2 force linking opt-out. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Update suggested versions in android build scriptGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Teach android build script out of tree buildsGravatar Anton Lundin
This teaches the android build script how to do out of tree builds. Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Upgrade libgit2 for androidGravatar Anton Lundin
Signed-off-by: Anton Lundin <glance@acc.umu.se> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Globe: another attempt to fix the globe zoomGravatar Dirk Hohndel
The fact that Marble doesn't tell us when it's done flying to the next point is making this excessively complicated to get right. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Build fix for older Qt5Gravatar Dirk Hohndel
This breaks for example on Ubuntu Trusty. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Use current dive site to get the informationGravatar Tomaz Canabrava
and not the displayed_dive_site. tsc. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Planner: redo the spacing of the prefsGravatar Joakim Bygdell
Divide the space eaqually to all three settings panels. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Correctly paint the statesGravatar Tomaz Canabrava
The state handling is a pain to do manually, but I can't really use the style painter because if I do that it would paint the string of the model (and that's something I don't wanna do) so I clear the text, draw the control, then I paint the stuff that I really need. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Use taxonomy or coords on the delegateGravatar Tomaz Canabrava
The Taxonomy text should be used if there's a taxonomy for the dive site. If there isn't, then use coords. If there's none, then nothing will appear on the bottom of the dive site name. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Better spacing on the delegateGravatar Tomaz Canabrava
Makes the location delegate pleasant to the eye. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Show the correct delegate on the completerGravatar Tomaz Canabrava
For some reason the completer wouldn't show the delegate if the line order of the code was different. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Planner: update disclamerGravatar Joakim Bygdell
Update the disclamer text to reflect which algorithm where used. [Dirk Hohndel: cleaned up coding style & replaced snprintf with strncat] Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Rename generic QT labelsGravatar Joakim Bygdell
Some QT objects in the planner ui files had generic label names. Give them proper names so we can see where they belong. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-08Planner: move notes options under gas optionsGravatar Joakim Bygdell
The notes optiopns are rather few, if we move them under the gas options we can save a bit of hirizontal space. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-07Allow to compile Subsurface with upstream libdivecomputerGravatar Dirk Hohndel
This will create an inconsistent build that has some UI features implying BT support but those will be non-functional. I don't think this is the right thing to do - either fail to build with a decent message or really remove the BT support. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-07Fix crash accessing freed memoryGravatar Dirk Hohndel
That one should have been quite obvious. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-07Build script: use mirror on our git serverGravatar Dirk Hohndel
gitorious is going away and the project doesn't appear to have migrated anywhere, yet. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-07Planner: fix tab stop orderGravatar Joakim Bygdell
Fixes the tab stop order on the planner settings page. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-07Planner: disable unrelated planner settingsGravatar Joakim Bygdell
When VPM-B is the choosen deco algorithm changing, GF low and high have no effect. So lets disable them similar to what we do for recreational mode. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-07-07Planner: GUI changes for improved clarityGravatar Joakim Bygdell
Restructure planner GUI for improved clarity of how settings are related. Signed-off-by: Joakim Bygdell <j.bygdell@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>