← Back to team overview

ubuntu-touch-coreapps-reviewers team mailing list archive

[Merge] lp:~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-start-time-optimizations into lp:ubuntu-calculator-app

 

Bartosz Kosiorek has proposed merging lp:~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-start-time-optimizations into lp:ubuntu-calculator-app.

Commit message:
Reduce start time by applying optimization (LP: #1520554)

Requested reviews:
  Jenkins Bot (ubuntu-core-apps-jenkins-bot): continuous-integration
  Ubuntu Calculator Developers (ubuntu-calculator-dev)
Related bugs:
  Bug #1520554 in Ubuntu Calculator App: "Startup of calculator should be optimized"
  https://bugs.launchpad.net/ubuntu-calculator-app/+bug/1520554

For more details, see:
https://code.launchpad.net/~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-start-time-optimizations/+merge/278877

Reduce start time by applying optimization (LP: #1520554)

-- 
Your team Ubuntu Calculator Developers is requested to review the proposed merge of lp:~ubuntu-calculator-dev/ubuntu-calculator-app/ubuntu-calculator-app-start-time-optimizations 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 23:04:58 +0000
@@ -383,14 +383,9 @@
                         visualModel.selectItem(visualDelegate);
                     }
 
-                    rightSideActions: [ screenDelegateCopyAction.item,
-                                        screenDelegateEditAction.item,
-                                        screenDelegateFavouriteAction.item ]
-                    leftSideAction: screenDelegateDeleteAction.item
-
-                    Loader {
-                        id: screenDelegateCopyAction
-                        sourceComponent: Action {
+                    rightSideActions: [
+                        Action {
+                            id: screenDelegateCopyAction
                             iconName: "edit-copy"
                             text: i18n.tr("Copy")
                             onTriggered: {
@@ -398,12 +393,9 @@
                                 mimeData.text = model.formula + "=" + model.result;
                                 Clipboard.push(mimeData);
                             }
-                        }
-                    }
-
-                    Loader {
-                        id: screenDelegateEditAction
-                        sourceComponent: Action {
+                        },
+                        Action {
+                            id: screenDelegateEditAction
                             iconName: "edit"
                             text: i18n.tr("Edit")
                             onTriggered: {
@@ -414,11 +406,9 @@
                                 previousVisual = "";
                                 scrollableView.scrollToBottom();
                             }
-                        }
-                    }
-                    Loader {
-                        id: screenDelegateFavouriteAction
-                        sourceComponent: Action {
+                        },
+                        Action {
+                            id: screenDelegateFavouriteAction
                             iconName: (mainView.editedCalculationIndex == model.index || model.isFavourite) ? "starred" : "non-starred"
 
                             text: i18n.tr("Add to favorites")
@@ -439,15 +429,13 @@
                                 model.isFavourite = !model.isFavourite;
                             }
                         }
-                    }
-                    Loader {
+                    ]
+                    leftSideAction: Action {
                         id: screenDelegateDeleteAction
-                        sourceComponent: Action {
-                            iconName: "delete"
-                            text: i18n.tr("Delete")
-                            onTriggered: {
-                                screenDelegate.remove();
-                            }
+                        iconName: "delete"
+                        text: i18n.tr("Delete")
+                        onTriggered: {
+                            screenDelegate.remove();
                         }
                     }
 
@@ -728,6 +716,7 @@
                 Loader {
                     id: keyboardLoader
                     width: parent.width
+                    asynchronous: true
                     source: scrollableView.width > scrollableView.height ? "ui/LandscapeKeyboard.qml" : "ui/PortraitKeyboard.qml"
                     opacity: ((y + height) >= scrollableView.contentY) &&
                              (y <= (scrollableView.contentY + scrollableView.height)) ? 1 : 0

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