Conver page support

harbour-companion.pro

@@ -26,7 +26,8 @@ SOURCES += src/companion.cpp \
     src/conference.cpp \
     src/conferenceday.cpp \
     src/conferenceevent.cpp \
-    src/conferenceeventcompare.cpp
+    src/conferenceeventcompare.cpp \
+    src/staticloader.cpp
 
 OTHER_FILES += qml/companion.qml \
     qml/cover/CoverPage.qml \
@@ -51,7 +52,8 @@ HEADERS += \
     src/conferenceday.h \
     src/conferenceevent.h \
     src/conferenceeventsortingorder.h \
-    src/conferenceeventcompare.h
+    src/conferenceeventcompare.h \
+    src/staticloader.h
 
 DISTFILES += \
     rpm/harbour-companion.changes \

qml/companion.qml

@@ -36,7 +36,7 @@ import "js/Global.js" as Global
 
 ApplicationWindow
 {
-    initialPage: Component { ConferenceView { } }
+    initialPage: Qt.resolvedUrl("pages/ConferenceView.qml")
     cover: Qt.resolvedUrl("cover/CoverPage.qml")
     allowedOrientations: defaultAllowedOrientations
 

qml/cover/CoverPage.qml

@@ -30,12 +30,39 @@
 
 import QtQuick 2.0
 import Sailfish.Silica 1.0
+import harbour.companion 1.0
+
+import "../js/Global.js" as Global
 
 CoverBackground {
-    Label {
-        id: label
-        anchors.centerIn: parent
-        text: qsTr("Nothing to\nsee yet")
+    id: page
+    property var loader
+
+    SilicaListView {
+        model: loader.conference.getNextEvents();
+        anchors.fill: parent
+        delegate: ListItem {
+            width: parent.width
+            Label {
+                id: itemTime
+                text: Global.formatTime(modelData.start)
+                font.pixelSize: Theme.fontSizeExtraSmall
+                width: 80
+            }
+            Label {
+                anchors.left: itemTime.right
+                text: modelData.title
+                font.pixelSize: Theme.fontSizeExtraSmall
+                lineHeight: 0.8
+                wrapMode: "WordWrap"
+                maximumLineCount: 3
+                width: parent.width - 80
+            }
+        }
+    }
+
+    Component.onCompleted: {
+        loader = StaticLoader.getLoader()
     }
 }
 

qml/pages/ConferenceDayView.qml

@@ -103,6 +103,10 @@ Page {
                 text: modelData.room
                 anchors.top: title.bottom
                 anchors.right: title.right
+                anchors.left: times.right
+                truncationMode: TruncationMode.Elide
+                horizontalAlignment: "AlignRight"
+                maximumLineCount: 1
                 color: Theme.secondaryColor
                 font.pixelSize: Theme.fontSizeSmall
             }

qml/pages/ConferenceView.qml

@@ -37,11 +37,7 @@ import "../js/Global.js" as Global
 
 Page {
     id: page
-
-    Loader{
-        id: loader
-    }
-
+    property var loader
     // The effective value will be restricted by ApplicationWindow.allowedOrientations
     allowedOrientations: Orientation.All
 
@@ -59,8 +55,7 @@ Page {
             MenuItem {
                 text: qsTr("Select conference")
                 onClicked: {
-
-                    pageStack.push(Qt.resolvedUrl("SelectConferenceView.qml"), {loader:loader});
+                    pageStack.push(Qt.resolvedUrl("SelectConferenceView.qml"), {loader:Loader});
                 }
 
             }
@@ -96,7 +91,7 @@ Page {
             }
 
             ColumnView{
-                model:loader.conference.days
+                model: loader.conference.days
                 width: parent.width
                 itemHeight: Theme.itemSizeSmall
                 delegate: BackgroundItem {
@@ -115,5 +110,9 @@ Page {
             }
         }
     }
+
+    Component.onCompleted: {
+        loader = StaticLoader.getLoader()
+    }
 }
 

qml/pages/SelectConferenceView.qml

@@ -10,28 +10,6 @@ Page {
     // The effective value will be restricted by ApplicationWindow.allowedOrientations
     allowedOrientations: Orientation.All
 
-//    ListModel {
-//        id: eventModel
-//        ListElement {
-//            name: qsTr("34. Chaos Communication Congress")
-//            cachename: "%0c3"
-//            iteration: 2017
-//            url: "https://fahrplan.events.ccc.de/congress/%0/Fahrplan/schedule.json"
-//        }
-//        ListElement {
-//            name: qsTr("17. Gulasch Programmier Nacht")
-//            cachename: "gpn%0"
-//            iteration:17
-//            url: "https://entropia.de/GPN%0:Fahrplan:JSON?action=raw"
-//        }
-//        ListElement {
-//            name: qsTr("MRMCD 17")
-//            cachename: "mrmcd%0"
-//            iteration: 2017
-//            url: "https://%0.mrmcd.net/fahrplan/schedule.json"
-//        }
-//    }
-
     SilicaListView {
         id: listView
 

rpm/harbour-companion.spec

@@ -13,7 +13,7 @@ Name:       harbour-companion
 %{!?qtc_make:%define qtc_make make}
 %{?qtc_builddir:%define _builddir %qtc_builddir}
 Summary:    Chaos Companion
-Version:    0.5
+Version:    0.6
 Release:    1
 Group:      Qt/Qt
 License:    LICENSE

rpm/harbour-companion.yaml

@@ -1,6 +1,6 @@
 Name: harbour-companion
 Summary: Chaos Companion
-Version: 0.5
+Version: 0.6
 Release: 1
 # The contents of the Group field should be one of the groups listed here:
 # http://gitorious.org/meego-developer-tools/spectacle/blobs/master/data/GROUPS

src/companion.cpp

@@ -37,6 +37,7 @@
 #include "loader.h"
 #include "event.h"
 #include "conferenceeventsortingorder.h"
+#include "staticloader.h"
 #include <unistd.h>
 #include <grp.h>
 #include <pwd.h>
@@ -65,6 +66,9 @@ int main(int argc, char *argv[])
     //
     // For details see:
     // https://harbour.jolla.com/faq#1.5.0
+    qmlRegisterSingletonType<StaticLoader>("harbour.companion", 1, 0, "StaticLoader", [](QQmlEngine *engine, QJSEngine *scriptEngine) -> QObject* {
+        return new StaticLoader();
+    });
     qmlRegisterType<Loader>("harbour.companion", 1, 0, "Loader");
     qmlRegisterType<Conference>("harbour.companion", 1, 0, "Conference");
     qmlRegisterType<ConferenceDay>("harbour.companion", 1, 0, "ConferenceDay");

src/conference.cpp

@@ -1,4 +1,5 @@
 #include "conference.h"
+#include "conferenceeventcompare.h"
 
 Conference::Conference(QObject *parent) : QObject(parent)
 {
@@ -37,3 +38,32 @@ Conference* Conference::fromJson(const QJsonObject &json)
     }
     return conference;
 }
+
+QList<QObject*> Conference::getNextEvents()
+{
+    QList<ConferenceEvent*> events;
+    QDateTime now = QDateTime::currentDateTime();
+    for(QObject* dayObj: days ){
+        ConferenceDay* day = dynamic_cast<ConferenceDay*>(dayObj);
+        if(day){
+            for(QObject* eventObj: day->events){
+                ConferenceEvent* event = dynamic_cast<ConferenceEvent*>(eventObj);
+                if(event){
+                    if(event->start > now  || event->end > now){
+                        events.append(event);
+                    }
+                }
+            }
+        }
+    }
+
+    ConferenceEventPointerCompare comparator;
+    comparator.sortingOrder = ConferenceEventSortingOrder::SortingOrder::BY_TIME;
+    std::sort(events.begin(), events.end(), comparator);
+
+    QList<QObject*> result;
+    for(int i = 0; i < std::min(5, events.size()); i++){
+        result.append(events.at(i));
+    }
+    return result;
+}

src/conference.h

@@ -24,6 +24,8 @@ class Conference : public QObject
 
     static Conference* fromJson(const QJsonObject& json);
 
+    Q_INVOKABLE QList<QObject *> getNextEvents();
+
 signals:
     void titleChanged(const QString& title);
     void startChanged(const QDate& date);

src/conferenceday.h

@@ -13,13 +13,12 @@ class ConferenceDay : public QObject
     Q_PROPERTY(QList<QObject*> events MEMBER events NOTIFY eventsChanged)
     Q_PROPERTY(QStringList rooms MEMBER rooms NOTIFY roomsChanged)
     Q_PROPERTY(ConferenceEventSortingOrder::SortingOrder sortingOrder READ getSortingOrder WRITE setSortingOrder NOTIFY sortingOrderChanged)
-
+public:
     ConferenceEventSortingOrder::SortingOrder sortingOrder;
-
     QDate date;
     QList<QObject*> events;
     QStringList rooms;
-public:
+
     explicit ConferenceDay(QObject *parent = nullptr);
     void setDate(const QDate& date);
     void addEvent(ConferenceEvent* event);

src/conferenceevent.h

@@ -24,16 +24,17 @@ class ConferenceEvent : public QObject
     Q_PROPERTY(QStringList persons MEMBER persons NOTIFY personsChanged)
     Q_PROPERTY(QStringList links MEMBER links NOTIFY linksChanged)
 
-    QDateTime start, end;
-    QString room, title, subtitle, track, type, language, abstract, description;
-    bool record;
-    QStringList persons, links;
     bool _compareByTime(const ConferenceEvent& b) const;
     bool _compareByTitle(const ConferenceEvent& b) const;
     bool _compareByTrack(const ConferenceEvent& b) const;
     bool _compareByRoom(const ConferenceEvent& b) const;
 
 public:
+    QDateTime start, end;
+    QString room, title, subtitle, track, type, language, abstract, description;
+    bool record;
+    QStringList persons, links;
+
     explicit ConferenceEvent(QObject *parent = nullptr);
     void setStartEnd(const QString& date, const QString& start, const QString& duration);
     void setRoom(const QString& room);

src/event.cpp

@@ -29,6 +29,13 @@ QList<QObject*> generateEventList()
             "https://fahrplan.events.ccc.de/congress/%0/Fahrplan/schedule.json"
         )
     );
+    eventList.append(
+        new Event(
+            "(Merged) Chaos Communication Congress",
+            2018-35,
+            "https://streaming.media.ccc.de/configs/conferences/%0c3/everything.schedule.json"
+        )
+    );
     eventList.append(
         new Event(
             "Gulasch Programmier Nacht",

src/staticloader.cpp

@@ -0,0 +1,16 @@
+#include "staticloader.h"
+
+Loader* StaticLoader::loader = nullptr;
+
+StaticLoader::StaticLoader(QObject *parent) : QObject(parent)
+{
+
+}
+
+Loader *StaticLoader::getLoader() const
+{
+    if(loader == nullptr){
+        loader = new Loader();
+    }
+    return loader;
+}

src/staticloader.h

@@ -0,0 +1,21 @@
+#ifndef STATICLOADER_H
+#define STATICLOADER_H
+
+#include <QObject>
+#include "loader.h"
+
+class StaticLoader : public QObject
+{
+    Q_OBJECT
+    static Loader* loader;
+public:
+    explicit StaticLoader(QObject *parent = nullptr);
+
+    Q_INVOKABLE Loader* getLoader() const;
+
+signals:
+
+public slots:
+};
+
+#endif // STATICLOADER_H

translations/harbour-companion-de.ts

@@ -30,14 +30,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>CoverPage</name>
-    <message>
-        <source>Nothing to
-see yet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>SelectConferenceView</name>
     <message>

translations/harbour-companion.ts

@@ -30,14 +30,6 @@
         <translation type="unfinished"></translation>
     </message>
 </context>
-<context>
-    <name>CoverPage</name>
-    <message>
-        <source>Nothing to
-see yet</source>
-        <translation type="unfinished"></translation>
-    </message>
-</context>
 <context>
     <name>SelectConferenceView</name>
     <message>