ubuntu-touch-coreapps-reviewers team mailing list archive

[Bartosz Kosiorek <gang65@xxxxxxxxxxxxxx>]

Bartosz Kosiorek has proposed merging lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-icon-fix into lp:ubuntu-calculator-app.

Commit message:
Workaround for missing icons errors

Requested reviews:
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
  Ubuntu Calculator Developers (ubuntu-calculator-dev)

For more details, see:
https://code.launchpad.net/~gang65/ubuntu-calculator-app/ubuntu-calculator-app-icon-fix/+merge/278818

Workaround for missing icons errors
-- 
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~gang65/ubuntu-calculator-app/ubuntu-calculator-app-icon-fix into lp:ubuntu-calculator-app.

=== 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-27 14:05:22 +0000
@@ -312,9 +312,9 @@
                     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")
+                    //iconSource: visualModel.selectedItems.count < visualModel.items.count ?
+                    //        Qt.resolvedUrl("graphics/select.svg") :
+                    //        Qt.resolvedUrl("graphics/select_none.svg")
                     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-27 14:05:22 +0000
@@ -1,5 +1,5 @@
 {
     "policy_groups": [
     ],
-    "policy_version": 1.2
+    "policy_version": 1.3
 }