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
=== modified file 'app/engine/CalculationHistory.qml'
--- app/engine/CalculationHistory.qml 2015-03-13 14:51:17 +0000
+++ app/engine/CalculationHistory.qml 2015-11-24 13:43:45 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2014 Canonical, Ltd.2 * Copyright (C) 2014-2015 Canonical, Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License as published by
@@ -13,7 +13,7 @@
13 * You should have received a copy of the GNU General Public License13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
16import QtQuick 2.316import QtQuick 2.4
17import QtQuick.LocalStorage 2.017import QtQuick.LocalStorage 2.0
1818
19Item {19Item {
2020
=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml 2015-11-22 13:59:30 +0000
+++ app/ubuntu-calculator-app.qml 2015-11-24 13:43:45 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2014 Canonical Ltd2 * Copyright (C) 2014-2015 Canonical Ltd
3 *3 *
4 * This file is part of Ubuntu Calculator App4 * This file is part of Ubuntu Calculator App
5 *5 *
@@ -15,9 +15,9 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
20import Ubuntu.Components.Themes.Ambiance 0.120import Ubuntu.Components.Themes.Ambiance 1.3
2121
22import "ui"22import "ui"
23import "upstreamcomponents"23import "upstreamcomponents"
@@ -31,8 +31,6 @@
31 objectName: "calculator";31 objectName: "calculator";
32 applicationName: "com.ubuntu.calculator";32 applicationName: "com.ubuntu.calculator";
3333
34 // Removes the old toolbar and enables new features of the new header.
35 useDeprecatedToolbar: false;
36 automaticOrientation: true34 automaticOrientation: true
37 anchorToKeyboard: textInputField.visible ? false : true35 anchorToKeyboard: textInputField.visible ? false : true
3836
@@ -109,6 +107,7 @@
109107
110 // Maximum length of the result number108 // Maximum length of the result number
111 var NUMBER_LENGTH_LIMIT = 14;109 var NUMBER_LENGTH_LIMIT = 14;
110
112 if (bigNumberToFormat.toString().length > NUMBER_LENGTH_LIMIT) {111 if (bigNumberToFormat.toString().length > NUMBER_LENGTH_LIMIT) {
113 var resultLength = mathJs.format(bigNumberToFormat, {exponential: {lower: 1e-10, upper: 1e10},112 var resultLength = mathJs.format(bigNumberToFormat, {exponential: {lower: 1e-10, upper: 1e10},
114 precision: NUMBER_LENGTH_LIMIT}).toString().length;113 precision: NUMBER_LENGTH_LIMIT}).toString().length;
@@ -238,14 +237,19 @@
238 id: mainStack237 id: mainStack
239238
240 Component.onCompleted: {239 Component.onCompleted: {
241
242 push(calculatorPage);240 push(calculatorPage);
243 calculatorPage.forceActiveFocus();241 calculatorPage.forceActiveFocus();
244 }242 }
245243
244 onHeightChanged: scrollableView.scrollToBottom();
245 anchors.fill: parent
246
246 PageWithBottomEdge {247 PageWithBottomEdge {
247 id: calculatorPage248 id: calculatorPage
248249
250 title: i18n.tr("Calculator")
251 anchors.fill: parent
252
249 bottomEdgeTitle: i18n.tr("Favorite")253 bottomEdgeTitle: i18n.tr("Favorite")
250254
251 bottomEdgePageComponent: FavouritePage {255 bottomEdgePageComponent: FavouritePage {
@@ -260,23 +264,27 @@
260 states: [264 states: [
261 State {265 State {
262 name: "default"266 name: "default"
263 StateChangeScript {
264 script: header.hide()
265 }
266 PropertyChanges {267 PropertyChanges {
267 target: scrollableView268 target: scrollableView
268 clip: false269 clip: false
269 }270 }
271 PropertyChanges {
272 target: calculatorPage.head
273 visible: false
274 preset: ""
275 }
270 },276 },
271 State {277 State {
272 name: "selection"278 name: "selection"
273 StateChangeScript {
274 script: header.show()
275 }
276 PropertyChanges {279 PropertyChanges {
277 target: scrollableView280 target: scrollableView
278 clip: true281 clip: true
279 }282 }
283 PropertyChanges {
284 target: calculatorPage.head
285 visible: true
286 preset: "select"
287 }
280 }288 }
281 ]289 ]
282290
@@ -289,52 +297,45 @@
289 Keys.onPressed: textInputField.keyPress(event)297 Keys.onPressed: textInputField.keyPress(event)
290 Keys.onReleased: textInputField.keyRelease(event)298 Keys.onReleased: textInputField.keyRelease(event)
291299
292 Header {300 head.visible: false
293 id: header301 head.locked: true
294 visible: true302 head.backAction: Action {
295 useDeprecatedToolbar: false303 objectName: "cancelSelectionAction"
296 property color dividerColor: "#babbbc"304 iconName: "close"
297 property color panelColor: "white"305 text: i18n.tr("Cancel")
298 config: PageHeadConfiguration {306 onTriggered: visualModel.cancelSelection()
299 backAction: Action {307 }
300 objectName: "cancelSelectionAction"308 head.actions: [
301 iconName: "close"309 Action {
302 text: i18n.tr("Cancel")310 id: selectAllAction
303 onTriggered: visualModel.cancelSelection()311 objectName: "selectAllAction"
304 }312 iconName: "select"
305 actions: [313 // Until a select none icon will be added to the theme we have to use
306 Action {314 // our own
307 id: selectAllAction315 iconSource: visualModel.selectedItems.count < visualModel.items.count ?
308 objectName: "selectAllAction"316 Qt.resolvedUrl("graphics/select.svg") :
309 iconName: "select"317 Qt.resolvedUrl("graphics/select_none.svg")
310 // Until a select none icon will be added to the theme we have to use318 text: visualModel.selectedItems.count < visualModel.items.count ?
311 // our own319 i18n.tr("Select All") : i18n.tr("Select None")
312 iconSource: visualModel.selectedItems.count < visualModel.items.count ?320 onTriggered: visualModel.selectAll()
313 Qt.resolvedUrl("graphics/select.svg") :321 },
314 Qt.resolvedUrl("graphics/select_none.svg")322 Action {
315 text: visualModel.selectedItems.count < visualModel.items.count ?323 id: copySelectedAction
316 i18n.tr("Select All") : i18n.tr("Select None")324 objectName: "copySelectedAction"
317 onTriggered: visualModel.selectAll()325 iconName: "edit-copy"
318 },326 text: i18n.tr("Copy")
319 Action {327 onTriggered: calculatorPage.copySelectedCalculations()
320 id: copySelectedAction328 enabled: visualModel.selectedItems.count > 0
321 objectName: "copySelectedAction"329 },
322 iconName: "edit-copy"330 Action {
323 text: i18n.tr("Copy")331 id: multiDeleteAction
324 onTriggered: calculatorPage.copySelectedCalculations()332 objectName: "multiDeleteAction"
325 enabled: visualModel.selectedItems.count > 0333 iconName: "delete"
326 },334 text: i18n.tr("Delete")
327 Action {335 onTriggered: calculatorPage.deleteSelectedCalculations()
328 id: multiDeleteAction336 enabled: visualModel.selectedItems.count > 0
329 objectName: "multiDeleteAction"
330 iconName: "delete"
331 text: i18n.tr("Delete")
332 onTriggered: calculatorPage.deleteSelectedCalculations()
333 enabled: visualModel.selectedItems.count > 0
334 }
335 ]
336 }337 }
337 }338 ]
338339
339 Component {340 Component {
340 id: emptyDelegate341 id: emptyDelegate
@@ -418,7 +419,7 @@
418 Loader {419 Loader {
419 id: screenDelegateFavouriteAction420 id: screenDelegateFavouriteAction
420 sourceComponent: Action {421 sourceComponent: Action {
421 iconName: (editedCalculationIndex == model.index || model.isFavourite) ? "starred" : "non-starred"422 iconName: (mainView.editedCalculationIndex == model.index || model.isFavourite) ? "starred" : "non-starred"
422423
423 text: i18n.tr("Add to favorites")424 text: i18n.tr("Add to favorites")
424 onTriggered: {425 onTriggered: {
@@ -530,11 +531,8 @@
530531
531 ScrollableView {532 ScrollableView {
532 anchors {533 anchors {
533 top: header.bottom534 fill: parent
534 bottom: parent.bottom
535 bottomMargin: textInputField.visible ? 0 : -keyboardLoader.height535 bottomMargin: textInputField.visible ? 0 : -keyboardLoader.height
536 left: parent.left
537 right: parent.right
538 }536 }
539 id: scrollableView537 id: scrollableView
540 objectName: "scrollableView"538 objectName: "scrollableView"
@@ -738,4 +736,3 @@
738 }736 }
739 }737 }
740}738}
741
742739
=== modified file 'app/ui/CalcKeyboard.qml'
--- app/ui/CalcKeyboard.qml 2015-11-12 15:03:12 +0000
+++ app/ui/CalcKeyboard.qml 2015-11-24 13:43:45 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2014 Canonical Ltd2 * Copyright (C) 2014-2015 Canonical Ltd
3 *3 *
4 * This file is part of Ubuntu Calculator App4 * This file is part of Ubuntu Calculator App
5 *5 *
@@ -15,8 +15,8 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
2020
21Rectangle {21Rectangle {
22 id: virtualKeyboard22 id: virtualKeyboard
2323
=== modified file 'app/ui/FavouritePage.qml'
--- app/ui/FavouritePage.qml 2015-06-12 01:55:49 +0000
+++ app/ui/FavouritePage.qml 2015-11-24 13:43:45 +0000
@@ -15,10 +15,10 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import QtQuick.Layouts 1.119import QtQuick.Layouts 1.1
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
21import Ubuntu.Components.ListItems 1.0 as ListItem21import Ubuntu.Components.ListItems 1.3 as ListItem
2222
23import "../engine"23import "../engine"
24import "../upstreamcomponents"24import "../upstreamcomponents"
2525
=== modified file 'app/ui/KeyboardButton.qml'
--- app/ui/KeyboardButton.qml 2015-05-27 23:55:16 +0000
+++ app/ui/KeyboardButton.qml 2015-11-24 13:43:45 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright 2013 Canonical Ltd.2 * Copyright 2013, 2015 Canonical Ltd.
3 *3 *
4 * This file is part of ubuntu-calculator-app.4 * This file is part of ubuntu-calculator-app.
5 *5 *
@@ -16,8 +16,8 @@
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
1818
19import QtQuick 2.319import QtQuick 2.4
20import Ubuntu.Components 1.120import Ubuntu.Components 1.3
2121
22AbstractButton {22AbstractButton {
23 id: buttonRect23 id: buttonRect
2424
=== modified file 'app/ui/KeyboardPage.qml'
--- app/ui/KeyboardPage.qml 2015-03-06 21:13:52 +0000
+++ app/ui/KeyboardPage.qml 2015-11-24 13:43:45 +0000
@@ -1,5 +1,22 @@
1import QtQuick 2.31/*
2import Ubuntu.Components 1.12 * Copyright (C) 2015 Canonical Ltd
3 *
4 * This file is part of Ubuntu Calculator App
5 *
6 * Ubuntu Calculator App is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 3 as
8 * published by the Free Software Foundation.
9 *
10 * Ubuntu Calculator App is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */
18import QtQuick 2.4
19import Ubuntu.Components 1.3
320
4Grid {21Grid {
5 id: keyboardRoot22 id: keyboardRoot
623
=== modified file 'app/ui/LandscapeKeyboard.qml'
--- app/ui/LandscapeKeyboard.qml 2015-06-11 15:40:14 +0000
+++ app/ui/LandscapeKeyboard.qml 2015-11-24 13:43:45 +0000
@@ -1,5 +1,23 @@
1import QtQuick 2.31/*
2import Ubuntu.Components 1.12 * Copyright (C) 2015 Canonical Ltd
3 *
4 * This file is part of Ubuntu Calculator App
5 *
6 * Ubuntu Calculator App is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 3 as
8 * published by the Free Software Foundation.
9 *
10 * Ubuntu Calculator App is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */
18
19import QtQuick 2.4
20import Ubuntu.Components 1.3
321
4CalcKeyboard {22CalcKeyboard {
5 id: calcKeyboard23 id: calcKeyboard
624
=== modified file 'app/ui/PortraitKeyboard.qml'
--- app/ui/PortraitKeyboard.qml 2015-06-16 10:26:39 +0000
+++ app/ui/PortraitKeyboard.qml 2015-11-24 13:43:45 +0000
@@ -1,5 +1,22 @@
1import QtQuick 2.31/*
2import Ubuntu.Components 1.12 * Copyright (C) 2015 Canonical Ltd
3 *
4 * This file is part of Ubuntu Calculator App
5 *
6 * Ubuntu Calculator App is free software: you can redistribute it and/or modify
7 * it under the terms of the GNU General Public License version 3 as
8 * published by the Free Software Foundation.
9 *
10 * Ubuntu Calculator App is distributed in the hope that it will be useful,
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
13 * GNU General Public License for more details.
14 *
15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */
18import QtQuick 2.4
19import Ubuntu.Components 1.3
320
4CalcKeyboard {21CalcKeyboard {
5 id: calcKeyboard22 id: calcKeyboard
623
=== modified file 'app/ui/Screen.qml'
--- app/ui/Screen.qml 2015-11-14 23:29:53 +0000
+++ app/ui/Screen.qml 2015-11-24 13:43:45 +0000
@@ -15,8 +15,8 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
19import Ubuntu.Components 1.119import Ubuntu.Components 1.3
2020
21import "../upstreamcomponents"21import "../upstreamcomponents"
22import "../engine/formula.js" as Formula22import "../engine/formula.js" as Formula
2323
=== modified file 'app/ui/ScrollableView.qml'
--- app/ui/ScrollableView.qml 2015-02-13 22:20:01 +0000
+++ app/ui/ScrollableView.qml 2015-11-24 13:43:45 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2014 Canonical Ltd2 * Copyright (C) 2014-2015 Canonical Ltd
3 *3 *
4 * This file is part of Ubuntu Calculator App4 * This file is part of Ubuntu Calculator App
5 *5 *
@@ -15,7 +15,7 @@
15 * You should have received a copy of the GNU General Public License15 * You should have received a copy of the GNU General Public License
16 * along with this program. If not, see <http://www.gnu.org/licenses/>.16 * along with this program. If not, see <http://www.gnu.org/licenses/>.
17 */17 */
18import QtQuick 2.318import QtQuick 2.4
1919
20Flickable {20Flickable {
21 id: flickableHistory21 id: flickableHistory
2222
=== modified file 'app/upstreamcomponents/EmptyState.qml'
--- app/upstreamcomponents/EmptyState.qml 2015-03-06 18:09:49 +0000
+++ app/upstreamcomponents/EmptyState.qml 2015-11-24 13:43:45 +0000
@@ -1,5 +1,5 @@
1import QtQuick 2.01import QtQuick 2.4
2import Ubuntu.Components 1.12import Ubuntu.Components 1.3
33
4/*4/*
5 Component which displays an empty state (approved by design). It offers an5 Component which displays an empty state (approved by design). It offers an
66
=== modified file 'app/upstreamcomponents/ListItemWithActions.qml'
--- app/upstreamcomponents/ListItemWithActions.qml 2015-02-02 20:35:38 +0000
+++ app/upstreamcomponents/ListItemWithActions.qml 2015-11-24 13:43:45 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2012-2014 Canonical, Ltd.2 * Copyright (C) 2012-2015 Canonical, Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
1919
20Item {20Item {
21 id: root21 id: root
2222
=== modified file 'app/upstreamcomponents/ListItemWithActionsCheckBox.qml'
--- app/upstreamcomponents/ListItemWithActionsCheckBox.qml 2014-12-03 22:54:49 +0000
+++ app/upstreamcomponents/ListItemWithActionsCheckBox.qml 2015-11-24 13:43:45 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2012-2014 Canonical, Ltd.2 * Copyright (C) 2012-2015 Canonical, Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License as published by
@@ -14,8 +14,8 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
18import Ubuntu.Components 1.118import Ubuntu.Components 1.3
1919
20CheckBox {20CheckBox {
21 checked: root.selected21 checked: root.selected
2222
=== modified file 'app/upstreamcomponents/MultipleSelectionVisualModel.qml'
--- app/upstreamcomponents/MultipleSelectionVisualModel.qml 2015-01-09 17:32:44 +0000
+++ app/upstreamcomponents/MultipleSelectionVisualModel.qml 2015-11-24 13:43:45 +0000
@@ -14,7 +14,7 @@
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */15 */
1616
17import QtQuick 2.217import QtQuick 2.4
1818
19VisualDataModel {19VisualDataModel {
20 id: visualModel20 id: visualModel
2121
=== modified file 'app/upstreamcomponents/PageWithBottomEdge.qml'
--- app/upstreamcomponents/PageWithBottomEdge.qml 2015-01-28 21:32:05 +0000
+++ app/upstreamcomponents/PageWithBottomEdge.qml 2015-11-24 13:43:45 +0000
@@ -1,5 +1,5 @@
1/*1/*
2 * Copyright (C) 2014 Canonical, Ltd.2 * Copyright (C) 2014-2015 Canonical, Ltd.
3 *3 *
4 * This program is free software; you can redistribute it and/or modify4 * This program is free software; you can redistribute it and/or modify
5 * it under the terms of the GNU General Public License as published by5 * it under the terms of the GNU General Public License as published by
@@ -62,8 +62,8 @@
6262
63*/63*/
6464
65import QtQuick 2.265import QtQuick 2.4
66import Ubuntu.Components 1.166import Ubuntu.Components 1.3
6767
68Page {68Page {
69 id: page69 id: page
@@ -105,7 +105,6 @@
105 edgeLoader.item.active = true105 edgeLoader.item.active = true
106 page.pageStack.push(edgeLoader.item)106 page.pageStack.push(edgeLoader.item)
107 if (edgeLoader.item.flickable) {107 if (edgeLoader.item.flickable) {
108 edgeLoader.item.flickable.contentY = -page.header.height
109 edgeLoader.item.flickable.returnToBounds()108 edgeLoader.item.flickable.returnToBounds()
110 }109 }
111 if (edgeLoader.item.ready)110 if (edgeLoader.item.ready)
@@ -170,7 +169,7 @@
170 z: 1169 z: 1
171 width: tipLabel.paintedWidth + units.gu(6)170 width: tipLabel.paintedWidth + units.gu(6)
172 height: bottomEdge.tipHeight + units.gu(1)171 height: bottomEdge.tipHeight + units.gu(1)
173 color: Theme.palette.normal.overlay172 backgroundColor: Theme.palette.normal.overlay
174 Label {173 Label {
175 id: tipLabel174 id: tipLabel
176175
177176
=== modified file 'manifest.json.in'
--- manifest.json.in 2015-07-31 11:54:58 +0000
+++ manifest.json.in 2015-11-24 13:43:45 +0000
@@ -2,7 +2,7 @@
2 "name": "com.ubuntu.calculator",2 "name": "com.ubuntu.calculator",
3 "architecture": "all",3 "architecture": "all",
4 "description": "Powerful and easy to use calculator.",4 "description": "Powerful and easy to use calculator.",
5 "framework": "ubuntu-sdk-14.10",5 "framework": "ubuntu-sdk-15.04.1-qml",
6 "hooks": {6 "hooks": {
7 "calculator": {7 "calculator": {
8 "apparmor": "@APP_HARDCODE@.apparmor",8 "apparmor": "@APP_HARDCODE@.apparmor",

Subscribers

People subscribed via source and target branches