From c53aa7dbfbb615e0aea28a414672882a86468cb3 Mon Sep 17 00:00:00 2001
From: Dirk Hohndel <dirk@hohndel.org>
Date: Mon, 4 Jan 2016 13:01:42 -0800
Subject: [PATCH] QML UI: add context menu button

Right now this is an alternative to the magic action button - but the goal is
to replace it completely.

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 qt-mobile/qml/TopBar.qml             |  28 +++++++++++++++++++++++++++
 qt-mobile/qml/icons/context-menu.png | Bin 0 -> 641 bytes
 qt-mobile/qml/icons/context-menu.svg |   1 +
 qt-mobile/qml/mobile-resources.qrc   |   1 +
 4 files changed, 30 insertions(+)
 create mode 100644 qt-mobile/qml/icons/context-menu.png
 create mode 100644 qt-mobile/qml/icons/context-menu.svg

diff --git a/qt-mobile/qml/TopBar.qml b/qt-mobile/qml/TopBar.qml
index e52909bca..a7630860f 100644
--- a/qt-mobile/qml/TopBar.qml
+++ b/qt-mobile/qml/TopBar.qml
@@ -80,5 +80,33 @@ Rectangle {
 		Item {
 			Layout.fillWidth: true
 		}
+		Item {
+			id: contextMenu
+			visible: contextDrawer.enabled
+			anchors.right: parent.right
+			anchors.top: parent.top
+			Layout.preferredHeight: contextMenuIcon.height
+			width: contextMenuIcon.width
+			Image {
+				id: contextMenuIcon
+				source: "qrc:/qml/context-menu.png"
+				width: MobileComponents.Units.gridUnit
+				height: width
+				anchors {
+					top: parent.top
+					right: parent.right
+					topMargin: MobileComponents.Units.smallSpacing * -1
+					rightMargin: MobileComponents.Units.smallSpacing
+				}
+			}
+			MouseArea {
+				height: parent.height
+				width: parent.width
+				onClicked: {
+					contextDrawer.open()
+				}
+			}
+		}
+
 	}
 }
diff --git a/qt-mobile/qml/icons/context-menu.png b/qt-mobile/qml/icons/context-menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..df34cfd4f67f9109acac2853067b5c3d1db0b40a
GIT binary patch
literal 641
zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE8Azrw%`pX1lLLH0T!HleK?W{btHuGHWl$32
z7tHYT*U#C?Urx<9&dYIe-s?!tH(hhouJovWeWjwW^gAqqXXdxg=b_w+ZRgqf3@>r%
z{nh*MiGhJJ*VDx@q~g}wTkd%*iUJN7oA@Rde|R#-#;^4M<x2BQCwTAO5K{eH&cwwi
zy$@&=1pJwsroWzd&--hia)aMUmh=5Gkk&mi?O(}S|34d4+xGZ;X)jYu+jD+vQ}nEx
z|96HJwa)lpd9k6)TW3brg+LyO^`<ApC++KVdopRy_GY&!)}FEci_IqOidp<>(ym!<
zrYfb(y+xC()(1*5|JlCI%~H?s{0seUQl-<bn5Ihw#;H^)_ulaSB^KAbX{v<5l?AgS
zF8sgHaDDfT0E@LHySfCu!*~AEH(Z<%K4<=FiAz>hwUh3?OY)vL{a3)d@TBv3!TCFM
zihF<kR04U$LEi-p9&tBc$+%a5`2zPvERYeTX|Dh}l)t-#?TZr+rfDG4SwMO~K;R4S
Wlgh1C4e5c=Ag-sYpUXO@geCxER#W}}

literal 0
HcmV?d00001

diff --git a/qt-mobile/qml/icons/context-menu.svg b/qt-mobile/qml/icons/context-menu.svg
new file mode 100644
index 000000000..e0750c57e
--- /dev/null
+++ b/qt-mobile/qml/icons/context-menu.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="48" height="48" viewBox="0 0 48 48"><path d="M24 16c2.21 0 4-1.79 4-4s-1.79-4-4-4-4 1.79-4 4 1.79 4 4 4zm0 4c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 12c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4z"/></svg>
\ No newline at end of file
diff --git a/qt-mobile/qml/mobile-resources.qrc b/qt-mobile/qml/mobile-resources.qrc
index 24b88676f..8d799f09f 100644
--- a/qt-mobile/qml/mobile-resources.qrc
+++ b/qt-mobile/qml/mobile-resources.qrc
@@ -16,6 +16,7 @@
 		<file>dive.jpg</file>
 		<file alias="subsurface-mobile-icon.png">../../icons/subsurface-mobile-icon.png</file>
 		<file alias="main-menu.png">icons/main-menu.png</file>
+		<file alias="context-menu.png">icons/context-menu.png</file>
 	</qresource>
 	<qresource prefix="/imports">
 		<file alias="org/kde/plasma/mobilecomponents/qmldir">mobilecomponents/qmldir</file>