mirror of
https://github.com/subsurface/subsurface.git
synced 2025-02-19 22:16:15 +00:00
some changes from the upstream wip-branch
- 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>
This commit is contained in:
parent
c8227e200d
commit
5fb054a17c
3 changed files with 12 additions and 11 deletions
|
|
@ -19,7 +19,7 @@
|
|||
|
||||
import QtQuick 2.0
|
||||
|
||||
pragma Singleton
|
||||
//pragma Singleton
|
||||
|
||||
/*!
|
||||
\qmltype Theme
|
||||
|
|
@ -30,7 +30,7 @@ pragma Singleton
|
|||
See \l {http://www.google.com/design/spec/style/color.html#color-ui-color-application} for
|
||||
details about choosing a color scheme for your application.
|
||||
*/
|
||||
Object {
|
||||
QtObject {
|
||||
id: theme
|
||||
|
||||
property color textColor: Qt.rgba(0,0,0, 0.54)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue