Removed the roundtrip between the StationView class and the App class.
Now StationView is responsible for its own settings.
connect(stationView, SIGNAL(stationListSelectTriggered()),
SLOT(showStationSelectView()));
connect(stationView, SIGNAL(stationListSelectTriggered()),
SLOT(showStationSelectView()));
- connect(stationView, SIGNAL(showingArrivalsChanged(bool)),
- SLOT(setShowingArrivals(bool)));
readSettings();
qDebug() << "found" << stationListModel->rowCount() << "stations";
readSettings();
qDebug() << "found" << stationListModel->rowCount() << "stations";
stationView->setBaseUrl(queryBaseUrl);
recentStations = settings.value("RecentStations").toString().split(",");
stationView->setBaseUrl(queryBaseUrl);
recentStations = settings.value("RecentStations").toString().split(",");
- showingArrivals = settings.value("ShowingArrivals", false).toBool();
checkingInterval = settings.value("CheckInterval", 2000).toInt();
}
checkingInterval = settings.value("CheckInterval", 2000).toInt();
}
settings.setValue("QueryURL", queryBaseUrl);
settings.setValue("RecentStations", recentStations.join(","));
settings.setValue("QueryURL", queryBaseUrl);
settings.setValue("RecentStations", recentStations.join(","));
- settings.setValue("ShowingArrivals", showingArrivals);
settings.setValue("CheckInterval", checkingInterval);
}
settings.setValue("CheckInterval", checkingInterval);
}
-void App::setShowingArrivals(bool showArrivals)
-{
- showingArrivals = showArrivals;
-}
-
QString App::dataDir(void)
{
#ifdef Q_WS_MAEMO_5
QString App::dataDir(void)
{
#ifdef Q_WS_MAEMO_5
void showAboutDialog(void);
void showSettingsDialog(void);
void showStationSelectView(void);
void showAboutDialog(void);
void showSettingsDialog(void);
void showStationSelectView(void);
- void setShowingArrivals(bool);
public:
void saveSettings(void);
void readSettings(void);
public:
void saveSettings(void);
void readSettings(void);
TARGET = quandoparte
TEMPLATE = app
TARGET = quandoparte
TEMPLATE = app
VERSION_STRING = '\\"$${VERSION}\\"'
DEFINES += QP_VERSION=\"$${VERSION_STRING}\"
VERSION_STRING = '\\"$${VERSION}\\"'
DEFINES += QP_VERSION=\"$${VERSION_STRING}\"
#include <QDebug>
#include <QMenu>
#include <QMenuBar>
#include <QDebug>
#include <QMenu>
#include <QMenuBar>
#include <QWebElement>
#include <QWebFrame>
#include <QWebView>
#include <QWebElement>
#include <QWebFrame>
#include <QWebView>
showArrivalsAction->setCheckable(true);
showDeparturesAction->setCheckable(true);
showDeparturesAction->setChecked(true);
showArrivalsAction->setCheckable(true);
showDeparturesAction->setCheckable(true);
showDeparturesAction->setChecked(true);
+
+ QSettings settings;
+ if (settings.value("StationView/ShowArrivals", false).toBool() == true) {
+ showArrivalsAction->setChecked(true);
+ } else {
+ showDeparturesAction->setChecked(true);
+ }
+
viewSelectionGroup->addAction(showArrivalsAction);
viewSelectionGroup->addAction(showDeparturesAction);
menu->addAction(showDeparturesAction);
viewSelectionGroup->addAction(showArrivalsAction);
viewSelectionGroup->addAction(showDeparturesAction);
menu->addAction(showDeparturesAction);
void StationView::viewSelectionGroupTriggered(QAction *action)
{
void StationView::viewSelectionGroupTriggered(QAction *action)
{
if (action == showArrivalsAction) {
if (action == showArrivalsAction) {
- emit showingArrivalsChanged(true);
+ settings.setValue("StationView/ShowArrivals", true);
- emit showingArrivalsChanged(false);
+ settings.setValue("StationView/ShowArrivals", false);
void StationView::updateCss(void)
{
QUrl cssUrl;
void StationView::updateCss(void)
{
QUrl cssUrl;
-
- // XXX Maemo5 specific
- if (showArrivalsAction->isChecked()) {
+ QSettings settings;
+ if (settings.value("StationView/ShowArrivals", true).toBool()) {
cssUrl.setEncodedUrl("file:///opt/usr/share/apps/quandoparte/css/arrivals.css");
} else {
cssUrl.setEncodedUrl("file:///opt/usr/share/apps/quandoparte/css/departures.css");
cssUrl.setEncodedUrl("file:///opt/usr/share/apps/quandoparte/css/arrivals.css");
} else {
cssUrl.setEncodedUrl("file:///opt/usr/share/apps/quandoparte/css/departures.css");
void aboutTriggered(void);
void settingsTriggered(void);
void stationListSelectTriggered(void);
void aboutTriggered(void);
void settingsTriggered(void);
void stationListSelectTriggered(void);
- void showingArrivalsChanged(bool);
public slots:
void updateView(const QByteArray &page);
public slots:
void updateView(const QByteArray &page);