Bump version to 0.9.0

[quandoparte] / application / stationview.cpp

diff --git a/application/stationview.cpp b/application/stationview.cpp
index 462d9b1..2e49496 100644 (file)
--- a/application/stationview.cpp
+++ b/application/stationview.cpp
@@ -20,13 +20,15 @@ Boston, MA 02110-1301, USA.
 */
 
 #include "stationview.h"
+#include "settings.h"
 
 #include <QAction>
 #include <QActionGroup>
+#include <QDir>
+#include <QFileInfo>
 #include <QDebug>
 #include <QMenu>
 #include <QMenuBar>
-#include <QSettings>
 #include <QWebElement>
 #include <QWebFrame>
 #include <QWebView>
@@ -48,8 +50,8 @@ StationView::StationView(QWidget *parent) :
     showDeparturesAction->setCheckable(true);
     showDeparturesAction->setChecked(true);
 
-    QSettings settings;
-    if (settings.value("StationView/ShowArrivals", false).toBool() == true) {
+    Settings *settings = Settings::instance();
+    if (settings->showArrivalsPreferred()) {
         showArrivalsAction->setChecked(true);
     } else {
         showDeparturesAction->setChecked(true);
@@ -67,7 +69,7 @@ StationView::StationView(QWidget *parent) :
     view->setTextSizeMultiplier(2.0);
     view->setBackgroundRole(QPalette::Window);
     connect(showAboutAction, SIGNAL(triggered()), this, SIGNAL(aboutTriggered()));
-    connect(showSettingsAction, SIGNAL(triggered()), this, SIGNAL(settingsTriggered()));
+    connect(showSettingsAction, SIGNAL(triggered()), this, SIGNAL(settingsChangeRequested()));
     connect(showStationListSelectAction, SIGNAL(triggered()), this, SIGNAL(stationListSelectTriggered()));
     connect(viewSelectionGroup, SIGNAL(triggered(QAction *)), this, SLOT(viewSelectionGroupTriggered(QAction *)));
     setCentralWidget(view);
@@ -75,6 +77,9 @@ StationView::StationView(QWidget *parent) :
     setAttribute(Qt::WA_Maemo5StackedWindow);
     setAttribute(Qt::WA_Maemo5AutoOrientation);
 #endif
+#if defined(Q_WS_S60)
+    setWindowState(Qt::WindowMaximized);
+#endif
 }
 
 void StationView::setStation(const QString &station)
@@ -139,23 +144,24 @@ void StationView::updateView(const QByteArray &page)
 
 void StationView::viewSelectionGroupTriggered(QAction *action)
 {
-    QSettings settings;
-    if (action == showArrivalsAction) {
-        settings.setValue("StationView/ShowArrivals", true);
-    } else {
-        settings.setValue("StationView/ShowArrivals", false);
-    }
+    Settings *settings = Settings::instance();
+    settings->setShowArrivalsPreferred(
+                action == showArrivalsAction ? true : false);
     updateCss();
 }
 
 void StationView::updateCss(void)
 {
     QUrl cssUrl;
-    QSettings settings;
-    if (settings.value("StationView/ShowArrivals", true).toBool()) {
-        cssUrl.setEncodedUrl("file:///opt/usr/share/apps/quandoparte/css/arrivals.css");
+    Settings *settings = Settings::instance();
+    QStringList paths = QDir::searchPaths("css");
+    QFileInfo fileInfo;
+    if (settings->showArrivalsPreferred()) {
+        fileInfo = QFileInfo("css:arrivals.css");
     } else {
-        cssUrl.setEncodedUrl("file:///opt/usr/share/apps/quandoparte/css/departures.css");
+        fileInfo = QFileInfo("css:departures.css");
     }
+    cssUrl = QUrl::fromLocalFile(fileInfo.absoluteFilePath());
+    qDebug() << "Css url:" << cssUrl;
     QWebSettings::globalSettings()->setUserStyleSheetUrl(cssUrl);
 }