From 572e20817d934b7de7174df1d5eef26c7c7c2fda Mon Sep 17 00:00:00 2001 From: Aleix Pol Date: Wed, 4 Jun 2014 17:02:40 +0200 Subject: [PATCH] Adopt artwork specific to the logout page --- lookandfeel/contents/logout/LogoutScreen.qml | 30 ++++++++++++------ .../logout/icons/currentColorFillFix.sh | 23 ++++++++++++++ .../contents/logout/icons/logout_primary.svgz | Bin 0 -> 2886 bytes .../logout/icons/restart_primary.svgz | Bin 0 -> 2980 bytes .../logout/icons/shutdown_primary.svgz | Bin 0 -> 2786 bytes 5 files changed, 43 insertions(+), 10 deletions(-) create mode 100644 lookandfeel/contents/logout/icons/currentColorFillFix.sh create mode 100644 lookandfeel/contents/logout/icons/logout_primary.svgz create mode 100644 lookandfeel/contents/logout/icons/restart_primary.svgz create mode 100644 lookandfeel/contents/logout/icons/shutdown_primary.svgz diff --git a/lookandfeel/contents/logout/LogoutScreen.qml b/lookandfeel/contents/logout/LogoutScreen.qml index 0b5176301..6160477fe 100644 --- a/lookandfeel/contents/logout/LogoutScreen.qml +++ b/lookandfeel/contents/logout/LogoutScreen.qml @@ -23,16 +23,18 @@ import QtQuick.Controls 1.1 as Controls import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents +import org.kde.plasma.extras 2.0 as PlasmaExtras BreezeBlock { id: root property string mode: "shutdown" property var currentAction - property real remainingTime: 30 + property real timeout: 30 + property real remainingTime: root.timeout property bool canReboot property bool canLogout property bool canShutdown - onModeChanged: remainingTime = 30 + onModeChanged: remainingTime = root.timeout signal cancel() signal shutdownRequested() @@ -55,23 +57,31 @@ BreezeBlock { } mainItem: ColumnLayout { - PlasmaComponents.Label { + spacing: 0 + PlasmaExtras.Heading { id: actionLabel + level: 4 Layout.alignment: Qt.AlignHCenter } - PlasmaComponents.ToolButton { + Item { height: units.largeSpacing } + + Image { id: actionIcon Layout.alignment: Qt.AlignHCenter Layout.fillHeight: true - onClicked: root.currentAction() + fillMode: Image.PreserveAspectFit } PlasmaComponents.ProgressBar { id: progressBar Layout.alignment: Qt.AlignHCenter + anchors.horizontalCenter: parent.horizontalCenter + + //wanted to use actionIcon.paintedWidth but it doesn't work well when the image changes + width: units.largeSpacing*7 minimumValue: 0 - maximumValue: 30 + maximumValue: root.timeout value: root.remainingTime } @@ -86,19 +96,19 @@ BreezeBlock { name: "shutdown" PropertyChanges { target: root; currentAction: shutdownRequested } PropertyChanges { target: actionLabel; text: ("Shutting down") } - PropertyChanges { target: actionIcon; iconSource: "system-shutdown" } + PropertyChanges { target: actionIcon; source: "icons/shutdown_primary.svgz" } }, State { name: "logout" - PropertyChanges { target: root; currentAction: shutdownRequested } + PropertyChanges { target: root; currentAction: logoutRequested } PropertyChanges { target: actionLabel; text: ("Logging out") } - PropertyChanges { target: actionIcon; iconSource: "system-log-out" } + PropertyChanges { target: actionIcon; source: "icons/logout_primary.svgz" } }, State { name: "reboot" PropertyChanges { target: root; currentAction: rebootRequested } PropertyChanges { target: actionLabel; text: ("Rebooting") } - PropertyChanges { target: actionIcon; iconSource: "system-reboot" } + PropertyChanges { target: actionIcon; source: "icons/restart_primary.svgz" } } ] } diff --git a/lookandfeel/contents/logout/icons/currentColorFillFix.sh b/lookandfeel/contents/logout/icons/currentColorFillFix.sh new file mode 100644 index 000000000..9705b1205 --- /dev/null +++ b/lookandfeel/contents/logout/icons/currentColorFillFix.sh @@ -0,0 +1,23 @@ +#!/bin/sh + +if [ $# -ne 1 ]; + then echo Usage: $0 file.svgz + exit 1 +fi + +if [ ! -f $1 ]; then + echo "you must specify a valid svg" + exit 1 +fi + + +file=`echo $1 | cut -d'.' --complement -f2-` +mv $1 $file.svg.gz +gunzip $file.svg.gz + +echo Processing $file + +/usr/bin/perl -p -i -e "s/color:#[^;]*;fill:currentColor/fill:currentColor/g" $file.svg + +gzip $file.svg +mv $file.svg.gz $file.svgz \ No newline at end of file diff --git a/lookandfeel/contents/logout/icons/logout_primary.svgz b/lookandfeel/contents/logout/icons/logout_primary.svgz new file mode 100644 index 0000000000000000000000000000000000000000..c3977ee4d0649106ebd8b15ed5d53fccfe57681c GIT binary patch literal 2886 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 literal 0 HcmV?d00001 diff --git a/lookandfeel/contents/logout/icons/restart_primary.svgz b/lookandfeel/contents/logout/icons/restart_primary.svgz new file mode 100644 index 0000000000000000000000000000000000000000..d97a67000aa8562020828665e329d2a88e962222 GIT binary patch literal 2980 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 aDZ7rReQ;mrcq#kp*}nmkdrBEfDF6VF*R^f{ literal 0 HcmV?d00001 diff --git a/lookandfeel/contents/logout/icons/shutdown_primary.svgz b/lookandfeel/contents/logout/icons/shutdown_primary.svgz new file mode 100644 index 0000000000000000000000000000000000000000..d2f34ac5fbf2bea8833fa1873b6f6bb2c2c0ab74 GIT binary patch literal 2786 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 o-!z5)m(Al5EkZH-9~M?8gSvZg9~bt^!