Merge pull request #10 from locusf/feeds_page

[feeds] Feeds page added.

src/qml/FeedsPage.qml

+
+// This file is part of colorful-home, a nice user experience for touchscreens.
+//
+// Permission is hereby granted, free of charge, to any person obtaining a copy
+// of this software and associated documentation files (the "Software"), to deal
+// in the Software without restriction, including without limitation the rights
+// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the Software is
+// furnished to do so, subject to the following conditions:
+//
+// The above copyright notice and this permission notice shall be included in
+// all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+// SOFTWARE.
+//
+// Copyright (c) 2011, Tom Swindell <t.swindell@rubyx.co.uk>
+// Copyright (c) 2012, Timur Kristóf <venemo@fedoraproject.org>
+
+import QtQuick 2.0
+import QtQuick.Controls.Nemo 1.0
+import QtQuick.Controls.Styles.Nemo 1.0
+// Feeds page:
+// the place for an event feed.
+
+Item {
+    // Day of week
+    Label {
+        id: displayDayOfWeek
+        text: Qt.formatDateTime(wallClock.time, "dddd")
+        color: "white"
+        anchors {
+            top: parent.top
+            left: parent.left
+            topMargin: 30
+            leftMargin: 20
+        }
+    }
+
+    // Current date
+    Label {
+        id: displayCurrentDate
+        text: Qt.formatDate(wallClock.time, Qt.SystemLocaleShortDate)
+        color: "#888888"
+        anchors {
+            top: displayDayOfWeek.bottom
+            left: parent.left
+            topMargin: 5
+            leftMargin: 20
+        }
+    }
+
+    // Separator thingy
+    Rectangle {
+        height: 2
+        color: "#888888"
+        anchors {
+            top: displayCurrentDate.bottom
+            left: parent.left
+            right: parent.right
+            topMargin: 5
+            leftMargin: 20
+            rightMargin: 20
+        }
+    }
+}

src/qml/MainScreen.qml

@@ -147,10 +147,15 @@ Page {
                 height: pager.height
                 visibleInHome: x > -width && x < desktop.width
             }
+            FeedsPage {
+                id: feeds
+                width: pager.width
+                height: pager.height
+            }
         }
 
         // Initial view should be the AppLauncher
-        currentIndex: 1
+        currentIndex: 0
     }
     Lockscreen {
         id: lockScreen

src/resources-qml.qrc

@@ -35,5 +35,6 @@
         <file>qml/NotificationPreview.qml</file>
         <file>qml/images/notification-circle.png</file>
         <file>qml/scripts/desktop.js</file>
+        <file>qml/FeedsPage.qml</file>
     </qresource>
 </RCC>

src/src.pro

@@ -42,6 +42,7 @@ OTHER_FILES += qml/*.qml \
     qml/compositor/WindowWrapperAlpha.qml \
     qml/compositor/ScreenGestureArea.qml \
     qml/NotificationPreview.qml \
-    qml/scripts/desktop.js
+    qml/scripts/desktop.js \
+    qml/FeedsPage.qml