From 53b46083273b432842172b1730942cd7fbcf0f5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Wed, 22 Jan 2014 00:41:02 +0100 Subject: [PATCH] Port examples to units.iconSizes --- examples/applets/testcomponents/contents/ui/IconsPage.qml | 8 ++++---- .../applets/testcomponents/contents/ui/PlasmoidPage.qml | 4 ++-- .../applets/testcomponents/contents/ui/testcomponents.qml | 4 ++-- .../applets/testshaders/contents/ui/WobbleExample.qml | 2 +- .../applets/testshaders/contents/ui/testshaderapplet.qml | 6 +++--- examples/applets/testtheme/contents/ui/testtheme.qml | 4 ++-- 6 files changed, 14 insertions(+), 14 deletions(-) diff --git a/examples/applets/testcomponents/contents/ui/IconsPage.qml b/examples/applets/testcomponents/contents/ui/IconsPage.qml index a73e7c9b4..5d3fd15c4 100644 --- a/examples/applets/testcomponents/contents/ui/IconsPage.qml +++ b/examples/applets/testcomponents/contents/ui/IconsPage.qml @@ -41,10 +41,10 @@ PlasmaComponents.Page { text: "Icons" } PlasmaComponents.Label { - text: "iconSizes.small : " + theme.iconSizes.small + - ", iconSizes.desktop: " + theme.iconSizes.desktop + - ",
iconSizes.toolbar: " + theme.iconSizes.toolbar + - ", iconSizes.dialog : " + theme.iconSizes.dialog + text: "iconSizes.small : " + units.iconSizes.small + + ", iconSizes.desktop: " + units.iconSizes.desktop + + ",
iconSizes.toolbar: " + units.iconSizes.toolbar + + ", iconSizes.dialog : " + units.iconSizes.dialog } Flow { diff --git a/examples/applets/testcomponents/contents/ui/PlasmoidPage.qml b/examples/applets/testcomponents/contents/ui/PlasmoidPage.qml index 39e341825..8beca33f2 100644 --- a/examples/applets/testcomponents/contents/ui/PlasmoidPage.qml +++ b/examples/applets/testcomponents/contents/ui/PlasmoidPage.qml @@ -61,7 +61,7 @@ PlasmaComponents.Page { } PlasmaComponents.Button { - height: theme.iconSizes.desktop + height: units.iconSizes.desktop text: "Busy" checked: plasmoid.busy onClicked: { @@ -71,7 +71,7 @@ PlasmaComponents.Page { PlasmaComponents.Button { id: ctxButton - height: theme.iconSizes.desktop + height: units.iconSizes.desktop text: "Context Menu" Loader { id: menuLoader diff --git a/examples/applets/testcomponents/contents/ui/testcomponents.qml b/examples/applets/testcomponents/contents/ui/testcomponents.qml index 395572a0e..8b6c3f0d1 100644 --- a/examples/applets/testcomponents/contents/ui/testcomponents.qml +++ b/examples/applets/testcomponents/contents/ui/testcomponents.qml @@ -31,8 +31,8 @@ Item { property int minimumWidth: units.gridUnit * 20 property int minimumHeight: units.gridUnit * 30 - property int _s: theme.iconSizes.small - property int _h: theme.iconSizes.desktop + property int _s: units.iconSizes.small + property int _h: units.iconSizes.desktop PlasmaCore.DataSource { id: dataSource diff --git a/examples/applets/testshaders/contents/ui/WobbleExample.qml b/examples/applets/testshaders/contents/ui/WobbleExample.qml index dbbf8fd2b..57a2cfdf8 100644 --- a/examples/applets/testshaders/contents/ui/WobbleExample.qml +++ b/examples/applets/testshaders/contents/ui/WobbleExample.qml @@ -73,7 +73,7 @@ ShaderExample { } PlasmaComponents.Button { anchors { right: parent.right; bottom: parent.bottom; } -// height: theme.iconSizes.toolbar +// height: units.iconSizes.toolbar text: "Busy" checked: plasmoid.busy onClicked: { diff --git a/examples/applets/testshaders/contents/ui/testshaderapplet.qml b/examples/applets/testshaders/contents/ui/testshaderapplet.qml index f61ec9cb7..b6ed67e59 100644 --- a/examples/applets/testshaders/contents/ui/testshaderapplet.qml +++ b/examples/applets/testshaders/contents/ui/testshaderapplet.qml @@ -30,8 +30,8 @@ Item { property int minimumWidth: units.gridUnit * 20 property int minimumHeight: units.gridUnit * 30 - property int _s: theme.iconSizes.small - property int _h: theme.iconSizes.desktop + property int _s: units.iconSizes.small + property int _h: units.iconSizes.desktop property int _m: 12 Item { @@ -46,7 +46,7 @@ Item { right: parent.right top: parent.top } - height: theme.iconSizes.toolbar * 1.5 + height: units.iconSizes.toolbar * 1.5 PlasmaComponents.TabButton { tab: colorShower; text: tab.pageName; } PlasmaComponents.TabButton { tab: wobbleExample; text: tab.pageName; } diff --git a/examples/applets/testtheme/contents/ui/testtheme.qml b/examples/applets/testtheme/contents/ui/testtheme.qml index ebbf0871c..869455c67 100644 --- a/examples/applets/testtheme/contents/ui/testtheme.qml +++ b/examples/applets/testtheme/contents/ui/testtheme.qml @@ -31,8 +31,8 @@ Item { property int minimumWidth: units.gridUnit * 10 property int minimumHeight: units.gridUnit * 10 - property int _s: theme.iconSizes.small - property int _h: theme.iconSizes.desktop + property int _s: units.iconSizes.small + property int _h: units.iconSizes.desktop ThemePage { id: themePage