Merge lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-icon-fix into lp:ubuntu-calculator-app

[Bartosz Kosiorek]

Workaround for missing icons errors

Workaround for missing icons errors

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Approve (continuous-integration)

[Riccardo Padovani (rpadovani)]

Seems the merge of my branch with trunk went wrong :/

Please see [0].

You need to drop your comments and replace iconName with

iconName: visualModel.selectedItems.count < visualModel.items.count ?
                                        "select" : "select-none"

See the diff of the commit linked to see how replace it, thanks

[0]: https://bazaar.launchpad.net/~rpadovani/ubuntu-calculator-app/dropCustomIcons/revision/237

review: Needs Fixing

[lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-icon-fix]

244. By Bartosz Kosiorek on 2015-11-28

Post review fix

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Approve (continuous-integration)

=== modified file 'app/ubuntu-calculator-app.qml'
--- app/ubuntu-calculator-app.qml	2015-11-25 08:08:41 +0000
+++ app/ubuntu-calculator-app.qml	2015-11-28 20:37:49 +0000
@@ -309,12 +309,8 @@
                 Action {
                     id: selectAllAction
                     objectName: "selectAllAction"
-                    iconName: "select"
-                    // Until a select none icon  will be added to the theme we have to use
-                    // our own
-                    iconSource: visualModel.selectedItems.count < visualModel.items.count ?
-                            Qt.resolvedUrl("graphics/select.svg") :
-                            Qt.resolvedUrl("graphics/select_none.svg")
+                    iconName: visualModel.selectedItems.count < visualModel.items.count ?
+                                        "select" : "select-none"
                     text: visualModel.selectedItems.count < visualModel.items.count ?
                             i18n.tr("Select All") : i18n.tr("Select None")
                     onTriggered: visualModel.selectAll()

=== modified file 'ubuntu-calculator-app.apparmor'
--- ubuntu-calculator-app.apparmor	2014-11-10 09:28:27 +0000
+++ ubuntu-calculator-app.apparmor	2015-11-28 20:37:49 +0000
@@ -1,5 +1,5 @@
 {
     "policy_groups": [
     ],
-    "policy_version": 1.2
+    "policy_version": 1.3
 }