aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/controls
diff options
context:
space:
mode:
authorDaniel d'Andrada <daniel.dandrada@luxoft.com>2018-11-21 11:02:28 +0100
committerBramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>2018-11-22 10:09:13 +0000
commit7978b8ea878585a20fe68edce97f172929bfc0b3 (patch)
treef1af64cfdfeb17939665583d776613567311ca72 /plugins/controls
parent24245a075c91c699aeaf84b53cfe645cf9112e05 (diff)
[style] Rename BasicStyle to Style
Now that this name is no longer taken (the old Style was renamed to Config) Change-Id: Ic12377da76aad9873c877b97998c051f6de015af Reviewed-by: Bramastyo Harimukti Santoso <bramastyo.harimukti.santoso@pelagicore.com>
Diffstat (limited to 'plugins/controls')
-rw-r--r--plugins/controls/ButtonBackground.qml8
-rw-r--r--plugins/controls/ListItem.qml4
-rw-r--r--plugins/controls/ListItemBasic.qml16
-rw-r--r--plugins/controls/ListItemProgress.qml4
-rw-r--r--plugins/controls/ListItemSwitch.qml2
5 files changed, 17 insertions, 17 deletions
diff --git a/plugins/controls/ButtonBackground.qml b/plugins/controls/ButtonBackground.qml
index b6833571..2d265691 100644
--- a/plugins/controls/ButtonBackground.qml
+++ b/plugins/controls/ButtonBackground.qml
@@ -31,20 +31,20 @@
import QtQuick 2.10
-import shared.BasicStyle 1.0
+import shared.Style 1.0
import shared.Sizes 1.0
Rectangle {
border.width: !parent.enabled && !parent.checked ? Sizes.dp(2) : 0
- border.color: BasicStyle.contrastColor
+ border.color: Style.contrastColor
visible: !parent.flat
color: {
if (parent.checked) {
- return BasicStyle.accentColor;
+ return Style.accentColor;
} else if (!parent.enabled) {
return "transparent";
} else {
- return BasicStyle.contrastColor;
+ return Style.contrastColor;
}
}
opacity: {
diff --git a/plugins/controls/ListItem.qml b/plugins/controls/ListItem.qml
index ee74d189..fc0f17bc 100644
--- a/plugins/controls/ListItem.qml
+++ b/plugins/controls/ListItem.qml
@@ -34,7 +34,7 @@ import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import shared.utils 1.0
-import shared.BasicStyle 1.0
+import shared.Style 1.0
import shared.Sizes 1.0
/*!
@@ -103,7 +103,7 @@ ListItemBasic {
horizontalAlignment: Text.AlignRight
verticalAlignment: Text.AlignVCenter
visible: root.secondaryText
- color: BasicStyle.contrastColor
+ color: Style.contrastColor
text: root.secondaryText
}
diff --git a/plugins/controls/ListItemBasic.qml b/plugins/controls/ListItemBasic.qml
index 26b95ddf..313c61e3 100644
--- a/plugins/controls/ListItemBasic.qml
+++ b/plugins/controls/ListItemBasic.qml
@@ -37,7 +37,7 @@ import QtQuick.Layouts 1.3
import QtGraphicalEffects 1.0
import shared.utils 1.0
-import shared.BasicStyle 1.0
+import shared.Style 1.0
import shared.Sizes 1.0
/*!
@@ -148,8 +148,8 @@ ItemDelegate {
rightPadding: 0
bottomPadding: 0
topPadding: 0
- opacity: enabled ? root.opacity : BasicStyle.defaultDisabledOpacity
- icon.color: BasicStyle.contrastColor
+ opacity: enabled ? root.opacity : Style.defaultDisabledOpacity
+ icon.color: Style.contrastColor
implicitHeight: Math.max(
listItemText.contentHeight + subtitle.contentHeight,
@@ -168,7 +168,7 @@ ItemDelegate {
IconLabel {
height: root.icon ? root.height : 0
- opacity: BasicStyle.opacityHigh
+ opacity: Style.opacityHigh
scale: Sizes.scale
spacing: root.spacing
mirrored: root.mirrored
@@ -188,9 +188,9 @@ ItemDelegate {
wrapMode: root.wrapText ? Text.WrapAtWordBoundaryOrAnywhere : Text.NoWrap
horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter
- opacity: BasicStyle.opacityHigh
+ opacity: Style.opacityHigh
visible: root.text
- color: BasicStyle.contrastColor
+ color: Style.contrastColor
}
Label {
@@ -203,7 +203,7 @@ ItemDelegate {
verticalAlignment: Text.AlignVCenter
font.pixelSize: Sizes.fontSizeS
visible: text
- opacity: BasicStyle.opacityMedium
+ opacity: Style.opacityMedium
}
}
Item {
@@ -246,7 +246,7 @@ ItemDelegate {
anchors.bottom: parent.bottom
anchors.horizontalCenter: parent.horizontalCenter
width: parent.width
- source: Config.gfx("list-divider", BasicStyle.theme)
+ source: Config.gfx("list-divider", Style.theme)
mirror: root.mirrored
}
}
diff --git a/plugins/controls/ListItemProgress.qml b/plugins/controls/ListItemProgress.qml
index 1c9b5564..ad93091c 100644
--- a/plugins/controls/ListItemProgress.qml
+++ b/plugins/controls/ListItemProgress.qml
@@ -34,7 +34,7 @@ import QtQuick.Controls 2.3
import QtQuick.Layouts 1.3
import shared.utils 1.0
-import shared.BasicStyle 1.0
+import shared.Style 1.0
import shared.Sizes 1.0
/*!
@@ -169,7 +169,7 @@ ListItemBasic {
accessoryDelegateComponent1: Label {
id: secondaryTextLabel
anchors.verticalCenter: parent.verticalCenter
- opacity: BasicStyle.opacityMedium
+ opacity: Style.opacityMedium
font.pixelSize: Sizes.fontSizeS
text: root.secondaryText
}
diff --git a/plugins/controls/ListItemSwitch.qml b/plugins/controls/ListItemSwitch.qml
index f0657ea0..f1d468ba 100644
--- a/plugins/controls/ListItemSwitch.qml
+++ b/plugins/controls/ListItemSwitch.qml
@@ -32,7 +32,7 @@
import QtQuick 2.10
import QtQuick.Controls 2.3
-import shared.BasicStyle 1.0
+import shared.Style 1.0
/*!
\qmltype ListItemSwitch