projects
/
harbour-pedalo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Corrently add, edit and list journey details
[harbour-pedalo.git]
/
src
/
harbour-pedalo.cpp
diff --git
a/src/harbour-pedalo.cpp
b/src/harbour-pedalo.cpp
index
acdcc2e
..
144ddd3
100644
(file)
--- a/
src/harbour-pedalo.cpp
+++ b/
src/harbour-pedalo.cpp
@@
-7,6
+7,7
@@
#include "journey.h"
#include "journeymodel.h"
#include "journey.h"
#include "journeymodel.h"
+#include "status.h"
int main(int argc, char *argv[])
{
int main(int argc, char *argv[])
{
@@
-23,6
+24,7
@@
int main(int argc, char *argv[])
QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
JourneyModel journeys;
QScopedPointer<QGuiApplication> app(SailfishApp::application(argc, argv));
JourneyModel journeys;
+ Status currentStatus;
QFile file;
file.setFileName(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/journeys.csv");
QFile file;
file.setFileName(QStandardPaths::writableLocation(QStandardPaths::AppConfigLocation) + "/journeys.csv");
@@
-33,6
+35,7
@@
int main(int argc, char *argv[])
QQmlContext *ctxt = view->rootContext();
ctxt->setContextProperty("journeymodel", &journeys);
QQmlContext *ctxt = view->rootContext();
ctxt->setContextProperty("journeymodel", &journeys);
+ ctxt->setContextProperty("currentStatus", ¤tStatus);
view->show();
int result = app->exec();
view->show();
int result = app->exec();