Merge lp:~mzanetti/unity/phablet.remove-unused-header into lp:unity/phablet

Proposed by Michael Zanetti
Status: Merged
Approved by: Michał Sawicz
Approved revision: no longer in the source branch.
Merged at revision: 581
Proposed branch: lp:~mzanetti/unity/phablet.remove-unused-header
Merge into: lp:unity/phablet
Diff against target: 84 lines (+0/-80)
1 file modified
Dash/People/Preview/Header.qml (+0/-80)
To merge this branch: bzr merge lp:~mzanetti/unity/phablet.remove-unused-header
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Michał Sawicz Approve
Review via email: mp+158364@code.launchpad.net

Commit message

get rid of old header which was replaced by switching to DashPreview

To post a comment you must log in.
Revision history for this message
Michał Sawicz (saviq) :
review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'Dash/People/Preview/Header.qml'
2--- Dash/People/Preview/Header.qml 2013-01-15 11:37:07 +0000
3+++ Dash/People/Preview/Header.qml 1970-01-01 00:00:00 +0000
4@@ -1,80 +0,0 @@
5-/*
6- * Copyright (C) 2013 Canonical, Ltd.
7- *
8- * This program is free software; you can redistribute it and/or modify
9- * it under the terms of the GNU General Public License as published by
10- * the Free Software Foundation; version 3.
11- *
12- * This program is distributed in the hope that it will be useful,
13- * but WITHOUT ANY WARRANTY; without even the implied warranty of
14- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15- * GNU General Public License for more details.
16- *
17- * You should have received a copy of the GNU General Public License
18- * along with this program. If not, see <http://www.gnu.org/licenses/>.
19- */
20-
21-import QtQuick 2.0
22-import Ubuntu.Components 0.1
23-
24-Base {
25- id: root
26-
27- Item {
28- anchors {
29- left: parent.left
30- right: parent.right
31- leftMargin: units.gu(2)
32- rightMargin: units.gu(4)
33- }
34- height: units.gu(11.5)
35-
36- Row {
37- spacing: units.gu(1)
38-
39- height: childrenRect.height
40- anchors {
41- verticalCenter: parent.verticalCenter
42- left: parent.left
43- right: parent.right
44- }
45-
46- UbuntuShape {
47- id: avatar
48- width: units.gu(8)
49- height: units.gu(7.5)
50- radius: "medium"
51- image: Image {
52- source: root.model ? root.model.avatar : ""
53- sourceSize { width: avatar.width; height: avatar.height }
54- fillMode: Image.PreserveAspectCrop
55- }
56- }
57-
58- Image {
59- id: icon
60- width: units.gu(2)
61- height: units.gu(2)
62- anchors {
63- top: parent.top
64- topMargin: units.gu(1)
65- }
66- source: root.model && root.model.model.favorite ? "../graphics/star_favourite.png" : "../graphics/star_not_favourite.png"
67- }
68-
69- Label {
70- width: parent.width - units.gu(10)
71- anchors.baseline: icon.bottom
72- text: root.model ? root.model.displayName : ""
73- color: "#f3f3e7"
74- style: Text.Raised
75- styleColor: "black"
76- opacity: 0.9;
77- fontSize: "large"
78- wrapMode: Text.WordWrap
79- maximumLineCount: 2
80- font.weight: Font.Light
81- }
82- }
83- }
84-}

Subscribers

People subscribed via source and target branches