From 958fb3076031ee6efc4b38a1fbc95e5f1b67ab5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20K=C3=BCgler?= Date: Mon, 11 Mar 2013 03:23:40 +0100 Subject: [PATCH] a few touch-ups --- .../testshaderapplet/contents/ui/SimpleExample.qml | 2 +- .../testshaderapplet/contents/ui/WobbleExample.qml | 2 +- .../testshaderapplet/contents/ui/testshaderapplet.qml | 11 +++++------ 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/shell/applets/testshaderapplet/contents/ui/SimpleExample.qml b/src/shell/applets/testshaderapplet/contents/ui/SimpleExample.qml index 2d0bb9011..5cb467d9e 100644 --- a/src/shell/applets/testshaderapplet/contents/ui/SimpleExample.qml +++ b/src/shell/applets/testshaderapplet/contents/ui/SimpleExample.qml @@ -20,7 +20,7 @@ import QtQuick 2.0 ShaderExample { - pageName: "Simple shader" + pageName: "Simple" pageDescription: "Paints a red, translucent rectangle" ShaderEffect { diff --git a/src/shell/applets/testshaderapplet/contents/ui/WobbleExample.qml b/src/shell/applets/testshaderapplet/contents/ui/WobbleExample.qml index 7b66a5e38..c9c3c86c1 100644 --- a/src/shell/applets/testshaderapplet/contents/ui/WobbleExample.qml +++ b/src/shell/applets/testshaderapplet/contents/ui/WobbleExample.qml @@ -110,7 +110,7 @@ ShaderExample { property variant mouse property variant resolution - property int fadeDuration: 2500 + property int fadeDuration: 250 property real amplitude: 0.04 * amplitudeSlider.value property real frequency: 20 property real time: 10 diff --git a/src/shell/applets/testshaderapplet/contents/ui/testshaderapplet.qml b/src/shell/applets/testshaderapplet/contents/ui/testshaderapplet.qml index 70f73d73e..b32a64270 100644 --- a/src/shell/applets/testshaderapplet/contents/ui/testshaderapplet.qml +++ b/src/shell/applets/testshaderapplet/contents/ui/testshaderapplet.qml @@ -43,12 +43,11 @@ Item { right: parent.right top: parent.top } - height: _h + height: theme.iconSizes.toolbar * 1.5 - PlasmaComponents.TabButton { tab: shadowExample; text: tab.pageName; } PlasmaComponents.TabButton { tab: wobbleExample; text: tab.pageName; } - //PlasmaComponents.TabButton { tab: colorExample; text: tab.pageName; } PlasmaComponents.TabButton { tab: colorShower; text: tab.pageName; } + PlasmaComponents.TabButton { tab: shadowExample; text: tab.pageName; } PlasmaComponents.TabButton { tab: simpleExample; text: tab.pageName; } PlasmaComponents.TabButton { tab: vertexPage; iconSource: vertexPage.icon; } } @@ -62,9 +61,6 @@ Item { bottom: parent.bottom } - Shadows { - id: shadowExample - } WobbleExample { id: wobbleExample } @@ -74,6 +70,9 @@ Item { ColorShower { id: colorShower } + Shadows { + id: shadowExample + } SimpleExample { id: simpleExample }