summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-12-16Move run on build dir code out of the main cmakeGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Rework the dependencies on the Android platformGravatar Tomaz Canabrava
We where able to build the android-mobile on desktop and the desktop on android, now I allow only mobile on android and desktop on desktop. this is to make the cmake clear, and we can also use the emulator on the android platform, so nothing is really lost. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move adding -lpthreadGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Change the way we handle targetsGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16correct android usageGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Issue an error when no platform is foundGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Use a single variable to handle the extra Qt stuffGravatar Tomaz Canabrava
It's easier to debug what's wrong this way Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Remove commented out codeGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Remove the Dll finding code from within the Main CMakeGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16We don't need the same test twice for the same thing.Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Code CleanupGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16We don't support insource builds anymoreGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move include directories a bit down belowGravatar Tomaz Canabrava
Better to follow the CMake logic and se those near the sources Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move OSX code to OSX IFGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Rework Options order, add SUBSURFACE_TARGET_PLATFORM flag.Gravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move Handling of user manual to Modules directoryGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Handle VersionGeneration outside of the main CMakeFileGravatar Tomaz Canabrava
This is actually a good change: we used to write a new CMake file in configure time just to move it outside of the source to the build dir at compile time. Now this file is pre-created and it's only moved. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Move FTDI and Grantlee configuration out of CMakeLists.txtGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Add HandleFindMarble.cmakeGravatar Tomaz Canabrava
Marble stuff should be inside handleMarble file, this clears the Main CMakelists.txt file. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Added HandleFindLibDiveComputer.cmakeGravatar Tomaz Canabrava
Anoter attempt to clear the Main CMakeLists.txt file Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Add some commits to make cmake clearGravatar Tomaz Canabrava
Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Ensure Out of Source buildsGravatar Tomaz Canabrava
In source builds creates a lot of noise on the source tree, creating tons of temporaries that makes git status cry, and it also creates dangerous files that have names similar to actual source and could make a developer use them by mistake. Make out of source buiild mandatory to remove that, it also makes CMake code easier to read. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Start to clean the Main CMakeLists.txt filelGravatar Tomaz Canabrava
CMake is a strange and complex language for buildsystems, and as such we need to let the main CMakeLists.txt be as clear as possible. Moving a bunch of code that deals with finding git via default CMake way or pkg_cofig to a file named 'HandleFindGit' on our cmake/Modules folder. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com>
2015-12-16Update the bundled htlm user manualGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Corrected a typo in the User ManualGravatar Pedro Neves
Signed-off-by: Pedro Neves <nevesdiver@gmail.com> A small typo was corrected. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-16Small INSTALL file fixGravatar Dirk Hohndel
Mention another dependency to install on OpenSUSE Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-15Cmake: remove debug code that accidentially slipped inGravatar Dirk Hohndel
And try to fix the upper case / mixed case confusion that we apparently have with libssh2 - oh how I hate this stuff. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-15QML UI: show better message about dive list at startGravatar Dirk Hohndel
Now the message should make more sense. First it tells you that it's looking for dives. Then you get some progress during the git download, and error messages if things failed. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-15Remove support for older libgit2 - we now require 0.23 or laterGravatar Dirk Hohndel
Also fixes a capitalization error that prevented finding libssh2 in some circumstances. And adds a missing include when building with libzip on Mac. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-09Mac build: move the QtXml hack into CmakeGravatar Dirk Hohndel
This way build.sh can build a Subsurface.app that the user can use via open subsurface/build/Subsurface.app after running build.sh. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-09build.sh: don't build libssh2 anymore on MacGravatar Dirk Hohndel
I don't recall why this was needed, but things seem to work fine with the one avaialable via Homebrew Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-09Update the INSTALL file to list all required Homebrew packages on MacGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-08Dive model: use the correct time to set the time zone offsetGravatar Dirk Hohndel
We need to calculate the offset based on the time of the dive - the mobile version doesn't use displayed_dive. This way time stamps are now correct all year round. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-07QML-UI: make dive edit almost sort of workGravatar Dirk Hohndel
So this has a lot of caveats: - right now it only works for buddy, divemaster and suit - you have to actually exit the field with your cursor or the change doesn't take - that's ridiculous, there must be a far more clever way to do this - because I use the onEditingFinished handler I can't do this for the Notes (so here's another reason why I KNOW that this is the wrong way to do this) But it shows in principle how this could be done and once someone who actually knows what they are doing gets their hands on the code I'm optimistic that this can be morphed into something much more useful. It does tie together the changes made in the previous commits so that both clicking around on the dive list gives the expected results and synching the data back to the cloud actually works. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-07QML-UI: we need a way to update the dive modelGravatar Dirk Hohndel
Otherwise our UI will get out of sync with our dive list. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-07QML-UI: that's not how you compare char pointers...Gravatar Dirk Hohndel
Well, at least it doesn't what you think it does. Let's use our little helper to actually compare the strings. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-08Page margins for app logGravatar Sebastian Kügler
Adds consistent page margins also to Log page. Signed-off-by: Sebastian Kügler <sebas@kde.org>
2015-12-08sync with mobilecomponents f4d5d19fcGravatar Sebastian Kügler
- Kills a warning in ContextDrawer. - Improves sizing of menu icons. - Fixes icon rendering in menues. Signed-off-by: Sebastian Kügler <sebas@kde.org>
2015-12-08fix vertical alignment in divelistGravatar Sebastian Kügler
left and right of the items and the headings are now synced and consistent with other pages. Signed-off-by: Sebastian Kügler <sebas@kde.org>
2015-12-08delete CloudStorage.qmlGravatar Sebastian Kügler
File is unused, apparently a left-over from a rename. It's not included in the qrc and referenced nowhere, so it's safe to delete. Signed-off-by: Sebastian Kügler <sebas@kde.org>
2015-12-08Fix page margins in preferences and cloudcredentialsGravatar Sebastian Kügler
- page margins are gridUnit / 2, consistent with other pages - Simplify layout: we don't need to nest that much here, saves two objects and simplifies code a bit Signed-off-by: Sebastian Kügler <sebas@kde.org>
2015-12-08divelist polishGravatar Sebastian Kügler
- fix page margins (gridUnit / 2) - trip heading marker now stretches over the full length Signed-off-by: Sebastian Kügler <sebas@kde.org>
2015-12-08implement new menu structureGravatar Sebastian Kügler
This patch creates the following menu structure in the application menu as discussed on irc: Cloud credentials Preferences Manage dives Download from computer Add dive manually Refresh dives Upload to cloud GPS Add GPS tags to dives Upload GPS data Clear GPS cache Advanced (hidden by default) App log Theme Information "Save" moves out of the context menu, since it's a global thing (syncs to server). Signed-off-by: Sebastian Kügler <sebas@kde.org>
2015-12-08Fix page margins of start pageGravatar Sebastian Kügler
Consistent with other pages: half a gridUnit around the content. Signed-off-by: Sebastian Kügler <sebas@kde.org>
2015-12-08theme test improvementsGravatar Sebastian Kügler
- fix page magins - add headings - add screen dimensions in gridUnits Signed-off-by: Sebastian Kügler <sebas@kde.org>
2015-12-08increase horizontal spacing at the edgesGravatar Sebastian Kügler
Spacing around pages is half a grid unit, as consistent with (some of the) other pages. For the dive list, it's slightly more complicated: We want the list items to reach the edges on both side as to increase the interactive area. We have to apply the spacing left and right inside the listitems. This patch does that. Another consistency fix with other pages is that we're now adding a header at the top of the dive list, which scrolles with the list view. Signed-off-by: Sebastian Kügler <sebas@kde.org>
2015-12-07Merge branch 'divedetailssplit' of github.com:sebasje/subsurfaceGravatar Dirk Hohndel
2015-12-08Fix text wrapping in log viewerGravatar Sebastian Kügler
Apparently, the width setting got lost in the previous change. This sets the width of the log text explicitely to the grandparent's width. It fixes text clipping in the log window. Signed-off-by: Sebastian Kügler <sebas@kde.org>
2015-12-07QML-UI: add dive date to the detail viewGravatar Dirk Hohndel
That one really bugged me... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-12-07simplify and style log pageGravatar Sebastian Kügler
- less instantiated objects inside each other - add page heading - allow wrapping of text Signed-off-by: Sebastian Kügler <sebas@kde.org>