phone-app

Merge lp:~boiko/phone-app/new_theming into lp:phone-app

  1. new_theming
  2. Merge into trunk
Proposed by Gustavo Pichorim Boiko
Status: Merged
Approved by: Zsombor Egri
Approved revision: 700
Merged at revision: 702
Proposed branch: lp:~boiko/phone-app/new_theming
Merge into: lp:phone-app
Diff against target: 217 lines (+17/-24)
12 files modified
src/qml/DetailViewCommunication/BaseMessageHeader.qml (+1/-0)
src/qml/DetailViewCommunication/CommunicationView.qml (+1/-5)
src/qml/DetailViewCommunication/MessagesHeader.qml (+2/-1)
src/qml/DetailViewContact/BaseContactDetailsDelegate.qml (+1/-1)
src/qml/DetailViewContact/ContactDetailsHeader.qml (+2/-0)
src/qml/DetailViewContact/EditToolbar.qml (+6/-5)
src/qml/DetailViewLiveCall/LiveCallKeypadButton.qml (+0/-1)
src/qml/DetailViewVoicemail/Voicemail.qml (+0/-2)
src/qml/PanelDialer/CustomButton.qml (+1/-1)
src/qml/PanelDialer/KeypadButton.qml (+0/-1)
src/qml/Widgets/PhonePage.qml (+3/-5)
src/qml/phone-app.qml (+0/-2)
To merge this branch: bzr merge lp:~boiko/phone-app/new_theming
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve
Florian Boucault (community) Approve
Review via email: mp+172431@code.launchpad.net

Commit message

Update phone-app to work with the new theming.

Description of the change

Update phone-app to work with the new theming.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:698
http://jenkins.qa.ubuntu.com/job/phone-app-ci/160/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/537
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-amd64-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-armhf-ci/27
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-armhf-ci/27/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-i386-ci/26
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/539
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/539/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/485

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/160/rebuild

review: Needs Fixing (continuous-integration)
lp:~boiko/phone-app/new_theming updated
699. By Gustavo Pichorim Boiko

Merge trunk.

700. By Gustavo Pichorim Boiko

AbstractButton does not have a color property.

Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:700
http://jenkins.qa.ubuntu.com/job/phone-app-ci/161/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-saucy/538
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-armhf-ci/28
        deb: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-armhf-ci/28/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phone-app-saucy-i386-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/540
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-saucy/540/artifact/work/output/*zip*/output.zip
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-runner-saucy/486

Click here to trigger a rebuild:
http://s-jenkins:8080/job/phone-app-ci/161/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Florian Boucault (fboucault) wrote :

