[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdeplasma-addons/rshah/comicqml] applets/comic/package/contents/ui: replaced ActionButton with
From: Reza Shah <rshah0385 () kireihana ! com>
Date: 2012-10-31 22:41:03
Message-ID: 20121031224103.100CCA6078 () git ! kde ! org
[Download RAW message or body]
Git commit 8bc882859c26c3a3c7e4e49e252b000f1ebeb0e7 by Reza Shah.
Committed on 30/10/2012 at 14:24.
Pushed by rshah into branch 'rshah/comicqml'.
replaced ActionButton with PlasmaComponents.ToolButton
D +0 -141 applets/comic/package/contents/ui/ActionButton.qml
M +9 -14 applets/comic/package/contents/ui/ComicCentralView.qml
http://commits.kde.org/kdeplasma-addons/8bc882859c26c3a3c7e4e49e252b000f1ebeb0e7
diff --git a/applets/comic/package/contents/ui/ActionButton.qml \
b/applets/comic/package/contents/ui/ActionButton.qml deleted file mode 100644
index 53ff260..0000000
--- a/applets/comic/package/contents/ui/ActionButton.qml
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2011 Marco Martin <mart@kde.org>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU Library General Public License as
- * published by the Free Software Foundation; either version 2, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU Library General Public License for more details
- *
- * You should have received a copy of the GNU Library General Public
- * License along with this program; if not, write to the
- * Free Software Foundation, Inc.,
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-import QtQuick 1.1
-import org.kde.plasma.core 0.1 as PlasmaCore
-import org.kde.plasma.components 0.1 as PlasmaComponents
-
-Item {
- id: button
-
- //API
- property QtObject svg
- property alias elementId: icon.elementId
- property QtObject action
- property bool backgroundVisible: true
- property int iconSize: 32
- property bool checked: false
- property bool toggle: false
- property string text
- signal clicked
-
- width: buttonRow.width
- height: buttonRow.height
-
- opacity: action==undefined||action.enabled?1:0.6
-
- Behavior on opacity {
- NumberAnimation {
- duration: 250
- easing.type: Easing.InOutQuad
- }
- }
-
- onCheckedChanged: {
- if (checked) {
- buttonItem.elementId = "pressed"
- shadowItem.opacity = 0
- } else {
- buttonItem.elementId = "normal"
- shadowItem.opacity = 1
- }
- }
-
- PlasmaCore.Theme {
- id: theme
- }
-
- PlasmaCore.Svg {
- id: buttonSvg
- imagePath: "widgets/actionbutton"
- }
-
- PlasmaCore.SvgItem {
- id: shadowItem
- svg: buttonSvg
- elementId: "shadow"
- width: iconSize+13//button.backgroundVisible?iconSize+8:iconSize
- height: width
- visible: button.backgroundVisible
- }
-
- Row {
- id: buttonRow
-
- Item {
- width: buttonItem.visible?buttonItem.width:iconSize
- height: buttonItem.visible?buttonItem.height:iconSize
-
- PlasmaCore.SvgItem {
- id: buttonItem
- svg: buttonSvg
- elementId: "normal"
- width: shadowItem.width
- height: shadowItem.height
- visible: backgroundVisible
- }
-
- PlasmaCore.SvgItem {
- id: icon
- width: iconSize
- height: iconSize
- svg: button.svg
- anchors.centerIn: parent
- }
- }
-
- Text {
- id: actionText
- text: button.text
- style: Text.Outline
- color: theme.textColor
- styleColor: Qt.rgba(1,1,1,0.4)
- anchors.verticalCenter: parent.verticalCenter
- }
- }
-
- MouseArea {
- anchors.fill: parent
- anchors.leftMargin: -10
- anchors.topMargin: -10
- anchors.rightMargin: -10
- anchors.bottomMargin: -10
- preventStealing: true
- onPressed: {
- buttonItem.elementId = "pressed"
- shadowItem.opacity = 0
- }
- onReleased: {
- if (button.checked || !button.toggle) {
- buttonItem.elementId = "normal"
- shadowItem.opacity = 1
- button.checked = false
- } else {
- button.checked = true
- }
- }
- onClicked: {
- if (action) {
- action.trigger()
- } else {
- button.clicked()
- }
- }
- }
-}
diff --git a/applets/comic/package/contents/ui/ComicCentralView.qml \
b/applets/comic/package/contents/ui/ComicCentralView.qml index 53e036a..e2d64c3 \
100644
--- a/applets/comic/package/contents/ui/ComicCentralView.qml
+++ b/applets/comic/package/contents/ui/ComicCentralView.qml
@@ -28,19 +28,16 @@ Rectangle {
height: 10
color: "transparent"
- ActionButton {
+ PlasmaComponents.ToolButton {
id: arrowLeft
- svg: arrowsSvg
- elementId: "left-arrow"
- width: 48
- height: 48
+ iconSource: "go-previous"
anchors {
left: root.left
verticalCenter: root.verticalCenter
}
- visible: (!comicApplet.arrowsOnHover && (comicData.prev.length > 0))
+ visible: (!comicApplet.arrowsOnHover && (comicData.prev !== undefined))
onClicked: {
- //busyIndicator.visible = true;
+ console.log(comicData.prev);
comicApplet.updateComic(comicData.prev);
}
}
@@ -53,24 +50,22 @@ Rectangle {
anchors {
left: arrowLeft.visible ? arrowLeft.right : root.left
right: arrowRight.visible ? arrowRight.left : root.right
+ leftMargin: arrowLeft.visible ? 4 : 0
+ rightMargin: arrowRight.visible ? 4 : 0
top: root.top
bottom: root.bottom
}
}
- ActionButton {
+ PlasmaComponents.ToolButton {
id: arrowRight
- svg: arrowsSvg
- elementId: "right-arrow"
- width: 48
- height: 48
+ iconSource: "go-next"
anchors {
right: root.right
verticalCenter: root.verticalCenter
}
- visible: (!comicApplet.arrowsOnHover && (comicData.next.length > 0))
+ visible: (!comicApplet.arrowsOnHover && (comicData.next !== undefined))
onClicked: {
- //busyIndicator.visible = true;
comicApplet.updateComic(comicData.next);
}
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic