_checks[C_ShowHint] = settings.value ("checks/hint", _checks[C_ShowHint]).toBool ();
_checks[C_UpdateOnWiFi] = settings.value ("checks/updateOnWifi", _checks[C_UpdateOnWiFi]).toBool ();
_checks[C_UpdateOnGSM] = settings.value ("checks/updateOnGSM", _checks[C_UpdateOnGSM]).toBool ();
-
- loadCities (&settings);
+ _checks[C_UpdateWhenLocked] = settings.value ("checks/updateWhenLocked", _checks[C_UpdateWhenLocked]).toBool ();
_updateIntervalIndex = minutes2IntervalIndex (settings.value ("updateInterval", intervalIndex2Minutes (_updateIntervalIndex)).toInt ());
+
+ _langIndex = settings.value ("langIndex", _langIndex).toInt ();
+ if (_langIndex < 0 || _langIndex >= _langs.count ())
+ _langIndex = 0;
}
settings.setValue ("checks/hint", _checks[C_ShowHint]);
settings.setValue ("checks/updateOnWifi", _checks[C_UpdateOnWiFi]);
settings.setValue ("checks/updateOnGSM", _checks[C_UpdateOnGSM]);
+ settings.setValue ("checks/updateWhenLocked", _checks[C_UpdateWhenLocked]);
settings.setValue ("updateInterval", intervalIndex2Minutes (_updateIntervalIndex));
- saveCities (&settings);
-}
-
-
-void Settings::loadCities (QSettings *settings)
-{
- QMap<QString, QVariant> v;
- QMap<QString, QVariant>::const_iterator it;
-
- v = settings->value ("cities", v).toMap ();
-
- if (v.size () == 0)
- return;
-
- it = v.begin ();
- _cities.clear ();
-
- while (it != v.end ()) {
- _cities[it.key ()] = it.value ().toString ();
- it++;
- }
-}
-
-
-void Settings::saveCities (QSettings *settings)
-{
- QMap<QString, QVariant> v;
- QMap<QString, QString>::const_iterator it;
-
- it = _cities.begin ();
-
- while (it != _cities.end ()) {
- v[it.key ()] = it.value ();
- it++;
- }
-
- settings->setValue ("cities", v);
+ settings.setValue ("langIndex", _langIndex);
}
_regionID = "1"; // Default city
_cities["1"] = tr ("Moscow");
- _cities["10174"] = tr ("Kiev");
+ _cities["10174"] = tr ("St.Petersburg");
+ _cities["20544"] = tr ("Kiev");
_cities["11162"] = tr ("Ekaterinburg");
- _cities["11079"] = tr ("N.Novgorod");
setCheck (C_ShowLight, true);
setCheck (C_ShowRank, true);
setCheck (C_UpdateOnWiFi, true);
+ setCheck (C_UpdateWhenLocked, true);
+
_updateIntervalIndex = 3;
+
+ // languages
+ _langIndex = 0;
+ _langs.append (Language (QString (""), tr ("System")));
+ _langs.append (Language (QString ("en"), tr ("English")));
+ _langs.append (Language (QString ("ru"), tr ("Russian")));
}
{
int int2min[] = { -1, 1, 2, 5, 15, 30 };
- if (index < 0 || sizeof (int2min) / sizeof (int2min[0]))
+ if (index < 0 || sizeof (int2min) / sizeof (int2min[0]) <= (unsigned int)index)
return -1;
return int2min[index];