1
=== modified file 'qml/Launcher/LauncherDelegate.qml'
2
--- qml/Launcher/LauncherDelegate.qml	2014-07-09 19:45:23 +0000
3
+++ qml/Launcher/LauncherDelegate.qml	2014-07-29 10:22:56 +0000
4
@@ -70,28 +70,31 @@
5
70
            height: root.itemHeight - units.gu(1)
70
            height: root.itemHeight - units.gu(1)
6
71
        }
71
        }
7
72
72
9
73
        BorderImage {
73
        UbuntuShape {
10
74
            objectName: "countEmblem"
74
            objectName: "countEmblem"
11
75
            anchors {
75
            anchors {
12
76
                right: parent.right
76
                right: parent.right
13
77
                top: parent.top
77
                top: parent.top
14
78
                margins: units.dp(3)
78
                margins: units.dp(3)
15
79
            }
79
            }
19
80
            width: Math.min(root.itemWidth, Math.max(units.gu(3), countLabel.implicitWidth + units.gu(2.5)))
80
            width: Math.min(root.itemWidth, Math.max(units.gu(2), countLabel.implicitWidth + units.gu(1)))
20
81
            height: units.gu(3)
81
            height: units.gu(2)
21
82
            source: "graphics/notification.sci"
82
            color: UbuntuColors.orange
22
83
            visible: root.count > 0
83
            visible: root.count > 0
23
84
            borderSource: "none"
24
84
85
25
85
            Label {
86
            Label {
26
86
                id: countLabel
87
                id: countLabel
27
87
                text: root.count
88
                text: root.count
28
88
                anchors.centerIn: parent
89
                anchors.centerIn: parent
29
90
                // FIXME: verticalCenter seems to be off wee bit and QML doesn't have a centerLine
30
91
                // property for Text: https://bugreports.qt-project.org/browse/QTBUG-40479
31
92
                anchors.verticalCenterOffset: -units.dp(.5)
32
89
                width: root.itemWidth - units.gu(1)
93
                width: root.itemWidth - units.gu(1)
33
90
                horizontalAlignment: Text.AlignHCenter
94
                horizontalAlignment: Text.AlignHCenter
34
91
                elide: Text.ElideRight
95
                elide: Text.ElideRight
35
92
                color: "white"
96
                color: "white"
38
93
                fontSize: "small"
97
                fontSize: "x-small"
37
94
                font.bold: true
39
95
            }
98
            }
40
96
        }
99
        }
41
97
100
42
98
101
43
=== removed file 'qml/Launcher/graphics/notification@30.png'
44
99
Binary files qml/Launcher/graphics/notification@30.png	2013-08-19 19:34:03 +0000 and qml/Launcher/graphics/notification@30.png	1970-01-01 00:00:00 +0000 differ
102
Binary files qml/Launcher/graphics/notification@30.png	2013-08-19 19:34:03 +0000 and qml/Launcher/graphics/notification@30.png	1970-01-01 00:00:00 +0000 differ
45
=== removed file 'qml/Launcher/graphics/notification@30.sci'
46
--- qml/Launcher/graphics/notification@30.sci	2013-08-19 19:34:03 +0000
47
+++ qml/Launcher/graphics/notification@30.sci	1970-01-01 00:00:00 +0000
48
@@ -1,5 +0,0 @@
49
1
border.left: 36
50
2
border.top: 36
51
3
border.bottom: 36
52
4
border.right: 36
53
5
source: notification@30.png
54
6
\ No newline at end of file
0
\ No newline at end of file
Reviewer	Review Type	Date Requested	Status
PS Jenkins bot (community)	continuous-integration		Approve on 2014-07-29
Andrea Cimitan (community)		2014-07-16	Approve on 2014-07-29
Vesa Rautiainen (community)	design	2014-07-16	Approve on 2014-07-18
Review via email: mp+226998@code.launchpad.net