Ubuntu Calculator App

Merge lp:~rpadovani/ubuntu-calculator-app/bumpToolkit into lp:ubuntu-calculator-app

  1. bumpToolkit
  2. Merge into trunk
Proposed by Riccardo Padovani
Status: Merged
Approved by: Riccardo Padovani
Approved revision: 242
Merged at revision: 241
Proposed branch: lp:~rpadovani/ubuntu-calculator-app/bumpToolkit
Merge into: lp:ubuntu-calculator-app
Diff against target: 539 lines (+148/-100)
16 files modified
app/engine/CalculationHistory.qml (+2/-2)
app/ubuntu-calculator-app.qml (+61/-64)
app/ui/CalcKeyboard.qml (+3/-3)
app/ui/FavouritePage.qml (+3/-3)
app/ui/KeyboardButton.qml (+3/-3)
app/ui/KeyboardPage.qml (+19/-2)
app/ui/LandscapeKeyboard.qml (+20/-2)
app/ui/PortraitKeyboard.qml (+19/-2)
app/ui/Screen.qml (+2/-2)
app/ui/ScrollableView.qml (+2/-2)
app/upstreamcomponents/EmptyState.qml (+2/-2)
app/upstreamcomponents/ListItemWithActions.qml (+3/-3)
app/upstreamcomponents/ListItemWithActionsCheckBox.qml (+3/-3)
app/upstreamcomponents/MultipleSelectionVisualModel.qml (+1/-1)
app/upstreamcomponents/PageWithBottomEdge.qml (+4/-5)
manifest.json.in (+1/-1)
To merge this branch: bzr merge lp:~rpadovani/ubuntu-calculator-app/bumpToolkit
Reviewer Review Type Date Requested Status
Jenkins Bot continuous-integration Approve
Bartosz Kosiorek Needs Fixing
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+277012@code.launchpad.net

Commit message

Update QtQuick and ubuntu-ui-toolkit

Description of the change

- Update all QtQuick to 2.4 and toolkit to 1.3
- Drop custom header in favour of standard one
- Fix bug #1413789

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:235
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/11/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/118/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/11/rebuild

