projects
/
medard
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
cae4b80
)
Fixed disabling of navigation buttons.
author
Roman Moravčík
<roman.moravcik@gmail.com>
Mon, 6 Aug 2012 13:12:29 +0000
(15:12 +0200)
committer
Roman Moravčík
<roman.moravcik@gmail.com>
Mon, 6 Aug 2012 13:12:29 +0000
(15:12 +0200)
src/mainwindow.cpp
patch
|
blob
|
history
diff --git
a/src/mainwindow.cpp
b/src/mainwindow.cpp
index
6b86cb2
..
79818f5
100644
(file)
--- a/
src/mainwindow.cpp
+++ b/
src/mainwindow.cpp
@@
-49,7
+49,7
@@
MainWindow::MainWindow(QGraphicsItem *parent) : MApplicationPage(parent)
m_forecastInitialDateLabel = new MLabel();
m_forecastInitialDateLabel->setAlignment(Qt::AlignCenter);
m_forecastInitialDateLabel->setWordWrap(true);
m_forecastInitialDateLabel = new MLabel();
m_forecastInitialDateLabel->setAlignment(Qt::AlignCenter);
m_forecastInitialDateLabel->setWordWrap(true);
-// m_forecastInitialDateLabel->setDisabled(true);
+ m_forecastInitialDateLabel->setEnabled(false);
m_forecastDateLabel = new MLabel();
m_forecastDateLabel->setAlignment(Qt::AlignCenter);
m_forecastDateLabel = new MLabel();
m_forecastDateLabel->setAlignment(Qt::AlignCenter);
@@
-372,25
+372,55
@@
void MainWindow::hideNavigationButtons(bool showRetryButton)
void MainWindow::updateNavigationButtons()
{
if ((m_downloader->forecastDateOffset() - 24) < m_downloader->minForecastDateOffset()) {
void MainWindow::updateNavigationButtons()
{
if ((m_downloader->forecastDateOffset() - 24) < m_downloader->minForecastDateOffset()) {
-// m_minusDayButton->setDisabled(true);
-// m_plusDayButton->setDisabled(false);
+#ifdef MEEGO_EDITION_HARMATTAN
+ m_minusDayButton->setEnabled(false);
+ m_plusDayButton->setEnabled(true);
+#else
+ m_minusDayButton->setDisabled(true);
+ m_plusDayButton->setDisabled(false);
+#endif
} else if ((m_downloader->forecastDateOffset() + 24) > m_downloader->maxForecastDateOffset()) {
} else if ((m_downloader->forecastDateOffset() + 24) > m_downloader->maxForecastDateOffset()) {
-// m_minusDayButton->setDisabled(false);
-// m_plusDayButton->setDisabled(true);
+#ifdef MEEGO_EDITION_HARMATTAN
+ m_minusDayButton->setEnabled(true);
+ m_plusDayButton->setEnabled(false);
+#else
+ m_minusDayButton->setDisabled(false);
+ m_plusDayButton->setDisabled(true);
+#endif
} else {
} else {
-// m_minusDayButton->setDisabled(false);
-// m_plusDayButton->setDisabled(false);
+#ifdef MEEGO_EDITION_HARMATTAN
+ m_minusDayButton->setEnabled(true);
+ m_plusDayButton->setEnabled(true);
+#else
+ m_minusDayButton->setDisabled(false);
+ m_plusDayButton->setDisabled(false);
+#endif
}
if ((m_downloader->forecastDateOffset() - 1) < m_downloader->minForecastDateOffset()) {
}
if ((m_downloader->forecastDateOffset() - 1) < m_downloader->minForecastDateOffset()) {
-// m_minusHourButton->setDisabled(true);
-// m_plusHourButton->setDisabled(false);
+#ifdef MEEGO_EDITION_HARMATTAN
+ m_minusHourButton->setEnabled(false);
+ m_plusHourButton->setEnabled(true);
+#else
+ m_minusHourButton->setDisabled(true);
+ m_plusHourButton->setDisabled(false);
+#endif
} else if ((m_downloader->forecastDateOffset() + 1) > m_downloader->maxForecastDateOffset()) {
} else if ((m_downloader->forecastDateOffset() + 1) > m_downloader->maxForecastDateOffset()) {
-// m_minusHourButton->setDisabled(false);
-// m_plusHourButton->setDisabled(true);
+#ifdef MEEGO_EDITION_HARMATTAN
+ m_minusHourButton->setEnabled(true);
+ m_plusHourButton->setEnabled(false);
+#else
+ m_minusHourButton->setDisabled(false);
+ m_plusHourButton->setDisabled(true);
+#endif
} else {
} else {
-// m_minusHourButton->setDisabled(false);
-// m_plusHourButton->setDisabled(false);
+#ifdef MEEGO_EDITION_HARMATTAN
+ m_minusHourButton->setEnabled(true);
+ m_plusHourButton->setEnabled(true);
+#else
+ m_minusHourButton->setDisabled(false);
+ m_plusHourButton->setDisabled(false);
+#endif
}
}
}
}
@@
-554,10
+584,10
@@
void MainWindow::downloadedFinished(const QString &filename, const QDateTime &da
{
m_forecast->setImage(filename);
m_forecastInitialDateLabel->setText(tr("Forecast from:\n") +
{
m_forecast->setImage(filename);
m_forecastInitialDateLabel->setText(tr("Forecast from:\n") +
- m_downloader->forecastInitialDate().toString("dd.MM.yyyy hh:mm"));
+ m_downloader->forecastInitialDate().toString("dd.MM.yyyy, hh:mm"));
/* upcase the first letter of name of day */
/* upcase the first letter of name of day */
- QString temp = date.toString("dddd\ndd.MM.yyyy hh:mm");
+ QString temp = date.toString("dddd\ndd.MM.yyyy, hh:mm");
m_forecastDateLabel->setText(temp.replace(0, 1, temp.at(0).toUpper()));
showNavigationButtons();
m_forecastDateLabel->setText(temp.replace(0, 1, temp.at(0).toUpper()));
showNavigationButtons();