diff options
| author |  Sebastian Kügler <sebas@kde.org> | 2015-10-09 01:57:10 +0200 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-10-09 12:51:36 -0700 |
| commit | 431b5e07fe6eaa1383b86a5ab16953897f642ebf (patch) | |
| tree | 85c353c4f6a06053f8b571f544be6246e52ac38e /qt-mobile | |
| parent | 67c306b5278753bd5cc4eefc1dbeac8cc08e7913 (diff) | |
| download | subsurface-431b5e07fe6eaa1383b86a5ab16953897f642ebf.tar.gz | |
QML-UI: basics for theming and hi-dpi support
- Theme: For theming, we're just defining some colors centrally for now
- Units: This object provides dpi-corrected sizing in the form of
gridUnit. The idea is to base gridUnit on the rendered font size, so
the ui scales with text size. As this interpolates font size and dpi,
the sizing is rather responsive.
These are the basics, now we can kill lots of hardcoded pixel values.
Signed-off-by: Sebastian Kügler <sebas@kde.org>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'qt-mobile')
| -rw-r--r-- | qt-mobile/main.qml | 16 | ||||
| -rw-r--r-- | qt-mobile/mobile-resources.qrc | 4 | ||||
| -rw-r--r-- | qt-mobile/theme/Theme.qml | 7 | ||||
| -rw-r--r-- | qt-mobile/theme/Units.qml | 5 |
4 files changed, 32 insertions, 0 deletions
diff --git a/qt-mobile/main.qml b/qt-mobile/main.qml index b249a333a..00ab008d3 100644 --- a/qt-mobile/main.qml +++ b/qt-mobile/main.qml @@ -6,6 +6,8 @@ import QtQuick.Dialogs 1.2 import QtQuick.Layouts 1.1 import QtQuick.Window 2.2 import org.subsurfacedivelog.mobile 1.0 +import "qrc:/qml/theme" as Theme + ApplicationWindow { title: qsTr("Subsurface mobile") @@ -13,6 +15,14 @@ ApplicationWindow { property alias messageText: message.text visible: true + Theme.Units { + id: units + } + + Theme.Theme { + id: theme + } + Menu { id: prefsMenu title: "Menu" @@ -181,4 +191,10 @@ ApplicationWindow { id: logWindow visible: false } + + Component.onCompleted: { + print("main.qml laoded."); + print("gridUnit is: " + units.gridUnit); + print("hightlight : " + theme.highlightColor); + } } diff --git a/qt-mobile/mobile-resources.qrc b/qt-mobile/mobile-resources.qrc index cb31d7ea1..93cda6dc9 100644 --- a/qt-mobile/mobile-resources.qrc +++ b/qt-mobile/mobile-resources.qrc @@ -9,4 +9,8 @@ <file>Log.qml</file> <file>TopBar.qml</file> </qresource> + <qresource prefix="/qml/theme"> + <file alias="Theme.qml">theme/Theme.qml</file> + <file alias="Units.qml" >theme/Units.qml</file> + </qresource> </RCC> diff --git a/qt-mobile/theme/Theme.qml b/qt-mobile/theme/Theme.qml new file mode 100644 index 000000000..5eed83fe8 --- /dev/null +++ b/qt-mobile/theme/Theme.qml @@ -0,0 +1,7 @@ +import QtQuick 2.3 + +QtObject { + property color textColor: "#333333" + property color backgroundColor: "#ececec" + property color highlightColor: "#91c4e1" +}
\ No newline at end of file diff --git a/qt-mobile/theme/Units.qml b/qt-mobile/theme/Units.qml new file mode 100644 index 000000000..73ee3f8cf --- /dev/null +++ b/qt-mobile/theme/Units.qml @@ -0,0 +1,5 @@ +import QtQuick 2.3 + +QtObject { + property int gridUnit: 24 +}
\ No newline at end of file |