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

[Victor Thompson]

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

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

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

PASSED: Continuous integration, rev:250
http://91.189.93.70:8080/job/ubuntu-calculator-app-ci/200/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/2384
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-raring-amd64-ci/199
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-saucy-amd64-ci/199
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calculator-app-trusty-amd64-ci/71

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

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

[Alan Pope 🍺🐧🐱 🦄 (popey)]

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 on 2014-05-03

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

=== modified file 'ubuntu-calculator-app.qml'
--- ubuntu-calculator-app.qml	2014-04-16 06:40:55 +0000
+++ ubuntu-calculator-app.qml	2014-05-03 02:06:34 +0000
@@ -18,7 +18,6 @@
 
 import QtQuick 2.0
 import Ubuntu.Components 0.1
-import QtQuick.Window 2.0
 import "Simple"
 //import "Scientific"
 
@@ -37,14 +36,11 @@
     width: units.gu(50)
     height: units.gu(75)
 
-    // Workaround for bug #1308343
-    property bool windowActive: typeof window != 'undefined'
-    onWindowActiveChanged: window.title = i18n.tr("Calculator")
-
     Storage{
         id: storage
     }
 
     SimplePage {
+        title: i18n.tr("Calculator")
     }
 }