QVBoxLayout *layout = new QVBoxLayout (this);
_displayButton = new QMaemo5ValueButton (tr ("Display"), this);
+ _displayButton->setValueLayout (QMaemo5ValueButton::ValueUnderText);
+ updateDisplayButtonValue ();
layout->addWidget (_displayButton);
_updateButton = new QMaemo5ValueButton (tr ("Update"), this);
+ _updateButton->setValueLayout (QMaemo5ValueButton::ValueUnderText);
+ updateUpdateButtonValue ();
layout->addWidget (_updateButton);
- _alertsButton = new QMaemo5ValueButton (tr ("Alerts"), this);
- layout->addWidget (_alertsButton);
connect (_displayButton, SIGNAL (clicked ()), SLOT (displayClicked ()));
connect (_updateButton, SIGNAL (clicked ()), SLOT (updateClicked ()));
{
DisplaySettingsDialog dlg (_settings);
dlg.exec ();
+ updateDisplayButtonValue ();
}
{
UpdateSettingsDialog dlg (_settings);
dlg.exec ();
+ updateUpdateButtonValue ();
+}
+
+
+void SettingsDialog::updateDisplayButtonValue ()
+{
+ QString val;
+ QStringList list;
+
+ val = tr ("City: ") + _settings->cities ()[_settings->regionID ()] + ", " + tr ("Data: ");
+
+ if (_settings->check (Settings::C_ShowLight))
+ list.append (tr ("lights"));
+ if (_settings->check (Settings::C_ShowRank))
+ list.append (tr ("rank"));
+ if (_settings->check (Settings::C_ShowTime))
+ list.append (tr ("time"));
+ if (_settings->check (Settings::C_ShowHint))
+ list.append (tr ("hint"));
+
+ _displayButton->setValueText (val + list.join (", "));
+}
+
+
+void SettingsDialog::updateUpdateButtonValue ()
+{
+ QStringList list, intervals = _settings->updateIntervals ();
+ QString val;
+
+ val = tr ("Interval: ") + intervals[_settings->getUpdateIntervalIndex ()] + ", " + tr ("Update via: ");
+
+ if (_settings->check (Settings::C_UpdateOnWiFi))
+ list.append (tr ("WiFi"));
+ if (_settings->check (Settings::C_UpdateOnGSM))
+ list.append (tr ("GSM"));
+
+ _updateButton->setValueText (val + list.join (", "));
}
{
QHBoxLayout *layout = new QHBoxLayout (this);
QVBoxLayout *right_layout = new QVBoxLayout ();
+ QSizePolicy policy;
// Right side
_saveButton = new QPushButton (tr ("Save"), this);
+ policy = _saveButton->sizePolicy ();
+ policy.setHorizontalPolicy (QSizePolicy::Maximum);
+ _saveButton->setSizePolicy (policy);
connect (_saveButton, SIGNAL (clicked ()), SLOT (saveClicked ()));
right_layout->addStretch ();
// --------------------------------------------------
// DisplaySettingsDialog
// --------------------------------------------------
-DisplaySettingsDialog::DisplaySettingsDialog (Settings *settings)
- : BaseSettingsDialog (settings)
+DisplaySettingsDialog::DisplaySettingsDialog (Settings *_settings)
+ : BaseSettingsDialog (_settings)
{
setWindowTitle (tr ("Display settings"));
setMinimumSize (300, 400);
QGridLayout *grid = new QGridLayout;
_showLight = new QCheckBox (tr ("Light"), this);
- _showLight->setChecked (settings ()->check (Settings::C_Light));
+ _showLight->setChecked (settings ()->check (Settings::C_ShowLight));
_showRank = new QCheckBox (tr ("Rank"), this);
- _showRank->setChecked (settings ()->check (Settings::C_Rank));
+ _showRank->setChecked (settings ()->check (Settings::C_ShowRank));
_showTime = new QCheckBox (tr ("Time"), this);
- _showTime->setChecked (settings ()->check (Settings::C_Time));
+ _showTime->setChecked (settings ()->check (Settings::C_ShowTime));
_showHint = new QCheckBox (tr ("Hint"), this);
- _showHint->setChecked (settings ()->check (Settings::C_Hint));
+ _showHint->setChecked (settings ()->check (Settings::C_ShowHint));
grid->addWidget (_showLight, 0, 0);
grid->addWidget (_showRank, 0, 1);
if (cur)
settings ()->setRegionID (cur->data (Qt::UserRole).toString ());
- settings ()->setCheck (Settings::C_Light, _showLight->isChecked ());
- settings ()->setCheck (Settings::C_Rank, _showRank->isChecked ());
- settings ()->setCheck (Settings::C_Time, _showTime->isChecked ());
- settings ()->setCheck (Settings::C_Hint, _showHint->isChecked ());
+ settings ()->setCheck (Settings::C_ShowLight, _showLight->isChecked ());
+ settings ()->setCheck (Settings::C_ShowRank, _showRank->isChecked ());
+ settings ()->setCheck (Settings::C_ShowTime, _showTime->isChecked ());
+ settings ()->setCheck (Settings::C_ShowHint, _showHint->isChecked ());
}
// --------------------------------------------------
// UpdateSettingsDialog
// --------------------------------------------------
-UpdateSettingsDialog::UpdateSettingsDialog (Settings *settings)
- : BaseSettingsDialog (settings)
+UpdateSettingsDialog::UpdateSettingsDialog (Settings *_settings)
+ : BaseSettingsDialog (_settings)
{
setWindowTitle (tr ("Update settings"));
+
+ _wifiUpdate = new QCheckBox (tr ("Update via WiFi"), this);
+ _wifiUpdate->setChecked (settings ()->check (Settings::C_UpdateOnWiFi));
+ _gsmUpdate = new QCheckBox (tr ("Update via GSM"), this);
+ _gsmUpdate->setChecked (settings ()->check (Settings::C_UpdateOnGSM));
+
+ initUpdateInterval (layout ());
+
+ layout ()->addWidget (_wifiUpdate);
+ layout ()->addWidget (_gsmUpdate);
}
void UpdateSettingsDialog::saveSettings ()
{
+#ifdef Q_WS_MAEMO_5
+ QMaemo5ListPickSelector *selector = static_cast<QMaemo5ListPickSelector*> (_intervalButton->pickSelector ());
+
+ if (selector)
+ settings ()->setUpdateIntervalIndex (selector->currentIndex ());
+#endif
+ settings ()->setCheck (Settings::C_UpdateOnWiFi, _wifiUpdate->isChecked ());
+ settings ()->setCheck (Settings::C_UpdateOnGSM, _gsmUpdate->isChecked ());
+}
+
+
+void UpdateSettingsDialog::initUpdateInterval (QBoxLayout *layout)
+{
+ _intervalButton = new QMaemo5ValueButton (tr ("Update interval"), this);
+ layout->addWidget (_intervalButton);
+
+#ifdef Q_WS_MAEMO_5
+ QMaemo5ListPickSelector *selector = new QMaemo5ListPickSelector;
+ QStandardItemModel *model = new QStandardItemModel (0, 1);
+ QStringList updateIntervals = settings ()->updateIntervals ();
+ QStringList::iterator it = updateIntervals.begin ();
+
+ while (it != updateIntervals.end ()) {
+ model->appendRow (new QStandardItem (*it));
+ it++;
+ }
+
+ selector->setModel (model);
+ selector->setCurrentIndex (settings ()->getUpdateIntervalIndex ());
+
+ _intervalButton->setPickSelector (selector);
+#endif
}