summaryrefslogtreecommitdiffstats
path: root/qt-mobile/qml/mobilecomponents
diff options
context:
space:
mode:
Diffstat (limited to 'qt-mobile/qml/mobilecomponents')
-rw-r--r--qt-mobile/qml/mobilecomponents/ApplicationWindow.qml4
-rw-r--r--qt-mobile/qml/mobilecomponents/ContextDrawer.qml4
-rw-r--r--qt-mobile/qml/mobilecomponents/GlobalDrawer.qml18
-rw-r--r--qt-mobile/qml/mobilecomponents/Icon.qml7
-rw-r--r--qt-mobile/qml/mobilecomponents/Theme.qml4
-rw-r--r--qt-mobile/qml/mobilecomponents/icons/distribute-horizontal-x.svg102
-rw-r--r--qt-mobile/qml/mobilecomponents/private/ActionButton.qml20
7 files changed, 146 insertions, 13 deletions
diff --git a/qt-mobile/qml/mobilecomponents/ApplicationWindow.qml b/qt-mobile/qml/mobilecomponents/ApplicationWindow.qml
index 71980f9e6..220d0524c 100644
--- a/qt-mobile/qml/mobilecomponents/ApplicationWindow.qml
+++ b/qt-mobile/qml/mobilecomponents/ApplicationWindow.qml
@@ -20,6 +20,7 @@
import QtQuick 2.1
import QtQuick.Controls 1.3
import "private"
+import org.kde.plasma.mobilecomponents 0.2
/**
* A window that provides some basic features needed for all apps
@@ -73,6 +74,9 @@ ApplicationWindow {
contextDrawer.parent = contentItem.parent;
}
+ width: Units.gridUnit * 25
+ height: Units.gridUnit * 30
+
property alias actionButton: __actionButton
ActionButton {
id: __actionButton
diff --git a/qt-mobile/qml/mobilecomponents/ContextDrawer.qml b/qt-mobile/qml/mobilecomponents/ContextDrawer.qml
index 2e2f95f7e..083254946 100644
--- a/qt-mobile/qml/mobilecomponents/ContextDrawer.qml
+++ b/qt-mobile/qml/mobilecomponents/ContextDrawer.qml
@@ -18,6 +18,7 @@
*/
import QtQuick 2.1
+import QtQuick.Layouts 1.2
import QtQuick.Controls 1.0 as QtControls
import org.kde.plasma.mobilecomponents 0.2
@@ -63,7 +64,8 @@ OverlayDrawer {
}
delegate: ListItem {
enabled: true
- Row {
+ RowLayout {
+ height: implicitHeight + Units.smallSpacing * 2
anchors {
left: parent.left
margins: Units.largeSpacing
diff --git a/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml b/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml
index 082231c41..638222ada 100644
--- a/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml
+++ b/qt-mobile/qml/mobilecomponents/GlobalDrawer.qml
@@ -49,6 +49,7 @@ OverlayDrawer {
Layout.minimumHeight: Math.max(headingIcon.height, heading.height) + Units.smallSpacing*2
fillMode: Image.PreserveAspectCrop
+ asynchronous: true
anchors {
left: parent.left
@@ -83,7 +84,7 @@ OverlayDrawer {
anchors {
left: parent.left
top: parent.top
- margins: Units.smallSpacing
+ margins: Units.smallSpacing * 2
}
Icon {
id: headingIcon
@@ -123,6 +124,7 @@ OverlayDrawer {
Layout.maximumWidth: Layout.minimumWidth
Layout.fillWidth: false
Layout.fillHeight: true
+ visible: children.length > 0
}
Item {
Layout.minimumWidth: Units.smallSpacing
@@ -138,22 +140,26 @@ OverlayDrawer {
model: actions
property int level: 0
+ interactive: contentHeight > height
+
footer: ListItem {
visible: level > 0
enabled: true
RowLayout {
+ height: implicitHeight + Units.smallSpacing * 2
anchors {
left: parent.left
}
Icon {
- Layout.maximumWidth: height
+ Layout.minimumWidth: height
+ Layout.maximumWidth: Layout.minimumWidth
Layout.fillHeight: true
source: "go-previous"
}
Label {
- // Weird, this doesn't work
+ // Weird, this doesn't work
//text: (typeof(i18n) != undefined) ? i18n("Back") : "Back"
- text: "Back"
+ text: "Back"
}
}
onClicked: pageRow.pop()
@@ -161,6 +167,7 @@ OverlayDrawer {
delegate: ListItem {
enabled: true
RowLayout {
+ height: implicitHeight + Units.smallSpacing*2
anchors {
left: parent.left
right: parent.right
@@ -175,7 +182,8 @@ OverlayDrawer {
text: modelData.text
}
Icon {
- Layout.maximumWidth: height
+ Layout.minimumWidth: height
+ Layout.maximumWidth: Layout.minimumWidth
Layout.fillHeight: true
source: "go-next"
visible: modelData.children != undefined
diff --git a/qt-mobile/qml/mobilecomponents/Icon.qml b/qt-mobile/qml/mobilecomponents/Icon.qml
index d5b253235..b28624dbf 100644
--- a/qt-mobile/qml/mobilecomponents/Icon.qml
+++ b/qt-mobile/qml/mobilecomponents/Icon.qml
@@ -19,6 +19,7 @@
import QtQuick 2.0
import QtGraphicalEffects 1.0
+import org.kde.plasma.mobilecomponents 0.2
Item {
id: root
@@ -26,13 +27,13 @@ Item {
property alias smooth: image.smooth
property bool active: false
property bool valid: image.status == Image.Ready
- implicitWidth: image.sourceSize.width
- implicitHeight: image.sourceSize.height
+ implicitWidth: Math.min(image.sourceSize.width, Units.iconSizes.medium)
+ implicitHeight: Math.min(image.sourceSize.height, Units.iconSizes.medium)
Image {
id: image
anchors.fill: parent
- source: root.source != "" ? "icons/" + root.source + ".svg" : root.source
+ source: root.source != "" ? (root.source.indexOf(".") === -1 ? "icons/" + root.source + ".svg" : root.source) : root.source
}
GammaAdjust {
anchors.fill: image
diff --git a/qt-mobile/qml/mobilecomponents/Theme.qml b/qt-mobile/qml/mobilecomponents/Theme.qml
index fd8c49ba2..402caedb6 100644
--- a/qt-mobile/qml/mobilecomponents/Theme.qml
+++ b/qt-mobile/qml/mobilecomponents/Theme.qml
@@ -41,12 +41,12 @@ QtObject {
property color visitedLinkColor: "#2196F3"
property color buttonTextColor: Qt.rgba(0,0,0, 0.54)
- property color buttonBackgroundColor: "#f3f3f3"
+ property color buttonBackgroundColor: "#eff0f1"
property color buttonHoverColor: "#2196F3"
property color buttonFocusColor: "#2196F3"
property color viewTextColor: Qt.rgba(0,0,0, 0.54)
- property color viewBackgroundColor: "#f3f3f3"
+ property color viewBackgroundColor: "#fcfcfc"
property color viewHoverColor: "#2196F3"
property color viewFocusColor: "#2196F3"
diff --git a/qt-mobile/qml/mobilecomponents/icons/distribute-horizontal-x.svg b/qt-mobile/qml/mobilecomponents/icons/distribute-horizontal-x.svg
new file mode 100644
index 000000000..1a14480d7
--- /dev/null
+++ b/qt-mobile/qml/mobilecomponents/icons/distribute-horizontal-x.svg
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="22"
+ height="22"
+ id="svg3813"
+ version="1.1"
+ inkscape:version="0.48+devel r"
+ sodipodi:docname="distribute-horizontal-x.svg">
+ <defs
+ id="defs3815" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="26.930216"
+ inkscape:cx="9.6140302"
+ inkscape:cy="11.263762"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ fit-margin-top="0"
+ fit-margin-left="0"
+ fit-margin-right="0"
+ fit-margin-bottom="0"
+ inkscape:window-width="1366"
+ inkscape:window-height="668"
+ inkscape:window-x="-2"
+ inkscape:window-y="23"
+ inkscape:window-maximized="1"
+ inkscape:showpageshadow="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4109" />
+ <sodipodi:guide
+ position="2.0000072,19.999993"
+ orientation="18,0"
+ id="guide4115" />
+ <sodipodi:guide
+ position="2.0000072,1.9999929"
+ orientation="0,18"
+ id="guide4117" />
+ <sodipodi:guide
+ position="20.000007,1.9999929"
+ orientation="-18,0"
+ id="guide4119" />
+ <sodipodi:guide
+ position="20.000007,19.999993"
+ orientation="0,-18"
+ id="guide4121" />
+ <sodipodi:guide
+ position="3.0000072,18.999993"
+ orientation="16,0"
+ id="guide4123" />
+ <sodipodi:guide
+ position="3.0000072,2.9999929"
+ orientation="0,16"
+ id="guide4125" />
+ <sodipodi:guide
+ position="19.000007,2.9999929"
+ orientation="-16,0"
+ id="guide4127" />
+ <sodipodi:guide
+ position="19.000007,18.999993"
+ orientation="0,-16"
+ id="guide4129" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata3818">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Capa 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(-378.85714,-540.07647)">
+ <path
+ style="opacity:1;fill:#4d4d4d;fill-opacity:1;stroke:none"
+ d="M 3 7 L 3 15 L 8 15 L 8 7 L 3 7 z M 14 7 L 14 15 L 19 15 L 19 7 L 14 7 z M 4 8 L 7 8 L 7 14 L 4 14 L 4 8 z M 15 8 L 18 8 L 18 14 L 15 14 L 15 8 z M 9 9 L 9 13 L 10 13 L 10 12 L 12 12 L 12 13 L 13 13 L 13 9 L 12 9 L 12 10 L 10 10 L 10 9 L 9 9 z "
+ transform="translate(378.85714,540.07647)"
+ id="rect4109" />
+ </g>
+</svg>
diff --git a/qt-mobile/qml/mobilecomponents/private/ActionButton.qml b/qt-mobile/qml/mobilecomponents/private/ActionButton.qml
index bfc8c5875..4dbea98b8 100644
--- a/qt-mobile/qml/mobilecomponents/private/ActionButton.qml
+++ b/qt-mobile/qml/mobilecomponents/private/ActionButton.qml
@@ -35,6 +35,15 @@ MouseArea {
minimumX: contextDrawer ? 0 : parent.width/2 - width/2
maximumX: globalDrawer ? parent.width : parent.width/2 - width/2
}
+ function toggle() {
+ showAnimation.running = false;
+ if (transform[0].y < button.height) {
+ showAnimation.to = button.height;
+ } else {
+ showAnimation.to = 0;
+ }
+ showAnimation.running = true;
+ }
transform: Translate {}
onReleased: {
@@ -88,6 +97,13 @@ MouseArea {
}
}
+ NumberAnimation {
+ id: showAnimation
+ target: button.transform[0]
+ properties: "y"
+ duration: Units.longDuration
+ easing.type: Easing.InOutQuad
+ }
Item {
id: background
anchors {
@@ -140,8 +156,8 @@ MouseArea {
DropShadow {
anchors.fill: background
horizontalOffset: 0
- verticalOffset: Units.smallSpacing/2
- radius: Units.gridUnit / 2.4
+ verticalOffset: Units.smallSpacing/3
+ radius: Units.gridUnit / 3.5
samples: 16
color: button.pressed ? "transparent" : Qt.rgba(0, 0, 0, 0.5)
source: background
generated by cgit v1.2.3-70-g09d2 (git 2.47.0) at 2025-01-07 21:53:05 +0000