X-Git-Url: https://www.flypig.org.uk/git/?p=harbour-pedalo.git;a=blobdiff_plain;f=src%2Fharbour-pedalo.cpp;h=e8f123dd1728db6debfe7ed8eef1ba2df6f72588;hp=a4218cd2e1e68d08a340c11e4c836360e6ee4218;hb=70180c4c4fd2807d16f90562d6876f3f07d388b1;hpb=e5b6de629d0585d29f0591deec4afec33f44f20c diff --git a/src/harbour-pedalo.cpp b/src/harbour-pedalo.cpp index a4218cd..e8f123d 100644 --- a/src/harbour-pedalo.cpp +++ b/src/harbour-pedalo.cpp @@ -9,6 +9,7 @@ #include "journeymodel.h" #include "status.h" #include "settings.h" +#include "imageprovider.h" #include "harbour-pedalo.h" @@ -35,15 +36,17 @@ int main(int argc, char *argv[]) qmlRegisterSingletonType("harbour.pedalo.settings", 1, 0, "Settings", Settings::provider); JourneyModel journeys; - Status currentStatus; + Status currentStatus(journeys); Settings::getInstance().setMainStatus(currentStatus); Settings::getInstance().loadSettings(); QFile file; file.setFileName(Settings::getConfigDir() + "/journeys.csv"); journeys.importFromFile(file); + journeys.sort(JourneyModel::StartRole, Qt::DescendingOrder); QScopedPointer view(SailfishApp::createView()); + view->engine()->addImageProvider(QLatin1String("pedalo"), new ImageProvider(Settings::getInstance())); view->setSource(SailfishApp::pathTo("qml/harbour-pedalo.qml")); QQmlContext *ctxt = view->rootContext(); @@ -52,6 +55,7 @@ int main(int argc, char *argv[]) qDebug() << "VERSION_MAJOR: " << VERSION_MAJOR; qDebug() << "VERSION_MINOR: " << VERSION_MINOR; qDebug() << "VERSION_BUILD: " << VERSION_BUILD; + ctxt->setContextProperty("journeymodel", &journeys); ctxt->setContextProperty("currentStatus", ¤tStatus);