Merge lp:~mihirsoni/ubuntu-calendar-app/limitLablesModel into lp:ubuntu-calendar-app

[Mihir Soni]

Moved limitLabels from object to ListModel

Moved limitLabels from object to ListModel

[Arto Jalkanen (ajalkane)]

Looks good, so I'm just going to nitpick: the function() definition is intended too deep.

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

PASSED: Continuous integration, rev:520
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/956/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1164
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1164/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/514

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

review: Approve (continuous-integration)

[Arto Jalkanen (ajalkane)]

So yeah, I'll approve and you'll consider whether to change the indentation.

review: Approve

[lp:~mihirsoni/ubuntu-calendar-app/limitLablesModel]

521. By Mihir Soni on 2014-10-22

Indentation issues

522. By Mihir Soni on 2014-10-22

reverted pot changes

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

PASSED: Continuous integration, rev:522
http://91.189.93.70:8080/job/ubuntu-calendar-app-ci/958/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1177
        deb: http://91.189.93.70:8080/job/generic-mediumtests-utopic-python3/1177/artifact/work/output/*zip*/output.zip
    SUCCESS: http://91.189.93.70:8080/job/ubuntu-calendar-app-utopic-amd64-ci/516

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

review: Approve (continuous-integration)

[Kunal Parmar (pkunal-parmar)]

seems good

review: Approve

=== modified file 'Defines.js'
--- Defines.js	2014-09-20 10:45:35 +0000
+++ Defines.js	2014-10-22 17:38:27 +0000
@@ -20,7 +20,6 @@
 .import QtOrganizer 5.0 as QtPim
 
 var recurrenceLabel = getRecurrenceLabels();
-var limitLabel = getLimitLabels();
 var weekLabel = getWeekLabels();
 // It contains multiple weekly entries to handle following occurence
 //1.Every Weekday (Monday to Friday
@@ -41,11 +40,7 @@
     var object = component.createObject(Qt.application);
     return object.recurrenceLabel;
 }
-function getLimitLabels(){
-    var component = Qt.createComponent(Qt.resolvedUrl("LimitLabelDefines.qml"));
-    var object = component.createObject(Qt.application);
-    return object.limitLabel;
-}
+
 function getWeekLabels(){
     var object = Qt.createQmlObject('\
         import QtQuick 2.3;\

=== modified file 'EventRepetition.qml'
--- EventRepetition.qml	2014-10-17 05:42:34 +0000
+++ EventRepetition.qml	2014-10-22 17:38:27 +0000
@@ -44,6 +44,10 @@
         id:eventUtils
     }
 
+    LimitLabelModel {
+        id:limitLabels
+    }
+
     Component.onCompleted: {
         //Fill Date & limitcount if any
         var index = 0;
@@ -203,7 +207,7 @@
                 margins: units.gu(2)
             }
 
-            model: Defines.limitLabel
+            model: limitLabels
             containerHeight: itemHeight * 4
             onExpandedChanged:   Qt.inputMethod.hide()
         }

=== renamed file 'LimitLabelDefines.qml' => 'LimitLabelModel.qml'
--- LimitLabelDefines.qml	2014-09-20 10:45:35 +0000
+++ LimitLabelModel.qml	2014-10-22 17:38:27 +0000
@@ -16,9 +16,14 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 import QtQuick 2.3;
-import Ubuntu.Components 1.1;
-QtObject {
-    property var limitLabel:[i18n.tr("Never"),i18n.tr("After X Occurrence"),
-        i18n.tr("After Date")];
-
+
+ListModel {
+    id:limitLables
+    Component.onCompleted: initialise()
+
+    function initialise() {
+        limitLables.append({ "label": i18n.tr("Never") })
+        limitLables.append({ "label": i18n.tr("After X Occurrence") })
+        limitLables.append({ "label": i18n.tr("After Date") })
+    }
 }