LGTM

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'src/qml/DetailViewCommunication/BaseMessageHeader.qml'
2--- src/qml/DetailViewCommunication/BaseMessageHeader.qml 2013-03-21 17:10:07 +0000
3+++ src/qml/DetailViewCommunication/BaseMessageHeader.qml 2013-07-01 23:21:26 +0000
4@@ -23,6 +23,7 @@
5
6 width: units.gu(72)
7 height: units.gu(5)
8+ implicitHeight: units.gu(5)
9
10 Rectangle {
11 anchors.fill: parent
12
13=== modified file 'src/qml/DetailViewCommunication/CommunicationView.qml'
14--- src/qml/DetailViewCommunication/CommunicationView.qml 2013-06-27 13:13:42 +0000
15+++ src/qml/DetailViewCommunication/CommunicationView.qml 2013-07-01 23:21:26 +0000
16@@ -37,11 +37,7 @@
17
18 title: i18n.tr("Communication")
19
20- headerContents: Loader {
21- id: headerLoader
22- sourceComponent: newMessage ? newHeaderComponent : headerComponent
23- height: units.gu(10)
24- }
25+ headerContents: newMessage ? newHeaderComponent : headerComponent
26
27 ContactWatcher {
28 id: contactWatcher
29
30=== modified file 'src/qml/DetailViewCommunication/MessagesHeader.qml'
31--- src/qml/DetailViewCommunication/MessagesHeader.qml 2013-05-23 21:11:15 +0000
32+++ src/qml/DetailViewCommunication/MessagesHeader.qml 2013-07-01 23:21:26 +0000
33@@ -28,6 +28,7 @@
34 property string title
35
36 height: icon.height + units.gu(4)
37+ implicitHeight: icon.height + units.gu(4)
38
39 UbuntuShape {
40 id: icon
41@@ -77,7 +78,7 @@
42
43 Button {
44 id: contactDetailsButton
45- ItemStyle.class: "transparent-button"
46+ color: "transparent"
47 anchors.right: parent.right
48 anchors.verticalCenter: parent.verticalCenter
49 anchors.margins: units.gu(2)
50
51=== modified file 'src/qml/DetailViewContact/BaseContactDetailsDelegate.qml'
52--- src/qml/DetailViewContact/BaseContactDetailsDelegate.qml 2013-03-26 19:42:08 +0000
53+++ src/qml/DetailViewContact/BaseContactDetailsDelegate.qml 2013-07-01 23:21:26 +0000
54@@ -244,7 +244,7 @@
55 width: units.gu(2)
56 height: units.gu(2)
57 iconSource: "../assets/icon_edit_remove.png"
58- ItemStyle.class: "transparent-button"
59+ color: "transparent"
60 visible: editingActive
61 enabled: visible
62
63
64=== modified file 'src/qml/DetailViewContact/ContactDetailsHeader.qml'
65--- src/qml/DetailViewContact/ContactDetailsHeader.qml 2013-05-29 13:24:09 +0000
66+++ src/qml/DetailViewContact/ContactDetailsHeader.qml 2013-07-01 23:21:26 +0000
67@@ -33,7 +33,9 @@
68 width: parent.width
69 // ensure that there is equal padding at the top and bottom of labelBox
70 height: editable ? Math.max(labelBox.height + labelBox.anchors.topMargin * 2, units.gu(10)) : units.gu(12)
71+ implicitHeight: editable ? Math.max(labelBox.height + labelBox.anchors.topMargin * 2, units.gu(10)) : units.gu(12)
72 Behavior on height { LocalWidgets.StandardAnimation {}}
73+ Behavior on implicitHeight { LocalWidgets.StandardAnimation {}}
74
75 function save() {
76 name.save()
77
78=== modified file 'src/qml/DetailViewContact/EditToolbar.qml'
79--- src/qml/DetailViewContact/EditToolbar.qml 2013-06-04 19:29:52 +0000
80+++ src/qml/DetailViewContact/EditToolbar.qml 2013-07-01 23:21:26 +0000
81@@ -17,11 +17,10 @@
82 */
83
84 import QtQuick 2.0
85-import Ubuntu.Components 0.1 as Theming
86+import Ubuntu.Components 0.1
87
88-Item {
89+StyledItem {
90 id: toolbar
91- Theming.ItemStyle.class: "toolbar"
92 height: visible ? units.gu(6.5) : 0
93 anchors.left: parent.left
94 anchors.right: parent.right
95@@ -32,9 +31,8 @@
96
97 Component {
98 id: toolButtonComponent
99- Item {
100+ StyledItem {
101 id: toolButton
102- Theming.ItemStyle.class: "toolbar-button"
103 property string text: parent && parent.text ? parent.text : ""
104 property url iconSource: parent && parent.iconSource ? parent.iconSource : ""
105 signal clicked()
106@@ -45,6 +43,7 @@
107 anchors.fill: parent
108 onClicked: parent.clicked()
109 }
110+ style: Theme.createStyleComponent("ToolbarButtonStyle.qml", toolButton)
111 }
112 }
113
114@@ -109,4 +108,6 @@
115 onItemTriggered: toolbar.saveClicked()
116 }
117 }
118+
119+ style: Theme.createStyleComponent("ToolbarStyle.qml", toolbar)
120 }
121
122=== modified file 'src/qml/DetailViewLiveCall/LiveCallKeypadButton.qml'
123--- src/qml/DetailViewLiveCall/LiveCallKeypadButton.qml 2013-07-01 18:43:31 +0000
124+++ src/qml/DetailViewLiveCall/LiveCallKeypadButton.qml 2013-07-01 23:21:26 +0000
125@@ -24,7 +24,6 @@
126
127 property alias iconSource: icon.source
128 property bool selected: false
129- ItemStyle.class: "transparent"
130
131 width: units.gu(9)
132 height: units.gu(9)
133
134=== modified file 'src/qml/DetailViewVoicemail/Voicemail.qml'
135--- src/qml/DetailViewVoicemail/Voicemail.qml 2013-05-24 13:08:32 +0000
136+++ src/qml/DetailViewVoicemail/Voicemail.qml 2013-07-01 23:21:26 +0000
137@@ -131,7 +131,6 @@
138 iconSource: isVoicemailActive() ? "../assets/incall_keypad_endcallbutton_icon.png" : "../assets/voicemail_icon.png"
139 width: isVoicemailActive() ? units.gu(8) : units.gu(16)
140 color: isVoicemailActive() ? "#bf400c" : "#268bd2"
141- ItemStyle.class: "dark-button"
142 onClicked: {
143 if(isVoicemailActive())
144 endCall()
145@@ -146,7 +145,6 @@
146 visible: isVoicemailActive()
147 iconSource: call && call.speaker ? "../assets/incall_keypad_speaker_selected.png" : "../assets/incall_keypad_speaker_unselected.png"
148 color: "#565656"
149- ItemStyle.class: "dark-button"
150 state: call && call.speaker ? "pressed" : ""
151 onClicked: {
152 if (call) {
153
154=== modified file 'src/qml/PanelDialer/CustomButton.qml'
155--- src/qml/PanelDialer/CustomButton.qml 2013-03-12 20:27:37 +0000
156+++ src/qml/PanelDialer/CustomButton.qml 2013-07-01 23:21:26 +0000
157@@ -41,5 +41,5 @@
158 source: icon
159 fillMode: Image.PreserveAspectFit
160 }
161- ItemStyle.class: "transparent"
162+ color: "transparent"
163 }
164
165=== modified file 'src/qml/PanelDialer/KeypadButton.qml'
166--- src/qml/PanelDialer/KeypadButton.qml 2013-07-01 18:43:31 +0000
167+++ src/qml/PanelDialer/KeypadButton.qml 2013-07-01 23:21:26 +0000
168@@ -33,7 +33,6 @@
169 property int keycode
170 property bool isCorner: false
171 property int corner
172- ItemStyle.class: "transparent"
173
174 BorderImage {
175 id: shape
176
177=== modified file 'src/qml/Widgets/PhonePage.qml'
178--- src/qml/Widgets/PhonePage.qml 2013-05-20 20:54:07 +0000
179+++ src/qml/Widgets/PhonePage.qml 2013-07-01 23:21:26 +0000
180@@ -24,7 +24,7 @@
181 id: page
182 property string source
183 property int previousTab: -1
184- property variant headerContents: null
185+ property Component headerContents: null
186
187 onActiveChanged: updateHeader()
188 onHeaderChanged: updateHeader()
189@@ -33,11 +33,9 @@
190 function updateHeader() {
191 if (page.header && page.headerContents != null) {
192 if (active) {
193- page.header.ItemStyle.delegate = page.headerContents;
194- page.header.height = page.headerContents.height;
195+ page.header.style = page.headerContents;
196 } else {
197- page.headerContents.parent = page;
198- page.header.ItemStyle.delegate = null;
199+ page.header.style = Theme.createStyleComponent("HeaderStyle.qml", page.header);
200 }
201 }
202 }
203
204=== modified file 'src/qml/phone-app.qml'
205--- src/qml/phone-app.qml 2013-06-14 13:31:22 +0000
206+++ src/qml/phone-app.qml 2013-07-01 23:21:26 +0000
207@@ -220,10 +220,8 @@
208 Tabs {
209 id: tabs
210 anchors.fill: parent
211- ItemStyle.class: singlePane ? "new-tabs" : "tabs"
212
213 property variant tabPageItems: [ callsTab.page.item, communicationsTab.page.item, contactsTab.page.item ]
214- Component.onCompleted: ItemStyle.style.swipeToSwitchTabs = true
215
216 Tab {
217 id: callsTab

Subscribers

People subscribed via source and target branches