summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatt Ranostay <matt.ranostay@konsulko.com>2019-09-17 23:55:48 -0700
committerJan-Simon Moeller <jsmoeller@linuxfoundation.org>2019-10-04 21:14:55 +0000
commit4ab3093e029628fbd1ca73891c81373be884e85f (patch)
tree3e72a0021d377d2542299a02fa612b7b6f09e1dc
parente6ed48622bda295103042f56772561c381c8f3a1 (diff)
messaging: allow messages to be closed in Alert screen
Bug-AGL: SPEC-2566 Change-Id: I882061af5a9d4feef41f7d48383dd4088f033f2e Signed-off-by: Matt Ranostay <matt.ranostay@konsulko.com>
-rw-r--r--app/Notification.qml7
-rw-r--r--app/images/HMI_Settings_X.svg72
-rw-r--r--app/images/images.qrc1
3 files changed, 80 insertions, 0 deletions
diff --git a/app/Notification.qml b/app/Notification.qml
index 1410f8c..6be41ff 100644
--- a/app/Notification.qml
+++ b/app/Notification.qml
@@ -17,6 +17,7 @@
import QtQuick 2.11
import QtQuick.Layouts 1.11
import QtQuick.Controls 2.4
+import AGL.Demo.Controls 1.0
Item {
height: msg.height
@@ -25,6 +26,12 @@ Item {
id: msg
anchors.left: parent.left
anchors.right: parent.right
+
+ ImageButton {
+ padding: 10
+ offImage: '../images/HMI_Settings_X.svg'
+ onClicked: notificationModel.remove(index)
+ }
Label {
text: '<b>' + name + '</b>'
font.pixelSize: 42
diff --git a/app/images/HMI_Settings_X.svg b/app/images/HMI_Settings_X.svg
new file mode 100644
index 0000000..5ad9479
--- /dev/null
+++ b/app/images/HMI_Settings_X.svg
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 21.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
+
+<svg
+ xmlns:i="&amp;#38;ns_ai;"
+ 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"
+ version="1.1"
+ x="0px"
+ y="0px"
+ viewBox="0 0 45 45"
+ style="enable-background:new 0 0 45 45;"
+ xml:space="preserve"
+ id="svg2"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="HMI_ContactScreen_X-01.svg"><metadata
+ id="metadata66"><rdf:RDF><cc:Work
+ rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+ id="defs64" /><sodipodi:namedview
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1"
+ objecttolerance="10"
+ gridtolerance="10"
+ guidetolerance="10"
+ inkscape:pageopacity="0"
+ inkscape:pageshadow="2"
+ inkscape:window-width="2560"
+ inkscape:window-height="1464"
+ id="namedview62"
+ showgrid="false"
+ inkscape:zoom="5.2444444"
+ inkscape:cx="-132.61653"
+ inkscape:cy="22.5"
+ inkscape:window-x="0"
+ inkscape:window-y="0"
+ inkscape:window-maximized="1"
+ inkscape:current-layer="svg2" /><style
+ type="text/css"
+ id="style4">
+ .st0{fill:none;stroke:#FFFFFF;stroke-miterlimit:10;}
+ .st1{display:none;}
+ .st2{display:inline;opacity:0.15;fill:url(#SVGID_1_);}
+ .st3{display:inline;opacity:0.35;fill:url(#SVGID_2_);}
+ .st4{display:inline;}
+ .st5{opacity:0.15;fill:url(#SVGID_3_);}
+ .st6{opacity:0.15;fill:url(#SVGID_4_);stroke:url(#SVGID_5_);stroke-miterlimit:10;}
+ .st7{fill:url(#SVGID_6_);}
+</style><switch
+ id="switch6"><g
+ i:extraneous="self"
+ id="g8"><g
+ id="Inactive"><g
+ id="g11"><line
+ class="st0"
+ x1="44.8"
+ y1="44.8"
+ x2="0.2"
+ y2="0.2"
+ id="line13" /><line
+ class="st0"
+ x1="45"
+ y1="0"
+ x2="0"
+ y2="45"
+ id="line15" /></g></g></g></switch></svg> \ No newline at end of file
diff --git a/app/images/images.qrc b/app/images/images.qrc
index 2a3d89d..801b57e 100644
--- a/app/images/images.qrc
+++ b/app/images/images.qrc
@@ -6,5 +6,6 @@
<file>ic_call_missed_48px.svg</file>
<file>ic_call_received_48px.svg</file>
<file>ic_call_made_48px.svg</file>
+ <file>HMI_Settings_X.svg</file>
</qresource>
</RCC>