Merge lp:~mariob/ubuntu-calendar-app/coding_conventions into lp:ubuntu-calendar-app

[Mario Boikov]

Updated MonthView with proposal to start following QML coding convention from http://qt-project.org/doc/qt-5.0/qtquick/qml-codingconventions.html

[Frank Mertens (frankencode)]

Fine with me.

review: Approve (checked the diff, ran the app)

=== modified file 'MonthView.qml'
--- MonthView.qml	2013-02-14 18:03:27 +0000
+++ MonthView.qml	2013-02-15 10:49:23 +0000
@@ -3,63 +3,71 @@
 import "dateTimeUtils.js" as DateTime
 
 ListView {
+    id: monthView // id for internal reference
+
     // public properties
     property bool portraitMode: width < height
     property real weeksInView: 8
     property int weekStartDay: 1 // Monday, FIXME: depends on locale / user settings
 
-    id: monthView // id for internal reference
-
     // private properties
-    property real weekHeight: height / weeksInView | 0
-    property int indexOrigin: count / 2
-    property var timeOrigin: (new Date()).weekStart(weekStartDay)
-    property var today: (new Date()).midnight()
+    QtObject {
+        id: internal
+
+        property real weekHeight: monthView.height / monthView.weeksInView | 0
+        property int indexOrigin: monthView.count / 2
+        property var timeOrigin: (new Date()).weekStart(monthView.weekStartDay)
+        property var today: (new Date()).midnight()
+    }
+
+    clip: true
+
+    model: 1041 // weeks for about +-10y
+
+    delegate: Item {
+        id: weekItem
+
+        property var weekOrigin: internal.timeOrigin.addDays((index - internal.indexOrigin) * 7)
+
+        width: parent.width
+        height: internal.weekHeight
+
+        Row {
+            anchors.fill: parent
+            spacing: 1
+
+            Repeater {
+                model: 7
+                delegate: Rectangle {
+                    id: dayItem
+
+                    property var dayOrigin: weekOrigin.addDays(index)
+                    property bool isToday: internal.today.getTime() == dayOrigin.getTime()
+
+                    width: weekItem.width / 7
+                    height: weekItem.height - 1
+                    color: isToday ? "#c94212" : dayOrigin.getMonth() % 2 ? "#c4c4c4" : "#e0e0e0"
+
+                    Label {
+                        anchors.centerIn: parent
+                        text: dayOrigin.getDate()
+                        color: isToday ? "white" : dayOrigin.getDay() == 0 ? "#c94212" : "#404040"
+                    }
+                }
+            }
+        }
+    }
 
     Timer { // make sure today is updated at midnight
         interval: 1000
         repeat: true
         running: true
+
         onTriggered: {
             var newDate = (new Date()).midnight()
-            if (today < newDate) today = newDate
-        }
-    }
-
-    clip: true
-
-    model: 1041 // weeks for about +-10y
-
-    delegate: Component {
-        Item {
-            id: weekItem
-            property var weekOrigin: timeOrigin.addDays((index - indexOrigin) * 7)
-            width: parent.width
-            height: weekHeight
-            Row {
-                anchors.fill: parent
-                spacing: 1
-                Repeater {
-                    model: 7
-                    delegate: Rectangle {
-                        id: dayItem
-                        property var dayOrigin: weekOrigin.addDays(index)
-                        property bool isToday: today.getTime() == dayOrigin.getTime()
-                        width: weekItem.width / 7
-                        height: weekItem.height - 1
-                        color: isToday ? "#c94212" : dayOrigin.getMonth() % 2 ? "#c4c4c4" : "#e0e0e0"
-                        Label {
-                            anchors.centerIn: parent
-                            text: dayOrigin.getDate()
-                            color: isToday ? "white" : dayOrigin.getDay() == 0 ? "#c94212" : "#404040"
-                        }
-                    }
-                }
-            }
-        }
-    }
-
-    Component.onCompleted: {
-        positionViewAtIndex(indexOrigin, ListView.Center)
-    }
+            if (internal.today < newDate) internal.today = newDate
+        }
+    }
+
+    Component.onCompleted: positionViewAtIndex(internal.indexOrigin, ListView.Center)
 }