summaryrefslogtreecommitdiffstats
AgeCommit message (Collapse)Author
2015-11-07Recognize Android as CMAKE_SYSTEM_NAMEGravatar Sebastian Kügler
This fixes the build for me against Qt 5.5. It seems Android is not Linux anymore, but uses its own CMAKE_SYSTEM_NAME now, so in this case we also want to compile android.cpp. This change should be rather safe, since it catches a condition that was not previously handled. Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06android build: remote -u flag from git pullGravatar Sebastian Kügler
git pull -u isn't known on my systems (recent Debian and Ubuntu), so better not use this flag. Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06More info in ThemeTestGravatar Sebastian Kügler
This makes problems with the default font more apparent Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Improve theme information panelGravatar Sebastian Kügler
- add sizing information for fonts and fontmetrics - compute devicePixelRatio from fontmetrics This shows that Android doesn't give us accurate information about the default font (hence the Text items being way too small) and a wrong Screen.devicePixelRatio, which we can actually compute ourselves. Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Include label in the binaryGravatar Sebastian Kügler
Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06new Label itemGravatar Sebastian Kügler
Add a Label that we can use for styled text until we figured out how to set the default font size. Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Theme tweaksGravatar Sebastian Kügler
- gridUnits is dynamic again, using FontMetrics now - Add a page to display some sizing-relevant details, so we can debug dpi problems a bit better on Android Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Replace units.spacing with units.smallSpacingGravatar Sebastian Kügler
In line with the new Units API. Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Add some compatibility extensions to theme and unitGravatar Sebastian Kügler
- This allows us to use these new things without changing much in our own code, things now work again. Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Add qmldir fileGravatar Sebastian Kügler
This will be needed at some point, so better put it in the right place already, so we don't forget enabling the singleton usage once we've fleshed out how that could work exactly. Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06some changes from the upstream wip-branchGravatar Sebastian Kügler
- remove the singleton usage, this will need a bit more magic in the background. Not a huge problem since we're only using one instance anyway, and the object itself is rather light - hardcode gridUnit for now. I'd like to use TextMetrics or FontMetrics there directly, but I'm not sure we can depend on Qt 5.4 and QtQuick 2.5. Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06more complete implementation of Plasma's UnitsGravatar Sebastian Kügler
This is a currently work-in-progress attempt at making a minimal set of Plasma components available. The code needs a bunch of adjustments yet, which I'm making in tune with upstream. The idea is to create a standardized sub-set of Plasma's QML API for applications, which brings only minimal new dependencies (for now: none). Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Better file names for Subsurface-mobile related sourcesGravatar Dirk Hohndel
They aren't Android specific - they are for the QML UI mobile app which should run on iOS as well. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Use default font size on AndroidGravatar Sebastian Kügler
This solves the root problem of most of the dpi-depdent sizing in the mobile Android version. When setting a custom font size, we circumvent Android's defaults, which means that we end up setting the font size further down the road to get readable fonts. I suppose this was set in order to make the QWidget-based user interface "work" on Android. Hard-coding a font size at this central point brings more headache than needed, one could instead consider adding an #ifdef Q_OS_ANDROID in main window. Signed-off-by: Sebastian Kügler <sebas@kde.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Move ImageDownloader out of the desktop widgetsGravatar Dirk Hohndel
This required a bit more untangling, but with this it seems we can build subsurface-mobile again (at least on the desktop). Interesting is the removal from inside the ImageDownloader of the call to DivePictureModel::instance()->updateDivePictures() - which actually could cause some interesting recursion issues. If it turns out we did indeed need this, it needs to be re-architected. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Don't connect to the PreferencesDialog in Subsurface-mobileGravatar Dirk Hohndel
Just more untangling from the desktop UI. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Remove more unnecessary include file referencesGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06profile.h: fix incomplete typeGravatar Lubomir I. Ivanov
ruleritem.cpp throws an error about incomplete type 'struct gas_pressures'. 'struct gas_pressures' is defined in dive.h, so every header that has usage of the type needs to include dive.h. Such a header is profile.h which has 'struct gas_pressures pressures' in 'struct plot_data', by including dive.h on top of profile.h every source file (e.g. ruleritem.cpp) that includes profile.h will now receive knowledge of a complete 'struct gas_pressures' type. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06remove some mainwindow.h includesGravatar Lubomir I. Ivanov
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Untangle DiveCalculatedCeiling from MainWindowGravatar Lubomir I. Ivanov
DiveCalculatedCeiling is the last class the references MainWindow in the profile-widget stack. In modelDataChanged() it looks for the information() widget and sets a slot for the dateTimeChanged() signal that information() emits. To solve the issue we make DiveCalculatedCeiling recieve a ProfileWidget2 reference and make ProfileWidget2 emit the dateTimeChangedItems() signal. ProfileWidget2 itself listens for the dateTimeChanged() signal that information() emits and emits dateTimeChangedItems() to notify any possible children/item listeners in the ProfileWidget2::dateTimeChanged() slot. The connection between ProfileWidget2 and information() is set in MainWindow. This makes DiveCalculatedCeiling unaware of MainWindow and which class originally emits the dateTimeChanged() signal to ProfileWidget2. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> -- Think delegation. Tomaz, please take a look at this one, to double check if i messed up. also i have zero idea how the mobile app is setting these connections, if it does so even. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06This patch reverts ae709ab30ee6abGravatar Lubomir I. Ivanov
things like: potentially, for every item interested in 'printMode' can clutter the profile-widget stack a lot. instead the items should be aware of the profile widget instance and not MainWindow. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Untagle DiveCartesianAxis from MainWindowGravatar Lubomir I. Ivanov
DiveCartesianAxis and derivatives can recieve ProfileWidget2 as an instance in their constructor. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-06Updates to the user manualGravatar Wendie Fisher
Small changes to the language to make it easier to read. Signed-off-by: Wendie Fisher <wendie@divedad.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Untangle profile from MainWindow: work around print modeGravatar Dirk Hohndel
Since we don't support printing in subsurface-mobile this solves the problem at hand - but it doesn't do what we really want which is to untangle the Profile from the MainWindow. Partial credit. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Profile: include Qt headers directlyGravatar Dirk Hohndel
No reason to include mainwindow.h Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Profile: don't compile the desktop specific parts on mobileGravatar Dirk Hohndel
When building subsurface-mobile we won't be using all these UI elements, so let's not build them. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Profile: add define when building subsurface-mobileGravatar Dirk Hohndel
This way we can conditionally compile out more dependencies on desktop widgets. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Untangle Profile from MainTabGravatar Dirk Hohndel
This one was easy. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Cmake: untangle subsurface and subsurface-mobileGravatar Dirk Hohndel
In the cmake restructuring it seems that subsurface-mobile building got completely messed up. With this subsurface-mobile still doesn't actually build (still too many unfulfilled dependencies, but we're getting closer). Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Untangle Profile from MainWindow: edit current profileGravatar Dirk Hohndel
And action can't not just trigger a slot, it can also send a signal. With this there is no reference to the MainWindow left in the profile. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Untangle Profile from MainWindow: update main tab via signalGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Untangle Profile from MainWindow: remove silly indirectionGravatar Dirk Hohndel
Ummm. What? That one was awesome. This seems easier :-) MainWindow::instance()->graphics() is a way to retrieve a pointer to the profile widget... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Untangle Profile from MainWindow: make profile the parent of dialogsGravatar Dirk Hohndel
I don't quite know why these were parented to the MainWindow - I bet there's a very clever reason that I'm missing... Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Untangle Profile from MainWindow: refresh displayGravatar Dirk Hohndel
Instead of directly calling into the MainWindow, redirect this via a signal so Subsurface mobile can hook it up as needed. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Untangle Profile from MainWindow: add missing headerGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Untangle Profile from MainWindow: shortcutsGravatar Dirk Hohndel
This, too, should be done with signals. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Untangle Profile from MainWindow: turn off tts/ndl calculationGravatar Dirk Hohndel
I'm not sure we can ever run into this issue anymore since we stop calculating TTS / NDL past 2 hours, but I guess on a fairly slow CPU this still could take too long. But instead of calling into MainWindow let's just change the setting right here and add a signal to show the notification - that way we can use the appropriate way to make such notifications on the mobile app. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Remove dead codeGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Untangle Profile from MainWindow: files on command lineGravatar Dirk Hohndel
There's no reason why this should be on the MainWindow widget. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Profile: begin untangling from MainWindowGravatar Dirk Hohndel
Use a signal to turn the toolbar on or off. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Use target_link_libraries for GrantleeGravatar Rex Dieter
This allows for finding headers when not in /usr/include (like parallel-installable distribution-packaged grantlee5) Signed-off-by: Rex Dieter <rdieter@fedoraproject.org> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05QML-UI: find the include filesGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Android build: we no longer have a MainWindow instanceGravatar Dirk Hohndel
So we don't need to hide it, either Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-05Cmake: correctly identify an Android buildGravatar Dirk Hohndel
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-04Re-add the signal connectionsGravatar Tomaz Canabrava
The signal connections from the old preferences got lost when we moved to the new ones because Designer is broken and can't handle signals / connactions from copy/pasted content. Signed-off-by: Tomaz Canabrava <tomaz.canabrava@intel.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-03Cmake: fix BT definitionGravatar Dirk Hohndel
This was set twice, the first time before we checked that we have a new enough Qt version installed. Also fixed a typo. Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-03NSIS: add a couple of uninstaller checkboxesGravatar Lubomir I. Ivanov
Add a new dialog/page which is shown right before the final "uninstall" click. The dialog may contains two checkboxes - for registry entries and for the user path. These checkboxes will not be created if the user has not run the application yet, as no registry keys will be available. Selecting the user directory checkbox shows a warning message box, that the user should make sure no important files are present there. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-03PreferencesDialog.cpp: store 'default_directory' in QSettingsGravatar Lubomir I. Ivanov
This is needed only on Windows, so that the uninstaller knows which directory to delete. Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-03Context menu for images: add loading from file / webGravatar Guido Lerch
Signed-off-by: Guido Lerch <guido.lerch@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
2015-11-03Context menu for images: enable multi selectionGravatar Guido Lerch
Signed-off-by: Guido Lerch <guido.lerch@gmail.com> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>