git.iko.soy/unity8
on xenial help sign in
Initial implementation of synchronous (aka confirmation) notification support.
4920ee1Mirco Müller
qml/Notifications/Notification.qml+40−11
compare with xenial
unifiedsplit
@@ -30,6 +30,7 @@ Item {
30 property alias secondaryIconSource: secondaryIcon.source
30 property alias secondaryIconSource: secondaryIcon.source
31 property alias summary: summaryLabel.text
31 property alias summary: summaryLabel.text
32 property alias body: bodyLabel.text
32 property alias body: bodyLabel.text
33+ property alias value: valueIndicator.value
33 property var actions
34 property var actions
34 property var notificationId
35 property var notificationId
35 property var type
36 property var type
@@ -51,7 +52,7 @@ Item {
51 objectName: "background"
52 objectName: "background"
52 implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
53 implicitHeight: type !== Notification.PlaceHolder ? (fullscreen ? maxHeight : contentColumn.height + contentColumn.spacing * 2) : 0
53
54
54− color: Qt.rgba(0.132, 0.117, 0.109, 0.97)
55+ color: type == Notification.Confirmation && notificationList.useModal && !greeter.shown ? "#eaeaea" : Qt.rgba(0.132, 0.117, 0.109, 0.97)
55 opacity: 0
56 opacity: 0
56
57
57 state: {
58 state: {
@@ -226,18 +227,18 @@ Item {
226 width: units.gu(6)
227 width: units.gu(6)
227 height: units.gu(6)
228 height: units.gu(6)
228 shaped: notification.hints["x-canonical-non-shaped-icon"] == "true" ? false : true
229 shaped: notification.hints["x-canonical-non-shaped-icon"] == "true" ? false : true
229− visible: iconSource !== undefined && iconSource != ""
230+ visible: iconSource !== undefined && iconSource != "" && type != Notification.Confirmation
230− }
231+ }
231
232
232− Image {
233+ Image {
233− id: secondaryIcon
234+ id: secondaryIcon
234
235
235− objectName: "secondaryIcon"
236+ objectName: "secondaryIcon"
236− width: units.gu(2)
237+ width: units.gu(2)
237− height: units.gu(2)
238+ height: units.gu(2)
238− visible: source !== undefined && source != ""
239+ visible: source !== undefined && source != ""
239− fillMode: Image.PreserveAspectCrop
240+ fillMode: Image.PreserveAspectCrop
240− }
241+ }
241
242
242 Column {
243 Column {
243 id: labelColumn
244 id: labelColumn
@@ -253,6 +254,7 @@ Item {
253 left: parent.left
254 left: parent.left
254 right: parent.right
255 right: parent.right
255 }
256 }
257+ visible: type != Notification.Confirmation
256 fontSize: "medium"
258 fontSize: "medium"
257 font.bold: true
259 font.bold: true
258 color: Theme.palette.selected.backgroundText
260 color: Theme.palette.selected.backgroundText
@@ -278,6 +280,33 @@ Item {
278 }
280 }
279 }
281 }
280
282
283+ ShapedIcon {
284+ id: centeredIcon
285+
286+ objectName: "centeredIcon"
287+ width: units.gu(6)
288+ height: width
289+ shaped: notification.hints["x-canonical-non-shaped-icon"] == "true" ? false : true
290+ fileSource: icon.fileSource
291+ visible: fileSource !== undefined && fileSource != "" && type == Notification.Confirmation
292+ anchors.horizontalCenter: parent.horizontalCenter
293+ }
294+
295+ ProgressBar {
296+ id: valueIndicator
297+ objectName: "valueIndicator"
298+ visible: type == Notification.Confirmation
299+ minimumValue: 0.0
300+ maximumValue: 100.0
301+ height: units.gu(1)
302+ showProgressPercentage: false
303+
304+ anchors {
305+ left: parent.left
306+ right: parent.right
307+ }
308+ }
309+
281 Column {
310 Column {
282 id: dialogColumn
311 id: dialogColumn
283 objectName: "dialogListView"
312 objectName: "dialogListView"
qml/Notifications/Notifications.qml+1
@@ -55,6 +55,7 @@ ListView {
55 secondaryIconSource: model.secondaryIcon
55 secondaryIconSource: model.secondaryIcon
56 summary: model.summary
56 summary: model.summary
57 body: model.body
57 body: model.body
58+ value: model.value
58 actions: model.actions
59 actions: model.actions
59 notificationId: model.id
60 notificationId: model.id
60 notification: notificationList.model.getRaw(notificationId)
61 notification: notificationList.model.getRaw(notificationId)