Update to supported version

.gitignore

@@ -1,4 +1,5 @@
 .directory
+/.qmake.*
 /.clickable/
 /.make.cache
 /Makefile
@@ -12,3 +13,4 @@
 /run_on_ubuntu_touch.sh
 /tmp/
 /translations/*.qm
+/rpm/harbour-fahrplan2.spec

clickable.json

@@ -8,7 +8,8 @@
    "clean_tmp": "rm -rf ./tmp/*"
   },
   "template": "custom",
-  "build": "bash -c 'cd ..; ./clickableCustomBuild.sh click_build'",
+  "build": "bash -c 'cd ..; ./clickableCustomBuild.sh click_build/tmp'",
   "dependencies": [ "libcurl4-gnutls-dev" ],
-  "default" : "kill clean clean_tmp build click-build install launch"
+  "default" : "kill clean clean_tmp build click-build install launch",
+  "ssh_" : "bq.fritz.box"
 }

clickableCustomBuild.sh

@@ -13,15 +13,8 @@ if [[ -z "$clickBuildFolder" ]]
   exit 1
 fi
 
-# make sure we are in an armhf environment
-if [[ ! -d "/usr/lib/arm-linux-gnueabihf" ]]
-  then
-  echo "this script has to be run in an armhf container (e.g. docker, chroot or libertine)"
-  exit 1
-fi
-
 # determine qmake (e.g. cross compiler or direct)
-if [[ -n $(which qt5-qmake-arm-linux-gnueabihf) ]]
+if [[ -n $(which qt5-qmake-arm-linux-gnueabihf) && -d "/usr/lib/arm-linux-gnueabihf" ]]
   then
   QMAKE=qt5-qmake-arm-linux-gnueabihf
   else

fahrplan2.pro

@@ -2,7 +2,7 @@
 APP_NAME = Fahrplan
 
 # Define Version
-VERSION = 2.0.32-2
+VERSION = 2.0.33-2
 
 # Switch for jolla to separate harbour and openrepo version
 openrepos {
@@ -129,6 +129,8 @@ HEADERS += \
     src/parser/parser_salzburg_efa.h \
     src/parser/parser_resrobot.h \
     src/parser/parser_finland_matka.h \
+    src/parser/parser_london_tfl.h \
+    src/parser/parser_xmlrmvde.h \
     src/models/backends.h
 
 SOURCES += src/main.cpp \
@@ -163,6 +165,8 @@ SOURCES += src/main.cpp \
     src/parser/parser_salzburg_efa.cpp \
     src/parser/parser_resrobot.cpp \
     src/parser/parser_finland_matka.cpp \
+    src/parser/parser_london_tfl.cpp \
+    src/parser/parser_xmlrmvde.cpp \
     src/models/backends.cpp
 
 LIBS += $$PWD/3rdparty/gauss-kruger-cpp/gausskruger.cpp

src/fahrplan.cpp

@@ -45,12 +45,12 @@ Fahrplan::Fahrplan(QObject *parent)
     , m_mode(DepartureMode)
     , m_dateTime(QDateTime::currentDateTime())
 {
-    settings = new QSettings(FAHRPLAN_SETTINGS_NAMESPACE, "fahrplan2");
+    settings = new QSettings(FAHRPLAN_SETTINGS_NAMESPACE, "fahrplan2", this);
     setMode(static_cast<Mode>(settings->value("mode", DepartureMode).toInt()));
 
     if (!m_parser_manager) {
         int currentBackend = settings->value("currentBackend", 0).toInt();
-        m_parser_manager = new FahrplanBackendManager(currentBackend);
+        m_parser_manager = new FahrplanBackendManager(currentBackend, this);
     }
     connect(m_parser_manager, SIGNAL(parserChanged(const QString &, int)), this, SLOT(onParserChanged(const QString &, int)));
 
@@ -80,6 +80,41 @@ Fahrplan::Fahrplan(QObject *parent)
     }
 }
 
+Fahrplan::~Fahrplan()
+{
+    qDebug() << this;
+
+    if (m_trainrestrictions) {
+        delete m_trainrestrictions;
+    }
+
+    if (m_timetable) {
+        delete m_timetable;
+    }
+
+    if (m_stationSearchResults) {
+        disconnect(m_stationSearchResults, SIGNAL(stationSelected(Fahrplan::StationType,Station)),
+                   this, SLOT(setStation(Fahrplan::StationType,Station)));
+        delete m_stationSearchResults;
+    }
+
+    if (m_favorites) {
+        disconnect(m_favorites, SIGNAL(stationSelected(Fahrplan::StationType,Station)),
+                   this, SLOT(setStation(Fahrplan::StationType,Station)));
+        delete m_favorites;
+    }
+
+    if (m_parser_manager) {
+        unbindParserSignals();
+        disconnect(m_parser_manager, SIGNAL(parserChanged(const QString &, int)), this, SLOT(onParserChanged(const QString &, int)));
+        delete m_parser_manager;
+    }
+
+    if (settings) {
+        delete settings;
+    }
+}
+
 void Fahrplan::bindParserSignals()
 {
     if (m_parser_manager->getParser()) {
@@ -91,6 +126,17 @@ void Fahrplan::bindParserSignals()
     }
 }
 
+void Fahrplan::unbindParserSignals()
+{
+    if (m_parser_manager->getParser()) {
+        disconnect(m_parser_manager->getParser(), SIGNAL(stationsResult(StationsList)), this, SLOT(onStationSearchResults(StationsList)));
+        disconnect(m_parser_manager->getParser(), SIGNAL(journeyResult(JourneyResultList*)), this, SIGNAL(parserJourneyResult(JourneyResultList*)));
+        disconnect(m_parser_manager->getParser(), SIGNAL(errorOccured(QString)), this, SIGNAL(parserErrorOccured(QString)));
+        disconnect(m_parser_manager->getParser(), SIGNAL(journeyDetailsResult(JourneyDetailResultList*)), this, SIGNAL(parserJourneyDetailsResult(JourneyDetailResultList*)));
+        disconnect(m_parser_manager->getParser(), SIGNAL(timeTableResult(TimetableEntriesList)), this, SLOT(onTimetableResult(TimetableEntriesList)));
+    }
+}
+
 void Fahrplan::storeSettingsValue(const QString &key, const QString &value)
 {
     settings->setValue(key, value);

src/fahrplan.h

@@ -79,6 +79,7 @@ class Fahrplan : public QObject
         };
 
         explicit Fahrplan(QObject *parent = 0);
+        virtual ~Fahrplan();
         FahrplanParserThread *parser();
         Favorites *favorites() const;
         QString parserName() const;
@@ -143,6 +144,7 @@ class Fahrplan : public QObject
         void onStationSearchResults(const StationsList &result);
         void onTimetableResult(const TimetableEntriesList &timetableEntries);
         void bindParserSignals();
+        void unbindParserSignals();
 
     private:
         static FahrplanBackendManager *m_parser_manager;

src/fahrplan_backend_manager.cpp

@@ -26,6 +26,14 @@ FahrplanBackendManager::FahrplanBackendManager(int defaultParser, QObject *paren
     currentParserIndex = defaultParser;
 }
 
+FahrplanBackendManager::~FahrplanBackendManager()
+{
+    if (m_parser) {
+        // Parser object will be autodeleted after the thread quits.
+        m_parser->quit();
+    }
+}
+
 QStringList FahrplanBackendManager::getParserList()
 {
     QStringList result;
@@ -45,6 +53,8 @@ QStringList FahrplanBackendManager::getParserList()
     result.append(ParserSalzburgEFA::getName());
     result.append(ParserResRobot::getName());
     result.append(ParserFinlandMatka::getName());
+    result.append(ParserLondonTfl::getName());
+    result.append(ParserXmlRMVde::getName());
 
     // Make sure the index is in bounds
     if (currentParserIndex > (result.count() - 1) || currentParserIndex < 0) {
@@ -73,7 +83,7 @@ void FahrplanBackendManager::setParser(int index)
         m_parser->quit();
     }
 
-    m_parser = new FahrplanParserThread();
+    m_parser = new FahrplanParserThread(this);
     m_parser->init(index);
 
     // Init can fallback to another index if its invalid.

src/fahrplan_backend_manager.h

@@ -29,6 +29,7 @@ class FahrplanBackendManager : public QObject
 
     public:
         explicit FahrplanBackendManager(int defaultParser, QObject *parent = 0);
+        virtual ~FahrplanBackendManager();
         QStringList getParserList();
         void setParser(int index);
         FahrplanParserThread *getParser();

src/fahrplan_parser_thread.cpp

@@ -81,6 +81,11 @@ void FahrplanParserThread::cancelRequest()
     emit requestCancelRequest();
 }
 
+void FahrplanParserThread::clearJourney()
+{
+    emit requestClearJourney();
+}
+
 QString FahrplanParserThread::name() {
     return m_name;
 }
@@ -170,6 +175,12 @@ void FahrplanParserThread::run()
         case 15:
             m_parser = new ParserFinlandMatka();
             break;
+        case 16:
+            m_parser = new ParserLondonTfl();
+            break;
+        case 17:
+            m_parser = new ParserXmlRMVde();
+            break;
     }
 
     m_name = m_parser->name();
@@ -191,6 +202,7 @@ void FahrplanParserThread::run()
     connect(this, SIGNAL(requestSearchJourney(Station,Station,Station,QDateTime,ParserAbstract::Mode,int)), m_parser, SLOT(searchJourney(Station,Station,Station,QDateTime,ParserAbstract::Mode,int)), Qt::QueuedConnection);
     connect(this, SIGNAL(requestSearchJourneyEarlier()), m_parser, SLOT(searchJourneyEarlier()), Qt::QueuedConnection);
     connect(this, SIGNAL(requestSearchJourneyLater()), m_parser, SLOT(searchJourneyLater()), Qt::QueuedConnection);
+    connect(this, SIGNAL(requestClearJourney()), m_parser, SLOT(clearJourney()), Qt::QueuedConnection);
 
     //Connect parser responses with threads corresponding results
     connect(m_parser, SIGNAL(errorOccured(QString)), this, SIGNAL(errorOccured(QString)), Qt::QueuedConnection);

src/fahrplan_parser_thread.h

@@ -40,6 +40,8 @@
 #include "parser/parser_salzburg_efa.h"
 #include "parser/parser_resrobot.h"
 #include "parser/parser_finland_matka.h"
+#include "parser/parser_london_tfl.h"
+#include "parser/parser_xmlrmvde.h"
 
 class FahrplanParserThread : public QThread
 {
@@ -57,6 +59,7 @@ class FahrplanParserThread : public QThread
     void requestSearchJourneyEarlier();
     void requestGetJourneyDetails(const QString &id);
     void requestCancelRequest();
+    void requestClearJourney();
 
     //Real ones
     void stationsResult(const StationsList &result);
@@ -77,6 +80,7 @@ public slots:
     void searchJourneyEarlier();
     void getJourneyDetails(const QString &id);
     void cancelRequest();
+    void clearJourney();
 
     bool supportsGps();
     bool supportsVia();
@@ -91,7 +95,7 @@ public slots:
   void run();
 
 private:
-  bool m_ready;
+  volatile bool m_ready;
   int  i_parser;
 
   QStringList m_trainrestrictions;

src/gui/desktop-test/mainwindow.cpp

@@ -146,7 +146,7 @@ void MainWindow::timeTableResult()
     for (int i=0; i < fahrplan->timetable()->count(); i++) {
         QModelIndex index = fahrplan->timetable()->index(i, 0, QModelIndex());
         ui->searchJourneyResults->append(fahrplan->timetable()->data(index, Timetable::CurrentStation).toString());
-        ui->searchJourneyResults->append(fahrplan->timetable()->data(index, Timetable::Time).toTime().toString(QLocale().timeFormat(QLocale::ShortFormat)));
+        ui->searchJourneyResults->append(fahrplan->timetable()->data(index, Timetable::Time).toTime().toString("HH:mm"));
         ui->searchJourneyResults->append(fahrplan->timetable()->data(index, Timetable::DestinationStation).toString());
         ui->searchJourneyResults->append(fahrplan->timetable()->data(index, Timetable::TrainType).toString());
         ui->searchJourneyResults->append(fahrplan->timetable()->data(index, Timetable::Platform).toString());

src/gui/ubuntu/AboutPage.qml

@@ -146,15 +146,15 @@ Page {
 
         Item {
             width: tabView.width
-            height: tabView.height
+            height: tabView.height - header.height
 
             Flickable {
                 clip: true
                 anchors.fill: parent
                 flickableDirection: Flickable.VerticalFlick
 
                 contentWidth: width
-                contentHeight: creditsColumn.height + units.gu(2)
+                contentHeight: creditsColumn.height + units.gu(4)
 
                 Column {
                     id: creditsColumn