Merge lp:~vthompson/ubuntu-calculator-app/revert-r239 into lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk

Proposed by Victor Thompson
Status: Rejected
Rejected by: Riccardo Padovani
Proposed branch: lp:~vthompson/ubuntu-calculator-app/revert-r239
Merge into: lp:~ubuntu-calculator-dev/ubuntu-calculator-app/old_trunk
Diff against target: 27 lines (+1/-5)
1 file modified
ubuntu-calculator-app.qml (+1/-5)
To merge this branch: bzr merge lp:~vthompson/ubuntu-calculator-app/revert-r239
Reviewer Review Type Date Requested Status
Riccardo Padovani Disapprove
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+218174@code.launchpad.net

Commit message

* Revert rev 239
* Add a title to Simple calculator page

Description of the change

* Revert rev 239
* Add a title to Simple calculator page

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Riccardo Padovani (rpadovani) wrote :

Thanks for the patch Victor, but Mihir already did it: https://code.launchpad.net/~mihirsoni/ubuntu-calculator-app/fix-edgecut-issue/+merge/218125

Also, we don't want, per design, a title in Simple Page, because occupies too space.

review: Disapprove
Revision history for this message
Alan Pope 🍺🐧🐱 πŸ¦„ (popey) wrote :

Agreed with Riccardo. The design for calculator has never had a header.

https://imgur.com/D2DOkYf

With a header we lose quite a bit of space.

Unmerged revisions

250. By Victor Thompson

* Revert rev 239
* Add a title to Simple calculator page

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'ubuntu-calculator-app.qml'
2--- ubuntu-calculator-app.qml 2014-04-16 06:40:55 +0000
3+++ ubuntu-calculator-app.qml 2014-05-03 02:06:34 +0000
4@@ -18,7 +18,6 @@
5
6 import QtQuick 2.0
7 import Ubuntu.Components 0.1
8-import QtQuick.Window 2.0
9 import "Simple"
10 //import "Scientific"
11
12@@ -37,14 +36,11 @@
13 width: units.gu(50)
14 height: units.gu(75)
15
16- // Workaround for bug #1308343
17- property bool windowActive: typeof window != 'undefined'
18- onWindowActiveChanged: window.title = i18n.tr("Calculator")
19-
20 Storage{
21 id: storage
22 }
23
24 SimplePage {
25+ title: i18n.tr("Calculator")
26 }
27 }

Subscribers

People subscribed via source and target branches