Exoplanets.cpp   Exoplanets.cpp 
skipping to change at line 661 skipping to change at line 661
updateUrl = conf->value("url", "http://stellarium.org/json/exoplanet s.json").toString(); updateUrl = conf->value("url", "http://stellarium.org/json/exoplanet s.json").toString();
updateFrequencyHours = conf->value("update_frequency_hours", 72).toI nt(); updateFrequencyHours = conf->value("update_frequency_hours", 72).toI nt();
lastUpdate = QDateTime::fromString(conf->value("last_update", "2012- 05-24T12:00:00").toString(), Qt::ISODate); lastUpdate = QDateTime::fromString(conf->value("last_update", "2012- 05-24T12:00:00").toString(), Qt::ISODate);
updatesEnabled = conf->value("updates_enabled", true).toBool(); updatesEnabled = conf->value("updates_enabled", true).toBool();
setDisplayMode(conf->value("distribution_enabled", false).toBool()); setDisplayMode(conf->value("distribution_enabled", false).toBool());
setTimelineMode(conf->value("timeline_enabled", false).toBool()); setTimelineMode(conf->value("timeline_enabled", false).toBool());
setHabitableMode(conf->value("habitable_enabled", false).toBool()); setHabitableMode(conf->value("habitable_enabled", false).toBool());
enableAtStartup = conf->value("enable_at_startup", false).toBool(); enableAtStartup = conf->value("enable_at_startup", false).toBool();
flagShowExoplanetsButton = conf->value("flag_show_exoplanets_button" , true).toBool(); flagShowExoplanetsButton = conf->value("flag_show_exoplanets_button" , true).toBool();
setFlagShowExoplanetsDesignations(conf->value("flag_show_designation s", true).toBool());
setMarkerColor(StelUtils::strToVec3f(conf->value("exoplanet_marker_c olor", "0.4,0.9,0.5").toString()), false); setMarkerColor(StelUtils::strToVec3f(conf->value("exoplanet_marker_c olor", "0.4,0.9,0.5").toString()), false);
setMarkerColor(StelUtils::strToVec3f(conf->value("habitable_exoplane t_marker_color", "1.0,0.5,0.0").toString()), true); setMarkerColor(StelUtils::strToVec3f(conf->value("habitable_exoplane t_marker_color", "1.0,0.5,0.0").toString()), true);
conf->endGroup(); conf->endGroup();
} }
void Exoplanets::saveConfiguration(void) void Exoplanets::saveConfiguration(void)
{ {
conf->beginGroup("Exoplanets"); conf->beginGroup("Exoplanets");
conf->setValue("url", updateUrl); conf->setValue("url", updateUrl);
conf->setValue("update_frequency_hours", updateFrequencyHours); conf->setValue("update_frequency_hours", updateFrequencyHours);
conf->setValue("updates_enabled", updatesEnabled ); conf->setValue("updates_enabled", updatesEnabled );
conf->setValue("distribution_enabled", getDisplayMode()); conf->setValue("distribution_enabled", getDisplayMode());
conf->setValue("timeline_enabled", getTimelineMode()); conf->setValue("timeline_enabled", getTimelineMode());
conf->setValue("habitable_enabled", getHabitableMode()); conf->setValue("habitable_enabled", getHabitableMode());
conf->setValue("enable_at_startup", enableAtStartup); conf->setValue("enable_at_startup", enableAtStartup);
conf->setValue("flag_show_exoplanets_button", flagShowExoplanetsButt on); conf->setValue("flag_show_exoplanets_button", flagShowExoplanetsButt on);
conf->setValue("flag_show_designations", getFlagShowExoplanetsDesign ations());
conf->setValue("habitable_exoplanet_marker_color", StelUtils::vec3fT oStr(getMarkerColor(true))); conf->setValue("habitable_exoplanet_marker_color", StelUtils::vec3fT oStr(getMarkerColor(true)));
conf->setValue("exoplanet_marker_color", StelUtils::vec3fToStr(getMa rkerColor(false))); conf->setValue("exoplanet_marker_color", StelUtils::vec3fToStr(getMa rkerColor(false)));
conf->endGroup(); conf->endGroup();
} }
int Exoplanets::getSecondsToUpdate(void) int Exoplanets::getSecondsToUpdate(void)
{ {
QDateTime nextUpdate = lastUpdate.addSecs(updateFrequencyHours * 360 0); QDateTime nextUpdate = lastUpdate.addSecs(updateFrequencyHours * 360 0);
return QDateTime::currentDateTime().secsTo(nextUpdate); return QDateTime::currentDateTime().secsTo(nextUpdate);
skipping to change at line 832 skipping to change at line 834
bool Exoplanets::getDisplayMode() bool Exoplanets::getDisplayMode()
{ {
return Exoplanet::distributionMode; return Exoplanet::distributionMode;
} }
void Exoplanets::setDisplayMode(bool b) void Exoplanets::setDisplayMode(bool b)
{ {
Exoplanet::distributionMode=b; Exoplanet::distributionMode=b;
} }
bool Exoplanets::getFlagShowExoplanetsDesignations()
{
return Exoplanet::showDesignations;
}
void Exoplanets::setFlagShowExoplanetsDesignations(bool b)
{
Exoplanet::showDesignations=b;
}
bool Exoplanets::getTimelineMode() bool Exoplanets::getTimelineMode()
{ {
return Exoplanet::timelineMode; return Exoplanet::timelineMode;
} }
void Exoplanets::setTimelineMode(bool b) void Exoplanets::setTimelineMode(bool b)
{ {
Exoplanet::timelineMode=b; Exoplanet::timelineMode=b;
} }
 End of changes. 3 change blocks. 
0 lines changed or deleted 12 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/