Skip to content

G
glacier-home
Commit 553cc535 authored by Sergey Chupligin's avatar Sergey Chupligin
Browse files
Options

[FeedsPage] Fix notification view

parent cef25788
Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 41 deletions
src/qml/FeedsPage.qml
View file @ 553cc535
...@@ -28,6 +28,9 @@ import QtQuick.Controls.Nemo 1.0 ...@@ -28,6 +28,9 @@ import QtQuick.Controls.Nemo 1.0
import QtQuick.Controls.Styles.Nemo 1.0 import QtQuick.Controls.Styles.Nemo 1.0
// Feeds page: // Feeds page:
// the place for an event feed. // the place for an event feed.
import "notifications"
Flickable { Flickable {
id: mainFlickable id: mainFlickable
...@@ -79,51 +82,17 @@ Flickable { ...@@ -79,51 +82,17 @@ Flickable {
Column { Column {
id: notificationColumn id: notificationColumn
anchors.top: daterow.bottom width: parent.width
anchors.topMargin: 20 anchors{
top: daterow.bottom
topMargin: 50
}
spacing: 10 spacing: 10
Repeater { Repeater {
model: NotificationListModel { model: NotificationListModel {
id: notifmodel id: notifmodel
} }
delegate: NotificationPreview{} delegate: NotificationItem{}
/*MouseArea {
height: Math.max(appSummary.height,appBody.height)
width: rootitem.width
onClicked: {
if (modelData.userRemovable) {
modelData.actionInvoked("default")
}
}
Image {
id: appIcon
source: {
if (modelData.icon)
return "image://theme/" + modelData.icon
else
return ""
}
}
Label {
id: appSummary
text: modelData.summary
width: (rootitem.width-appIcon.width)/2
font.pointSize: 10
anchors.left: appIcon.right
wrapMode: Text.Wrap
}
Label {
id: appBody
width: (rootitem.width-appIcon.width)/2
text: modelData.body
font.pointSize: 8
wrapMode: Text.Wrap
anchors.left: appSummary.right
}
}*/
} }
} }
} }
......
src/qml/images/glacier.svg 0 → 100644
View file @ 553cc535
<?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:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="256"
height="256"
viewBox="0 0 256 256"
id="svg13136"
version="1.1"
inkscape:version="0.91 r13725"
inkscape:export-filename="/home/OMP/s.chupligin/glacier-icon.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90"
sodipodi:docname="glacier.svg">
<defs
id="defs13138">
<radialGradient
inkscape:collect="always"
xlink:href="#linearGradient13084"
id="radialGradient10264"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(3.0919675,5.3466544,-6.5411293,3.7827321,1353.3525,-721.49382)"
cx="122.20074"
cy="249.48393"
fx="122.20074"
fy="249.48393"
r="9.2696419" />
<linearGradient
inkscape:collect="always"
id="linearGradient13084">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop13086" />
<stop
style="stop-color:#ffffff;stop-opacity:0;"
offset="1"
id="stop13088" />
</linearGradient>
<linearGradient
inkscape:collect="always"
xlink:href="#linearGradient13084"
id="linearGradient13090"
x1="340.37659"
y1="338.91037"
x2="340.06583"
y2="359.1134"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(5.4132249,0,0,5.4132249,-1718.8788,-999.48462)" />
</defs>
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="0.90509668"
inkscape:cx="155.66716"
inkscape:cy="-69.818979"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="false"
units="px"
showborder="true"
inkscape:window-width="1920"
inkscape:window-height="1051"
inkscape:window-x="0"
inkscape:window-y="312"
inkscape:window-maximized="1" />
<metadata
id="metadata13141">
<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="Layer 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-796.36219)">
<g
id="g13712"
transform="matrix(0.97656245,0,0,0.98640615,3.0000064,12.565648)">
<circle
r="118.52686"
cy="924.36218"
cx="128"
id="path9292-1"
style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:#0091e5;stroke-width:18.94628716;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;marker:none;enable-background:accumulate" />
<circle
r="112.03339"
cy="926.69427"
cx="130.39465"
id="path9292"
style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.56999966;fill:url(#radialGradient10264);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:5.34465504;marker:none;enable-background:accumulate" />
<path
sodipodi:nodetypes="cccccccc"
inkscape:connector-curvature="0"
id="path13074"
d="m 25.471736,963.78678 34.1764,-50.58066 15.0374,24.60686 57.415904,-73.82053 31.4422,42.37844 66.9848,31.44209 -1.3668,30.07497 z"
style="fill:url(#linearGradient13090);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
</g>
</g>
</svg>
src/qml/notifications/NotificationItem.qml 0 → 100644
View file @ 553cc535
import QtQuick 2.0
import QtQuick.Controls.Nemo 1.0
import QtQuick.Controls.Styles.Nemo 1.0
MouseArea {
id: notifyArea
height: childrenRect.height
width: rootitem.width
onClicked: {
if (modelData.userRemovable) {
modelData.actionInvoked("default")
}
}
Image {
id: appIcon
height: 100
width: height
anchors{
left: parent.left
leftMargin: 20
}
source: {
if (modelData.icon)
return "image://theme/" + modelData.icon
else
return "/usr/share/lipstick-glacier-home-qt5/qml/images/glacier.svg"
}
}
Label {
id: appSummary
text: modelData.summary
width: (rootitem.width-appIcon.width)-40
font.pointSize: 10
font.bold :true
font.capitalization: Font.AllUppercase
anchors{
left: appIcon.right
leftMargin: 20
top: parent.top
}
wrapMode: Text.Wrap
}
Label {
id: appBody
width: (rootitem.width-appIcon.width)-40
text: modelData.body
font.pointSize: 8
anchors{
left: appSummary.left
top: appSummary.bottom
}
wrapMode: Text.Wrap
}
}
src/src.pro
View file @ 553cc535
...@@ -66,7 +66,9 @@ connectivity.files = qml/connectivity/USBModeSelector.qml \ ...@@ -66,7 +66,9 @@ connectivity.files = qml/connectivity/USBModeSelector.qml \
qml/connectivity/ConnectionSelector.qml qml/connectivity/ConnectionSelector.qml
notifications.path = /usr/share/lipstick-glacier-home-qt5/qml/notifications notifications.path = /usr/share/lipstick-glacier-home-qt5/qml/notifications
notifications.files = qml/notifications/NotificationPreview.qml notifications.files = qml/notifications/NotificationItem.qml\
qml/notifications/NotificationPreview.qml
INSTALLS += styles images theme qml qmlcompositor scripts system volumecontrol connectivity notifications INSTALLS += styles images theme qml qmlcompositor scripts system volumecontrol connectivity notifications
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment