projects
/
quandoparte
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
3adf4e1
)
Fixed Settings Dialog
author
Luciano Montanaro
<mikelima@cirulla.net>
Sun, 19 Jun 2011 15:43:03 +0000
(17:43 +0200)
committer
Luciano Montanaro
<mikelima@cirulla.net>
Sun, 19 Jun 2011 15:43:03 +0000
(17:43 +0200)
application/app.cpp
patch
|
blob
|
history
application/app.h
patch
|
blob
|
history
application/application.pro
patch
|
blob
|
history
application/settingsdialog.cpp
patch
|
blob
|
history
application/stationview.cpp
patch
|
blob
|
history
diff --git
a/application/app.cpp
b/application/app.cpp
index
83a4aa7
..
b4a74e4
100644
(file)
--- a/
application/app.cpp
+++ b/
application/app.cpp
@@
-72,18
+72,9
@@
App::App(QObject *parent) :
readSettings();
qDebug() << "found" << stationListModel->rowCount() << "stations";
readSettings();
qDebug() << "found" << stationListModel->rowCount() << "stations";
-#if defined(Q_WS_S60)
- stationView->showMaximized();
-#else
stationView->show();
stationView->show();
-#endif
-
- if (recentStations.isEmpty()) {
-#if defined(Q_WS_S60)
- stationListView->showMaximized();
-#else
+ if (recentStations.isEmpty() || !stationViewPreferred) {
stationListView->show();
stationListView->show();
-#endif
} else {
queryStation(recentStations.front());
}
} else {
queryStation(recentStations.front());
}
@@
-136,7
+127,7
@@
void App::showSettingsDialog()
SettingsDialog *dialog = new SettingsDialog(stationView);
if (dialog->exec() == QDialog::Accepted) {
SettingsDialog *dialog = new SettingsDialog(stationView);
if (dialog->exec() == QDialog::Accepted) {
- // TODO Use new settings
+ readSettings();
}
delete dialog;
}
}
delete dialog;
}
@@
-168,6
+159,7
@@
void App::readSettings(void)
recentStations = settings.value("RecentStations").toString().split(",");
checkingInterval = settings.value("CheckInterval", 2000).toInt();
recentStations = settings.value("RecentStations").toString().split(",");
checkingInterval = settings.value("CheckInterval", 2000).toInt();
+ stationViewPreferred = settings.value("StationViewPreferred", false).toBool();
}
void App::saveSettings(void)
}
void App::saveSettings(void)
@@
-179,6
+171,7
@@
void App::saveSettings(void)
settings.setValue("QueryURL", queryBaseUrl);
settings.setValue("RecentStations", recentStations.join(","));
settings.setValue("CheckInterval", checkingInterval);
settings.setValue("QueryURL", queryBaseUrl);
settings.setValue("RecentStations", recentStations.join(","));
settings.setValue("CheckInterval", checkingInterval);
+ settings.setValue("StationViewPreferred", stationViewPreferred);
}
QString App::dataDir(void)
}
QString App::dataDir(void)
diff --git
a/application/app.h
b/application/app.h
index
c61509a
..
adf5f90
100644
(file)
--- a/
application/app.h
+++ b/
application/app.h
@@
-66,8
+66,8
@@
private:
QString queryBaseUrl;
QString stationName;
QStringList recentStations;
QString queryBaseUrl;
QString stationName;
QStringList recentStations;
- bool showingArrivals;
int checkingInterval;
int checkingInterval;
+ bool stationViewPreferred;
};
#endif // APPLICATION_H
};
#endif // APPLICATION_H
diff --git
a/application/application.pro
b/application/application.pro
index
a250680
..
1483c77
100644
(file)
--- a/
application/application.pro
+++ b/
application/application.pro
@@
-8,7
+8,7
@@
QT += webkit network maemo5
TARGET = quandoparte
TEMPLATE = app
TARGET = quandoparte
TEMPLATE = app
-VERSION = 0.3.1
+VERSION = 0.3.3
VERSION_STRING = '\\"$${VERSION}\\"'
DEFINES += QP_VERSION=\"$${VERSION_STRING}\"
VERSION_STRING = '\\"$${VERSION}\\"'
DEFINES += QP_VERSION=\"$${VERSION_STRING}\"
diff --git
a/application/settingsdialog.cpp
b/application/settingsdialog.cpp
index
469550f
..
0d9b8b5
100644
(file)
--- a/
application/settingsdialog.cpp
+++ b/
application/settingsdialog.cpp
@@
-38,7
+38,7
@@
SettingsDialog::SettingsDialog(QWidget *parent) :
ui->setupUi(this);
QSettings settings;
ui->setupUi(this);
QSettings settings;
- bool showStationPreference = settings.value("ShowStationImmediately",
+ bool showStationPreference = settings.value("StationViewPreferred",
false).toBool();
ui->showLastStationCheckBox->setChecked(showStationPreference);
connect(ui->showLastStationCheckBox, SIGNAL(toggled(bool)),
false).toBool();
ui->showLastStationCheckBox->setChecked(showStationPreference);
connect(ui->showLastStationCheckBox, SIGNAL(toggled(bool)),
@@
-58,5
+58,5
@@
SettingsDialog::~SettingsDialog()
void SettingsDialog::showStationChanged(bool newValue)
{
QSettings settings;
void SettingsDialog::showStationChanged(bool newValue)
{
QSettings settings;
- settings.setValue("ShowStationImmediately", newValue);
+ settings.setValue("StationViewPreferred", newValue);
}
}
diff --git
a/application/stationview.cpp
b/application/stationview.cpp
index
8d4bd32
..
71cc67e
100644
(file)
--- a/
application/stationview.cpp
+++ b/
application/stationview.cpp
@@
-75,6
+75,9
@@
StationView::StationView(QWidget *parent) :
setAttribute(Qt::WA_Maemo5StackedWindow);
setAttribute(Qt::WA_Maemo5AutoOrientation);
#endif
setAttribute(Qt::WA_Maemo5StackedWindow);
setAttribute(Qt::WA_Maemo5AutoOrientation);
#endif
+#if defined(Q_WS_S60)
+ setWindowState(Qt::WindowMaximized);
+#endif
}
void StationView::setStation(const QString &station)
}
void StationView::setStation(const QString &station)