marcoallegretti/shift-shell
1
0
Fork 0
mirror of https://invent.kde.org/marcoa/shift-shell.git synced 2026-04-29 07:03:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

solve conflicts

Browse source
This commit is contained in:
Marco Martin 2015-05-12 16:27:18 +02:00
parent 264bff2854
commit f8dbef7477
1 changed files with 0 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
shell/contents/views/Desktop.qml
View file

@ -41,33 +41,8 @@ Item {
property int notificationId: 0;
property int buttonHeight: width/4
<<<<<<< HEAD
/*
Notification data object has the following properties:
appIcon
image
appName
summary
body
isPersistent
expireTimeout
urgency
appRealName
configurable
*/
function addNotification(source, data, actions) {
// Do not show duplicated notifications
// Remove notifications that are sent again (odd, but true)
for (var i = 0; i < notificationsModel.count; ++i) {
var tmp = notificationsModel.get(i);
var matches = (tmp.appName == data.appName &&
tmp.summary == data.summary &&
tmp.body == data.body);
var sameSource = tmp.source == source;
=======
onContainmentChanged: {
containment.parent = homescreen;
>>>>>>> mart/newContainmentShell
if (containment != null) {
containment.visible = true;