projects
/
harbour-pedalo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add images to buttons on main page
[harbour-pedalo.git]
/
src
/
harbour-pedalo.cpp
diff --git
a/src/harbour-pedalo.cpp
b/src/harbour-pedalo.cpp
index
a4218cd
..
6c0094d
100644
(file)
--- a/
src/harbour-pedalo.cpp
+++ b/
src/harbour-pedalo.cpp
@@
-9,6
+9,7
@@
#include "journeymodel.h"
#include "status.h"
#include "settings.h"
#include "journeymodel.h"
#include "status.h"
#include "settings.h"
+#include "imageprovider.h"
#include "harbour-pedalo.h"
#include "harbour-pedalo.h"
@@
-35,7
+36,7
@@
int main(int argc, char *argv[])
qmlRegisterSingletonType<Settings>("harbour.pedalo.settings", 1, 0, "Settings", Settings::provider);
JourneyModel journeys;
qmlRegisterSingletonType<Settings>("harbour.pedalo.settings", 1, 0, "Settings", Settings::provider);
JourneyModel journeys;
- Status currentStatus;
+ Status currentStatus(journeys);
Settings::getInstance().setMainStatus(currentStatus);
Settings::getInstance().loadSettings();
Settings::getInstance().setMainStatus(currentStatus);
Settings::getInstance().loadSettings();
@@
-44,6
+45,7
@@
int main(int argc, char *argv[])
journeys.importFromFile(file);
QScopedPointer<QQuickView> view(SailfishApp::createView());
journeys.importFromFile(file);
QScopedPointer<QQuickView> view(SailfishApp::createView());
+ view->engine()->addImageProvider(QLatin1String("pedalo"), new ImageProvider(Settings::getInstance()));
view->setSource(SailfishApp::pathTo("qml/harbour-pedalo.qml"));
QQmlContext *ctxt = view->rootContext();
view->setSource(SailfishApp::pathTo("qml/harbour-pedalo.qml"));
QQmlContext *ctxt = view->rootContext();