review: Approve (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:235
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/368/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-vivid-amd64-ci/90

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/368/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Some small inline comment.

I will intense test it later today.

review: Needs Fixing
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:236
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/12/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/120/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/12/rebuild

review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Thanks!

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:237
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/13/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/121/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/13/rebuild

review: Approve (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Thanks Riccardo.
I noticed that following warnings are appearing:
file:///home/kosiorek/dev/core/bumpToolkit/app/upstreamcomponents/PageWithBottomEdge.qml:144:5: QML UbuntuShape: 'color' is deprecated. Use 'backgroundColor', 'secondaryBackgroundColor' and 'backgroundMode' instead.

and

uses confusion which is the active page that sets the title and actions.
file:///home/kosiorek/dev/core/bumpToolkit/app/ubuntu-calculator-app.qml:253:9: QML PageWithBottomEdge: Binding loop detected for property "height"
file:///home/kosiorek/dev/core/bumpToolkit/app/ubuntu-calculator-app.qml:253:9: QML PageWithBottomEdge: Binding loop detected for property "height"
file:///home/kosiorek/dev/core/bumpToolkit/app/ubuntu-calculator-app.qml:538:13: QML ScrollableView: Binding loop detected for property "contentHeight"
file:///home/kosiorek/dev/core/bumpToolkit/app/ubuntu-calculator-app.qml:253:9: QML PageWithBottomEdge: Binding loop detected for property "flickable"

and error during scrolling selected entries:
file:///home/kosiorek/dev/core/bumpToolkit/app/ui/ScrollableView.qml:37: TypeError: Cannot read property 'y' of null

Could you please try to fix that?

There are also errors:
file:///usr/lib/x86_64-linux-gnu/qt5/qml/Ubuntu/Components/1.3/PageWrapperUtils.js:90: TypeError: Cannot read property 'createObject' of null

review: Needs Fixing
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

BTW The windows title is working perfectly now! No more "com.ubuntu.calculator" :-)

One more small issue:
When you run first time Calculator, the virtual keyboard is slighly shifted to bottom.
After first click, it moves in correct place.
Could you please take a look at this.

review: Needs Fixing
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:240
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/14/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/125/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/14/rebuild

review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

I fixed all the warnings, I'm still investigating about the virtual keyboard position

Revision history for this message
Riccardo Padovani (rpadovani) wrote :

I'm quite puzzled about the bug, it happens randomly, not all the time, probably 1 on 3. I have no idea of which is the root case, and I tried a lot of different things.

I'm sure we've already seen something like this, but I don't remember how we fixed it.
If you have any suggestions, please let me know!

Revision history for this message
Riccardo Padovani (rpadovani) wrote :

So, some progress on this.

It seems that when the app is loaded the pagestack changes its height a lot of times:
if you add onHeightChanged: console.log('pagestack ' + height) on line 254 of ubuntu-calculator-app.qml when you start the app you have something like this:

qml: pagestack 565.7091325559794
qml: pagestack 560
qml: pagestack 565.3556258961664
qml: pagestack 560
qml: pagestack 565.0021192363535
qml: pagestack 560
qml: pagestack 564.6486125765405
qml: pagestack 560
qml: pagestack 564.2951059167276
qml: pagestack 560
qml: pagestack 563.9415992569145
qml: pagestack 560
qml: pagestack 563.5880925971016
qml: pagestack 560
qml: pagestack 563.2345859372887
qml: pagestack 560
qml: pagestack 562.8810792774757
qml: pagestack 560
qml: pagestack 562.5275726176627
qml: pagestack 560
qml: pagestack 562.1740659578497
qml: pagestack 560
qml: pagestack 561.8205592980368
qml: pagestack 560
qml: pagestack 561.4670526382238
qml: pagestack 560
qml: pagestack 561.1135459784108
qml: pagestack 560
qml: pagestack 560.7600393185979
qml: pagestack 560
qml: pagestack 560.4065326587848
qml: pagestack 560
qml: pagestack 560.0746782818856
qml: pagestack 560

I need to understand what's the root cause of this change - when I'll be able to isolate it, I think I'll be able to fix it

Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Investigating more, it is related to the header. If I don't hide the header it doesn't happen.

I think is related to https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1518002, need to investigate further to find a workaround

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:241
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/23/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/169/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/23/rebuild

review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Okay, I found a workaround until the bug is fixed upstream.

It introduces a bug in the desktop mode (when you resize the window, the app scrolls down) but I think is way less important that this one

Revision history for this message
Bartosz Kosiorek (gang65) wrote :

Hello Riccardo.

Could you please submit bug report for that issue?
It will be great to resolve it upstream.

review: Approve
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-autolanding/88/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/405/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Autolanding.
More details in the following jenkins job:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-autolanding/89/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-land-mp/407/console

review: Needs Fixing (continuous-integration)
Revision history for this message
Bartosz Kosiorek (gang65) wrote :

There are same conflicts. Please resolve them. After that just top approve that.

review: Needs Fixing
lp:~rpadovani/ubuntu-calculator-app/bumpToolkit updated
242. By Riccardo Padovani

Merge upstream and fix conflicts

Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:242
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/24/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/175/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/calculator-app-ci/24/rebuild

review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Thanks Bartosz, I fixed conflicts.

The bug upstream is https://bugs.launchpad.net/ubuntu/+source/ubuntu-ui-toolkit/+bug/1518002

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'app/engine/CalculationHistory.qml'
2--- app/engine/CalculationHistory.qml 2015-03-13 14:51:17 +0000
3+++ app/engine/CalculationHistory.qml 2015-11-24 13:43:45 +0000
4@@ -1,5 +1,5 @@
5 /*
6- * Copyright (C) 2014 Canonical, Ltd.
7+ * Copyright (C) 2014-2015 Canonical, Ltd.
8 *
9 * This program is free software; you can redistribute it and/or modify
10 * it under the terms of the GNU General Public License as published by
11@@ -13,7 +13,7 @@
12 * You should have received a copy of the GNU General Public License
13 * along with this program. If not, see <http://www.gnu.org/licenses/>.
14 */
15-import QtQuick 2.3
16+import QtQuick 2.4
17 import QtQuick.LocalStorage 2.0
18
19 Item {
20
21=== modified file 'app/ubuntu-calculator-app.qml'
22--- app/ubuntu-calculator-app.qml 2015-11-22 13:59:30 +0000
23+++ app/ubuntu-calculator-app.qml 2015-11-24 13:43:45 +0000
24@@ -1,5 +1,5 @@
25 /*
26- * Copyright (C) 2014 Canonical Ltd
27+ * Copyright (C) 2014-2015 Canonical Ltd
28 *
29 * This file is part of Ubuntu Calculator App
30 *
31@@ -15,9 +15,9 @@
32 * You should have received a copy of the GNU General Public License
33 * along with this program. If not, see <http://www.gnu.org/licenses/>.
34 */
35-import QtQuick 2.3
36-import Ubuntu.Components 1.1
37-import Ubuntu.Components.Themes.Ambiance 0.1
38+import QtQuick 2.4
39+import Ubuntu.Components 1.3
40+import Ubuntu.Components.Themes.Ambiance 1.3
41
42 import "ui"
43 import "upstreamcomponents"
44@@ -31,8 +31,6 @@
45 objectName: "calculator";
46 applicationName: "com.ubuntu.calculator";
47
48- // Removes the old toolbar and enables new features of the new header.
49- useDeprecatedToolbar: false;
50 automaticOrientation: true
51 anchorToKeyboard: textInputField.visible ? false : true
52
53@@ -109,6 +107,7 @@
54
55 // Maximum length of the result number
56 var NUMBER_LENGTH_LIMIT = 14;
57+
58 if (bigNumberToFormat.toString().length > NUMBER_LENGTH_LIMIT) {
59 var resultLength = mathJs.format(bigNumberToFormat, {exponential: {lower: 1e-10, upper: 1e10},
60 precision: NUMBER_LENGTH_LIMIT}).toString().length;
61@@ -238,14 +237,19 @@
62 id: mainStack
63
64 Component.onCompleted: {
65-
66 push(calculatorPage);
67 calculatorPage.forceActiveFocus();
68 }
69
70+ onHeightChanged: scrollableView.scrollToBottom();
71+ anchors.fill: parent
72+
73 PageWithBottomEdge {
74 id: calculatorPage
75
76+ title: i18n.tr("Calculator")
77+ anchors.fill: parent
78+
79 bottomEdgeTitle: i18n.tr("Favorite")
80
81 bottomEdgePageComponent: FavouritePage {
82@@ -260,23 +264,27 @@
83 states: [
84 State {
85 name: "default"
86- StateChangeScript {
87- script: header.hide()
88- }
89 PropertyChanges {
90 target: scrollableView
91 clip: false
92 }
93+ PropertyChanges {
94+ target: calculatorPage.head
95+ visible: false
96+ preset: ""
97+ }
98 },
99 State {
100 name: "selection"
101- StateChangeScript {
102- script: header.show()
103- }
104 PropertyChanges {
105 target: scrollableView
106 clip: true
107 }
108+ PropertyChanges {
109+ target: calculatorPage.head
110+ visible: true
111+ preset: "select"
112+ }
113 }
114 ]
115
116@@ -289,52 +297,45 @@
117 Keys.onPressed: textInputField.keyPress(event)
118 Keys.onReleased: textInputField.keyRelease(event)
119
120- Header {
121- id: header
122- visible: true
123- useDeprecatedToolbar: false
124- property color dividerColor: "#babbbc"
125- property color panelColor: "white"
126- config: PageHeadConfiguration {
127- backAction: Action {
128- objectName: "cancelSelectionAction"
129- iconName: "close"
130- text: i18n.tr("Cancel")
131- onTriggered: visualModel.cancelSelection()
132- }
133- actions: [
134- Action {
135- id: selectAllAction
136- objectName: "selectAllAction"
137- iconName: "select"
138- // Until a select none icon will be added to the theme we have to use
139- // our own
140- iconSource: visualModel.selectedItems.count < visualModel.items.count ?
141- Qt.resolvedUrl("graphics/select.svg") :
142- Qt.resolvedUrl("graphics/select_none.svg")
143- text: visualModel.selectedItems.count < visualModel.items.count ?
144- i18n.tr("Select All") : i18n.tr("Select None")
145- onTriggered: visualModel.selectAll()
146- },
147- Action {
148- id: copySelectedAction
149- objectName: "copySelectedAction"
150- iconName: "edit-copy"
151- text: i18n.tr("Copy")
152- onTriggered: calculatorPage.copySelectedCalculations()
153- enabled: visualModel.selectedItems.count > 0
154- },
155- Action {
156- id: multiDeleteAction
157- objectName: "multiDeleteAction"
158- iconName: "delete"
159- text: i18n.tr("Delete")
160- onTriggered: calculatorPage.deleteSelectedCalculations()
161- enabled: visualModel.selectedItems.count > 0
162- }
163- ]
164+ head.visible: false
165+ head.locked: true
166+ head.backAction: Action {
167+ objectName: "cancelSelectionAction"
168+ iconName: "close"
169+ text: i18n.tr("Cancel")
170+ onTriggered: visualModel.cancelSelection()
171+ }
172+ head.actions: [
173+ Action {
174+ id: selectAllAction
175+ objectName: "selectAllAction"
176+ iconName: "select"
177+ // Until a select none icon will be added to the theme we have to use
178+ // our own
179+ iconSource: visualModel.selectedItems.count < visualModel.items.count ?
180+ Qt.resolvedUrl("graphics/select.svg") :
181+ Qt.resolvedUrl("graphics/select_none.svg")
182+ text: visualModel.selectedItems.count < visualModel.items.count ?
183+ i18n.tr("Select All") : i18n.tr("Select None")
184+ onTriggered: visualModel.selectAll()
185+ },
186+ Action {
187+ id: copySelectedAction
188+ objectName: "copySelectedAction"
189+ iconName: "edit-copy"
190+ text: i18n.tr("Copy")
191+ onTriggered: calculatorPage.copySelectedCalculations()
192+ enabled: visualModel.selectedItems.count > 0
193+ },
194+ Action {
195+ id: multiDeleteAction
196+ objectName: "multiDeleteAction"
197+ iconName: "delete"
198+ text: i18n.tr("Delete")
199+ onTriggered: calculatorPage.deleteSelectedCalculations()
200+ enabled: visualModel.selectedItems.count > 0
201 }
202- }
203+ ]
204
205 Component {
206 id: emptyDelegate
207@@ -418,7 +419,7 @@
208 Loader {
209 id: screenDelegateFavouriteAction
210 sourceComponent: Action {
211- iconName: (editedCalculationIndex == model.index || model.isFavourite) ? "starred" : "non-starred"
212+ iconName: (mainView.editedCalculationIndex == model.index || model.isFavourite) ? "starred" : "non-starred"
213
214 text: i18n.tr("Add to favorites")
215 onTriggered: {
216@@ -530,11 +531,8 @@
217
218 ScrollableView {
219 anchors {
220- top: header.bottom
221- bottom: parent.bottom
222+ fill: parent
223 bottomMargin: textInputField.visible ? 0 : -keyboardLoader.height
224- left: parent.left
225- right: parent.right
226 }
227 id: scrollableView
228 objectName: "scrollableView"
229@@ -738,4 +736,3 @@
230 }
231 }
232 }
233-
234
235=== modified file 'app/ui/CalcKeyboard.qml'
236--- app/ui/CalcKeyboard.qml 2015-11-12 15:03:12 +0000
237+++ app/ui/CalcKeyboard.qml 2015-11-24 13:43:45 +0000
238@@ -1,5 +1,5 @@
239 /*
240- * Copyright (C) 2014 Canonical Ltd
241+ * Copyright (C) 2014-2015 Canonical Ltd
242 *
243 * This file is part of Ubuntu Calculator App
244 *
245@@ -15,8 +15,8 @@
246 * You should have received a copy of the GNU General Public License
247 * along with this program. If not, see <http://www.gnu.org/licenses/>.
248 */
249-import QtQuick 2.3
250-import Ubuntu.Components 1.1
251+import QtQuick 2.4
252+import Ubuntu.Components 1.3
253
254 Rectangle {
255 id: virtualKeyboard
256
257=== modified file 'app/ui/FavouritePage.qml'
258--- app/ui/FavouritePage.qml 2015-06-12 01:55:49 +0000
259+++ app/ui/FavouritePage.qml 2015-11-24 13:43:45 +0000
260@@ -15,10 +15,10 @@
261 * You should have received a copy of the GNU General Public License
262 * along with this program. If not, see <http://www.gnu.org/licenses/>.
263 */
264-import QtQuick 2.3
265+import QtQuick 2.4
266 import QtQuick.Layouts 1.1
267-import Ubuntu.Components 1.1
268-import Ubuntu.Components.ListItems 1.0 as ListItem
269+import Ubuntu.Components 1.3
270+import Ubuntu.Components.ListItems 1.3 as ListItem
271
272 import "../engine"
273 import "../upstreamcomponents"
274
275=== modified file 'app/ui/KeyboardButton.qml'
276--- app/ui/KeyboardButton.qml 2015-05-27 23:55:16 +0000
277+++ app/ui/KeyboardButton.qml 2015-11-24 13:43:45 +0000
278@@ -1,5 +1,5 @@
279 /*
280- * Copyright 2013 Canonical Ltd.
281+ * Copyright 2013, 2015 Canonical Ltd.
282 *
283 * This file is part of ubuntu-calculator-app.
284 *
285@@ -16,8 +16,8 @@
286 * along with this program. If not, see <http://www.gnu.org/licenses/>.
287 */
288
289-import QtQuick 2.3
290-import Ubuntu.Components 1.1
291+import QtQuick 2.4
292+import Ubuntu.Components 1.3
293
294 AbstractButton {
295 id: buttonRect
296
297=== modified file 'app/ui/KeyboardPage.qml'
298--- app/ui/KeyboardPage.qml 2015-03-06 21:13:52 +0000
299+++ app/ui/KeyboardPage.qml 2015-11-24 13:43:45 +0000
300@@ -1,5 +1,22 @@
301-import QtQuick 2.3
302-import Ubuntu.Components 1.1
303+/*
304+ * Copyright (C) 2015 Canonical Ltd
305+ *
306+ * This file is part of Ubuntu Calculator App
307+ *
308+ * Ubuntu Calculator App is free software: you can redistribute it and/or modify
309+ * it under the terms of the GNU General Public License version 3 as
310+ * published by the Free Software Foundation.
311+ *
312+ * Ubuntu Calculator App is distributed in the hope that it will be useful,
313+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
314+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
315+ * GNU General Public License for more details.
316+ *
317+ * You should have received a copy of the GNU General Public License
318+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
319+ */
320+import QtQuick 2.4
321+import Ubuntu.Components 1.3
322
323 Grid {
324 id: keyboardRoot
325
326=== modified file 'app/ui/LandscapeKeyboard.qml'
327--- app/ui/LandscapeKeyboard.qml 2015-06-11 15:40:14 +0000
328+++ app/ui/LandscapeKeyboard.qml 2015-11-24 13:43:45 +0000
329@@ -1,5 +1,23 @@
330-import QtQuick 2.3
331-import Ubuntu.Components 1.1
332+/*
333+ * Copyright (C) 2015 Canonical Ltd
334+ *
335+ * This file is part of Ubuntu Calculator App
336+ *
337+ * Ubuntu Calculator App is free software: you can redistribute it and/or modify
338+ * it under the terms of the GNU General Public License version 3 as
339+ * published by the Free Software Foundation.
340+ *
341+ * Ubuntu Calculator App is distributed in the hope that it will be useful,
342+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
343+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
344+ * GNU General Public License for more details.
345+ *
346+ * You should have received a copy of the GNU General Public License
347+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
348+ */
349+
350+import QtQuick 2.4
351+import Ubuntu.Components 1.3
352
353 CalcKeyboard {
354 id: calcKeyboard
355
356=== modified file 'app/ui/PortraitKeyboard.qml'
357--- app/ui/PortraitKeyboard.qml 2015-06-16 10:26:39 +0000
358+++ app/ui/PortraitKeyboard.qml 2015-11-24 13:43:45 +0000
359@@ -1,5 +1,22 @@
360-import QtQuick 2.3
361-import Ubuntu.Components 1.1
362+/*
363+ * Copyright (C) 2015 Canonical Ltd
364+ *
365+ * This file is part of Ubuntu Calculator App
366+ *
367+ * Ubuntu Calculator App is free software: you can redistribute it and/or modify
368+ * it under the terms of the GNU General Public License version 3 as
369+ * published by the Free Software Foundation.
370+ *
371+ * Ubuntu Calculator App is distributed in the hope that it will be useful,
372+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
373+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
374+ * GNU General Public License for more details.
375+ *
376+ * You should have received a copy of the GNU General Public License
377+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
378+ */
379+import QtQuick 2.4
380+import Ubuntu.Components 1.3
381
382 CalcKeyboard {
383 id: calcKeyboard
384
385=== modified file 'app/ui/Screen.qml'
386--- app/ui/Screen.qml 2015-11-14 23:29:53 +0000
387+++ app/ui/Screen.qml 2015-11-24 13:43:45 +0000
388@@ -15,8 +15,8 @@
389 * You should have received a copy of the GNU General Public License
390 * along with this program. If not, see <http://www.gnu.org/licenses/>.
391 */
392-import QtQuick 2.3
393-import Ubuntu.Components 1.1
394+import QtQuick 2.4
395+import Ubuntu.Components 1.3
396
397 import "../upstreamcomponents"
398 import "../engine/formula.js" as Formula
399
400=== modified file 'app/ui/ScrollableView.qml'
401--- app/ui/ScrollableView.qml 2015-02-13 22:20:01 +0000
402+++ app/ui/ScrollableView.qml 2015-11-24 13:43:45 +0000
403@@ -1,5 +1,5 @@
404 /*
405- * Copyright (C) 2014 Canonical Ltd
406+ * Copyright (C) 2014-2015 Canonical Ltd
407 *
408 * This file is part of Ubuntu Calculator App
409 *
410@@ -15,7 +15,7 @@
411 * You should have received a copy of the GNU General Public License
412 * along with this program. If not, see <http://www.gnu.org/licenses/>.
413 */
414-import QtQuick 2.3
415+import QtQuick 2.4
416
417 Flickable {
418 id: flickableHistory
419
420=== modified file 'app/upstreamcomponents/EmptyState.qml'
421--- app/upstreamcomponents/EmptyState.qml 2015-03-06 18:09:49 +0000
422+++ app/upstreamcomponents/EmptyState.qml 2015-11-24 13:43:45 +0000
423@@ -1,5 +1,5 @@
424-import QtQuick 2.0
425-import Ubuntu.Components 1.1
426+import QtQuick 2.4
427+import Ubuntu.Components 1.3
428
429 /*
430 Component which displays an empty state (approved by design). It offers an
431
432=== modified file 'app/upstreamcomponents/ListItemWithActions.qml'
433--- app/upstreamcomponents/ListItemWithActions.qml 2015-02-02 20:35:38 +0000
434+++ app/upstreamcomponents/ListItemWithActions.qml 2015-11-24 13:43:45 +0000
435@@ -1,5 +1,5 @@
436 /*
437- * Copyright (C) 2012-2014 Canonical, Ltd.
438+ * Copyright (C) 2012-2015 Canonical, Ltd.
439 *
440 * This program is free software; you can redistribute it and/or modify
441 * it under the terms of the GNU General Public License as published by
442@@ -14,8 +14,8 @@
443 * along with this program. If not, see <http://www.gnu.org/licenses/>.
444 */
445
446-import QtQuick 2.2
447-import Ubuntu.Components 1.1
448+import QtQuick 2.4
449+import Ubuntu.Components 1.3
450
451 Item {
452 id: root
453
454=== modified file 'app/upstreamcomponents/ListItemWithActionsCheckBox.qml'
455--- app/upstreamcomponents/ListItemWithActionsCheckBox.qml 2014-12-03 22:54:49 +0000
456+++ app/upstreamcomponents/ListItemWithActionsCheckBox.qml 2015-11-24 13:43:45 +0000
457@@ -1,5 +1,5 @@
458 /*
459- * Copyright (C) 2012-2014 Canonical, Ltd.
460+ * Copyright (C) 2012-2015 Canonical, Ltd.
461 *
462 * This program is free software; you can redistribute it and/or modify
463 * it under the terms of the GNU General Public License as published by
464@@ -14,8 +14,8 @@
465 * along with this program. If not, see <http://www.gnu.org/licenses/>.
466 */
467
468-import QtQuick 2.2
469-import Ubuntu.Components 1.1
470+import QtQuick 2.4
471+import Ubuntu.Components 1.3
472
473 CheckBox {
474 checked: root.selected
475
476=== modified file 'app/upstreamcomponents/MultipleSelectionVisualModel.qml'
477--- app/upstreamcomponents/MultipleSelectionVisualModel.qml 2015-01-09 17:32:44 +0000
478+++ app/upstreamcomponents/MultipleSelectionVisualModel.qml 2015-11-24 13:43:45 +0000
479@@ -14,7 +14,7 @@
480 * along with this program. If not, see <http://www.gnu.org/licenses/>.
481 */
482
483-import QtQuick 2.2
484+import QtQuick 2.4
485
486 VisualDataModel {
487 id: visualModel
488
489=== modified file 'app/upstreamcomponents/PageWithBottomEdge.qml'
490--- app/upstreamcomponents/PageWithBottomEdge.qml 2015-01-28 21:32:05 +0000
491+++ app/upstreamcomponents/PageWithBottomEdge.qml 2015-11-24 13:43:45 +0000
492@@ -1,5 +1,5 @@
493 /*
494- * Copyright (C) 2014 Canonical, Ltd.
495+ * Copyright (C) 2014-2015 Canonical, Ltd.
496 *
497 * This program is free software; you can redistribute it and/or modify
498 * it under the terms of the GNU General Public License as published by
499@@ -62,8 +62,8 @@
500
501 */
502
503-import QtQuick 2.2
504-import Ubuntu.Components 1.1
505+import QtQuick 2.4
506+import Ubuntu.Components 1.3
507
508 Page {
509 id: page
510@@ -105,7 +105,6 @@
511 edgeLoader.item.active = true
512 page.pageStack.push(edgeLoader.item)
513 if (edgeLoader.item.flickable) {
514- edgeLoader.item.flickable.contentY = -page.header.height
515 edgeLoader.item.flickable.returnToBounds()
516 }
517 if (edgeLoader.item.ready)
518@@ -170,7 +169,7 @@
519 z: 1
520 width: tipLabel.paintedWidth + units.gu(6)
521 height: bottomEdge.tipHeight + units.gu(1)
522- color: Theme.palette.normal.overlay
523+ backgroundColor: Theme.palette.normal.overlay
524 Label {
525 id: tipLabel
526
527
528=== modified file 'manifest.json.in'
529--- manifest.json.in 2015-07-31 11:54:58 +0000
530+++ manifest.json.in 2015-11-24 13:43:45 +0000
531@@ -2,7 +2,7 @@
532 "name": "com.ubuntu.calculator",
533 "architecture": "all",
534 "description": "Powerful and easy to use calculator.",
535- "framework": "ubuntu-sdk-14.10",
536+ "framework": "ubuntu-sdk-15.04.1-qml",
537 "hooks": {
538 "calculator": {
539 "apparmor": "@APP_HARDCODE@.apparmor",

Subscribers

People subscribed via source and target branches