Enable use of StationListModel

diff --git a/application/app.cpp b/application/app.cpp
index c516647..5245591 100644 (file)
--- a/application/app.cpp
+++ b/application/app.cpp
@@ -41,6 +41,8 @@ App::App(QObject *parent) :
     stationListModel(new StationListModel(this)),
     stationListView(new StationListView(stationListModel, stationView))
 {
+    stationListModel->load("/opt/usr/share/apps/quandoparte/stations/stations.qpl");
+
     connect(stationListView, SIGNAL(stationSelected(const QString &)),
             SLOT(queryStation(const QString &)));
     connect(stationListView, SIGNAL(aboutTriggered()),
@@ -54,6 +56,7 @@ App::App(QObject *parent) :
             SLOT(setShowingArrivals(bool)));
     readSettings();
 
+    qDebug() << "found" << stationListModel->rowCount() << "stations";
 #if defined(Q_WS_S60)
     stationView->showMaximized();
 #else

diff --git a/application/application.pro b/application/application.pro
index 74432a4..bb05bcf 100644 (file)
--- a/application/application.pro
+++ b/application/application.pro
@@ -57,6 +57,7 @@ OTHER_FILES += \
     resources/stations/stations.qpl
 
 message($${OTHER_FILES})
+
 unix:!symbian {
     maemo5 {
         target.path = /opt/usr/bin
@@ -97,4 +98,5 @@ unix:!symbian {
     INSTALLS += icon64
     INSTALLS += css
     INSTALLS += i18n
+    INSTALLS += stations
 }

diff --git a/application/stationlistview.cpp b/application/stationlistview.cpp
index bacfb5b..c89e0c1 100644 (file)
--- a/application/stationlistview.cpp
+++ b/application/stationlistview.cpp
@@ -35,7 +35,7 @@ StationListView::StationListView(StationListModel *model, QWidget *parent) :
     QMainWindow(parent),
     ui(new Ui::StationListView),
     viewSelectionGroup(new QActionGroup(0)),
-    stationListModel(new QStringListModel(this)),
+    stationListModel(model),
     filterModel(new QSortFilterProxyModel(this)),
     keyPressForwarder(new KeyPressForwarder(this))
 

diff --git a/application/stationlistview.h b/application/stationlistview.h
index c5012c0..308a277 100644 (file)
--- a/application/stationlistview.h
+++ b/application/stationlistview.h
@@ -36,7 +36,7 @@ private slots:
 private:
     Ui::StationListView *ui;
     QActionGroup *viewSelectionGroup;
-    QStringListModel *stationListModel;
+    StationListModel *stationListModel;
     QSortFilterProxyModel *filterModel;
     KeyPressForwarder *keyPressForwarder;
 };