ConfigurationDialog.cpp   ConfigurationDialog.cpp 
skipping to change at line 47 skipping to change at line 47
#include "StelMovementMgr.hpp" #include "StelMovementMgr.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelSkyDrawer.hpp" #include "StelSkyDrawer.hpp"
#include "StelGui.hpp" #include "StelGui.hpp"
#include "StelGuiItems.hpp" #include "StelGuiItems.hpp"
#include "StelLocation.hpp" #include "StelLocation.hpp"
#include "LandscapeMgr.hpp" #include "LandscapeMgr.hpp"
#include "StelSkyCultureMgr.hpp" #include "StelSkyCultureMgr.hpp"
#include "StelSkyLayerMgr.hpp" #include "StelSkyLayerMgr.hpp"
#include "SolarSystem.hpp" #include "SolarSystem.hpp"
#include "MeteorMgr.hpp" #include "SporadicMeteorMgr.hpp"
#include "ConstellationMgr.hpp" #include "ConstellationMgr.hpp"
#include "StarMgr.hpp" #include "StarMgr.hpp"
#include "NebulaMgr.hpp" #include "NebulaMgr.hpp"
#include "GridLinesMgr.hpp" #include "GridLinesMgr.hpp"
#include "MilkyWay.hpp" #include "MilkyWay.hpp"
#include "ZodiacalLight.hpp" #include "ZodiacalLight.hpp"
#ifndef DISABLE_SCRIPTING #ifndef DISABLE_SCRIPTING
#include "StelScriptMgr.hpp" #include "StelScriptMgr.hpp"
#endif #endif
#include "LabelMgr.hpp" #include "LabelMgr.hpp"
skipping to change at line 174 skipping to change at line 174
cb->addItems(StelTranslator::globalTranslator->getAvailableLanguages NamesNative(StelFileMgr::getLocaleDir())); cb->addItems(StelTranslator::globalTranslator->getAvailableLanguages NamesNative(StelFileMgr::getLocaleDir()));
cb->model()->sort(0); cb->model()->sort(0);
updateCurrentSkyLanguage(); updateCurrentSkyLanguage();
connect(cb->lineEdit(), SIGNAL(editingFinished()), this, SLOT(update CurrentSkyLanguage())); connect(cb->lineEdit(), SIGNAL(editingFinished()), this, SLOT(update CurrentSkyLanguage()));
connect(cb, SIGNAL(currentIndexChanged(const QString&)), this, SLOT( selectSkyLanguage(const QString&))); connect(cb, SIGNAL(currentIndexChanged(const QString&)), this, SLOT( selectSkyLanguage(const QString&)));
connect(ui->getStarsButton, SIGNAL(clicked()), this, SLOT(downloadSt ars())); connect(ui->getStarsButton, SIGNAL(clicked()), this, SLOT(downloadSt ars()));
connect(ui->downloadCancelButton, SIGNAL(clicked()), this, SLOT(canc elDownload())); connect(ui->downloadCancelButton, SIGNAL(clicked()), this, SLOT(canc elDownload()));
connect(ui->downloadRetryButton, SIGNAL(clicked()), this, SLOT(downl oadStars())); connect(ui->downloadRetryButton, SIGNAL(clicked()), this, SLOT(downl oadStars()));
resetStarCatalogControls(); resetStarCatalogControls();
ui->nutationCheckBox->setChecked(core->getUseNutation());
connect(ui->nutationCheckBox, SIGNAL(toggled(bool)), core, SLOT(setU
seNutation(bool)));
ui->topocentricCheckBox->setChecked(core->getUseTopocentricCoordinat
es());
connect(ui->topocentricCheckBox, SIGNAL(toggled(bool)), core, SLOT(s
etUseTopocentricCoordinates(bool)));
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
//Kinetic scrolling for tablet pc and pc //Kinetic scrolling for tablet pc and pc
QList<QWidget *> addscroll; QList<QWidget *> addscroll;
addscroll << ui->pluginsListWidget << ui->scriptListWidget; addscroll << ui->pluginsListWidget << ui->scriptListWidget;
installKineticScrolling(addscroll); installKineticScrolling(addscroll);
#endif #endif
// Selected object info // Selected object info
if (gui->getInfoTextFilters() == StelObject::InfoStringGroup(0)) if (gui->getInfoTextFilters() == StelObject::InfoStringGroup(0))
{ {
skipping to change at line 243 skipping to change at line 246
populateDeltaTAlgorithmsList(); populateDeltaTAlgorithmsList();
int idx = ui->deltaTAlgorithmComboBox->findData(core->getCurrentDelt aTAlgorithmKey(), Qt::UserRole, Qt::MatchCaseSensitive); int idx = ui->deltaTAlgorithmComboBox->findData(core->getCurrentDelt aTAlgorithmKey(), Qt::UserRole, Qt::MatchCaseSensitive);
if (idx==-1) if (idx==-1)
{ {
// Use Espenak & Meeus (2006) as default // Use Espenak & Meeus (2006) as default
idx = ui->deltaTAlgorithmComboBox->findData(QVariant("Espena kMeeus"), Qt::UserRole, Qt::MatchCaseSensitive); idx = ui->deltaTAlgorithmComboBox->findData(QVariant("Espena kMeeus"), Qt::UserRole, Qt::MatchCaseSensitive);
} }
ui->deltaTAlgorithmComboBox->setCurrentIndex(idx); ui->deltaTAlgorithmComboBox->setCurrentIndex(idx);
connect(ui->deltaTAlgorithmComboBox, SIGNAL(currentIndexChanged(int) ), this, SLOT(setDeltaTAlgorithm(int))); connect(ui->deltaTAlgorithmComboBox, SIGNAL(currentIndexChanged(int) ), this, SLOT(setDeltaTAlgorithm(int)));
connect(ui->pushButtonCustomDeltaTEquationDialog, SIGNAL(clicked()), this, SLOT(showCustomDeltaTEquationDialog())); connect(ui->pushButtonCustomDeltaTEquationDialog, SIGNAL(clicked()), this, SLOT(showCustomDeltaTEquationDialog()));
if (core->getCurrentDeltaTAlgorithm()==StelCore::Custom)
ui->pushButtonCustomDeltaTEquationDialog->setEnabled(true);
// Tools tab // Tools tab
ConstellationMgr* cmgr = GETSTELMODULE(ConstellationMgr); ConstellationMgr* cmgr = GETSTELMODULE(ConstellationMgr);
Q_ASSERT(cmgr); Q_ASSERT(cmgr);
ui->sphericMirrorCheckbox->setChecked(StelApp::getInstance().getView portEffect() == "sphericMirrorDistorter"); ui->sphericMirrorCheckbox->setChecked(StelApp::getInstance().getView portEffect() == "sphericMirrorDistorter");
connect(ui->sphericMirrorCheckbox, SIGNAL(toggled(bool)), this, SLOT (setSphericMirror(bool))); connect(ui->sphericMirrorCheckbox, SIGNAL(toggled(bool)), this, SLOT (setSphericMirror(bool)));
ui->gravityLabelCheckbox->setChecked(proj->getFlagGravityLabels()); ui->gravityLabelCheckbox->setChecked(proj->getFlagGravityLabels());
connect(ui->gravityLabelCheckbox, SIGNAL(toggled(bool)), StelApp::ge tInstance().getCore(), SLOT(setFlagGravityLabels(bool))); connect(ui->gravityLabelCheckbox, SIGNAL(toggled(bool)), StelApp::ge tInstance().getCore(), SLOT(setFlagGravityLabels(bool)));
ui->selectSingleConstellationButton->setChecked(cmgr->getFlagIsolate Selected()); ui->selectSingleConstellationButton->setChecked(cmgr->getFlagIsolate Selected());
connect(ui->selectSingleConstellationButton, SIGNAL(toggled(bool)), cmgr, SLOT(setFlagIsolateSelected(bool))); connect(ui->selectSingleConstellationButton, SIGNAL(toggled(bool)), cmgr, SLOT(setFlagIsolateSelected(bool)));
skipping to change at line 266 skipping to change at line 271
connect(ui->autoZoomResetsDirectionCheckbox, SIGNAL(toggled(bool)), mvmgr, SLOT(setFlagAutoZoomOutResetsDirection(bool))); connect(ui->autoZoomResetsDirectionCheckbox, SIGNAL(toggled(bool)), mvmgr, SLOT(setFlagAutoZoomOutResetsDirection(bool)));
ui->showFlipButtonsCheckbox->setChecked(gui->getFlagShowFlipButtons( )); ui->showFlipButtonsCheckbox->setChecked(gui->getFlagShowFlipButtons( ));
connect(ui->showFlipButtonsCheckbox, SIGNAL(toggled(bool)), gui, SLO T(setFlagShowFlipButtons(bool))); connect(ui->showFlipButtonsCheckbox, SIGNAL(toggled(bool)), gui, SLO T(setFlagShowFlipButtons(bool)));
ui->showNebulaBgButtonCheckbox->setChecked(gui->getFlagShowNebulaBac kgroundButton()); ui->showNebulaBgButtonCheckbox->setChecked(gui->getFlagShowNebulaBac kgroundButton());
connect(ui->showNebulaBgButtonCheckbox, SIGNAL(toggled(bool)), gui, SLOT(setFlagShowNebulaBackgroundButton(bool))); connect(ui->showNebulaBgButtonCheckbox, SIGNAL(toggled(bool)), gui, SLOT(setFlagShowNebulaBackgroundButton(bool)));
ui->decimalDegreeCheckBox->setChecked(StelApp::getInstance().getFlag ShowDecimalDegrees()); ui->decimalDegreeCheckBox->setChecked(StelApp::getInstance().getFlag ShowDecimalDegrees());
connect(ui->decimalDegreeCheckBox, SIGNAL(toggled(bool)), gui, SLOT( setFlagShowDecimalDegrees(bool))); connect(ui->decimalDegreeCheckBox, SIGNAL(toggled(bool)), gui, SLOT( setFlagShowDecimalDegrees(bool)));
ui->azimuthFromSouthcheckBox->setChecked(StelApp::getInstance().getF
lagOldAzimuthUsage());
connect(ui->azimuthFromSouthcheckBox, SIGNAL(toggled(bool)), this, S
LOT(updateStartPointForAzimuth(bool)));
ui->mouseTimeoutCheckbox->setChecked(StelMainView::getInstance().get FlagCursorTimeout()); ui->mouseTimeoutCheckbox->setChecked(StelMainView::getInstance().get FlagCursorTimeout());
ui->mouseTimeoutSpinBox->setValue(StelMainView::getInstance().getCur sorTimeout()); ui->mouseTimeoutSpinBox->setValue(StelMainView::getInstance().getCur sorTimeout());
connect(ui->mouseTimeoutCheckbox, SIGNAL(clicked()), this, SLOT(curs orTimeOutChanged())); connect(ui->mouseTimeoutCheckbox, SIGNAL(clicked()), this, SLOT(curs orTimeOutChanged()));
connect(ui->mouseTimeoutCheckbox, SIGNAL(toggled(bool)), this, SLOT( cursorTimeOutChanged())); connect(ui->mouseTimeoutCheckbox, SIGNAL(toggled(bool)), this, SLOT( cursorTimeOutChanged()));
connect(ui->mouseTimeoutSpinBox, SIGNAL(valueChanged(double)), this, SLOT(cursorTimeOutChanged(double))); connect(ui->mouseTimeoutSpinBox, SIGNAL(valueChanged(double)), this, SLOT(cursorTimeOutChanged(double)));
connect(ui->setViewingOptionAsDefaultPushButton, SIGNAL(clicked()), this, SLOT(saveCurrentViewOptions())); connect(ui->setViewingOptionAsDefaultPushButton, SIGNAL(clicked()), this, SLOT(saveCurrentViewOptions()));
connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(set DefaultViewOptions())); connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(set DefaultViewOptions()));
skipping to change at line 474 skipping to change at line 481
if (ui->checkBoxGalacticCoordinates->isChecked()) if (ui->checkBoxGalacticCoordinates->isChecked())
flags |= StelObject::GalacticCoord; flags |= StelObject::GalacticCoord;
if (ui->checkBoxType->isChecked()) if (ui->checkBoxType->isChecked())
flags |= StelObject::ObjectType; flags |= StelObject::ObjectType;
if (ui->checkBoxEclipticCoords->isChecked()) if (ui->checkBoxEclipticCoords->isChecked())
flags |= StelObject::EclipticCoord; flags |= StelObject::EclipticCoord;
gui->setInfoTextFilters(flags); gui->setInfoTextFilters(flags);
} }
void ConfigurationDialog::updateStartPointForAzimuth(bool b)
{
StelApp::getInstance().setFlagOldAzimuthUsage(b);
}
void ConfigurationDialog::cursorTimeOutChanged() void ConfigurationDialog::cursorTimeOutChanged()
{ {
StelMainView::getInstance().setFlagCursorTimeout(ui->mouseTimeoutChe ckbox->isChecked()); StelMainView::getInstance().setFlagCursorTimeout(ui->mouseTimeoutChe ckbox->isChecked());
StelMainView::getInstance().setCursorTimeout(ui->mouseTimeoutSpinBox ->value()); StelMainView::getInstance().setCursorTimeout(ui->mouseTimeoutSpinBox ->value());
} }
void ConfigurationDialog::browseForScreenshotDir() void ConfigurationDialog::browseForScreenshotDir()
{ {
QString oldScreenshorDir = StelFileMgr::getScreenshotDir(); QString oldScreenshorDir = StelFileMgr::getScreenshotDir();
QString newScreenshotDir = QFileDialog::getExistingDirectory(NULL, q _("Select screenshot directory"), oldScreenshorDir, QFileDialog::ShowDirsOn ly); QString newScreenshotDir = QFileDialog::getExistingDirectory(NULL, q _("Select screenshot directory"), oldScreenshorDir, QFileDialog::ShowDirsOn ly);
skipping to change at line 519 skipping to change at line 531
// This doesn't include the current viewing direction, time and FOV since t hose have specific controls // This doesn't include the current viewing direction, time and FOV since t hose have specific controls
void ConfigurationDialog::saveCurrentViewOptions() void ConfigurationDialog::saveCurrentViewOptions()
{ {
QSettings* conf = StelApp::getInstance().getSettings(); QSettings* conf = StelApp::getInstance().getSettings();
Q_ASSERT(conf); Q_ASSERT(conf);
LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr); LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr);
Q_ASSERT(lmgr); Q_ASSERT(lmgr);
SolarSystem* ssmgr = GETSTELMODULE(SolarSystem); SolarSystem* ssmgr = GETSTELMODULE(SolarSystem);
Q_ASSERT(ssmgr); Q_ASSERT(ssmgr);
MeteorMgr* mmgr = GETSTELMODULE(MeteorMgr); SporadicMeteorMgr* mmgr = GETSTELMODULE(SporadicMeteorMgr);
Q_ASSERT(mmgr); Q_ASSERT(mmgr);
StelSkyDrawer* skyd = StelApp::getInstance().getCore()->getSkyDrawer (); StelSkyDrawer* skyd = StelApp::getInstance().getCore()->getSkyDrawer ();
Q_ASSERT(skyd); Q_ASSERT(skyd);
ConstellationMgr* cmgr = GETSTELMODULE(ConstellationMgr); ConstellationMgr* cmgr = GETSTELMODULE(ConstellationMgr);
Q_ASSERT(cmgr); Q_ASSERT(cmgr);
StarMgr* smgr = GETSTELMODULE(StarMgr); StarMgr* smgr = GETSTELMODULE(StarMgr);
Q_ASSERT(smgr); Q_ASSERT(smgr);
NebulaMgr* nmgr = GETSTELMODULE(NebulaMgr); NebulaMgr* nmgr = GETSTELMODULE(NebulaMgr);
Q_ASSERT(nmgr); Q_ASSERT(nmgr);
GridLinesMgr* glmgr = GETSTELMODULE(GridLinesMgr); GridLinesMgr* glmgr = GETSTELMODULE(GridLinesMgr);
skipping to change at line 547 skipping to change at line 559
// view dialog / sky tab settings // view dialog / sky tab settings
conf->setValue("stars/absolute_scale", skyd->getAbsoluteStarScale()) ; conf->setValue("stars/absolute_scale", skyd->getAbsoluteStarScale()) ;
conf->setValue("stars/relative_scale", skyd->getRelativeStarScale()) ; conf->setValue("stars/relative_scale", skyd->getRelativeStarScale()) ;
conf->setValue("stars/flag_star_twinkle", skyd->getFlagTwinkle()); conf->setValue("stars/flag_star_twinkle", skyd->getFlagTwinkle());
conf->setValue("stars/star_twinkle_amount", skyd->getTwinkleAmount() ); conf->setValue("stars/star_twinkle_amount", skyd->getTwinkleAmount() );
conf->setValue("astro/flag_star_magnitude_limit", conf->setValue("astro/flag_star_magnitude_limit",
skyd->getFlagStarMagnitudeLimit()); skyd->getFlagStarMagnitudeLimit());
conf->setValue("astro/star_magnitude_limit", conf->setValue("astro/star_magnitude_limit",
skyd->getCustomStarMagnitudeLimit()); skyd->getCustomStarMagnitudeLimit());
conf->setValue("astro/flag_planet_magnitude_limit",
skyd->getFlagPlanetMagnitudeLimit());
conf->setValue("astro/planet_magnitude_limit",
skyd->getCustomPlanetMagnitudeLimit());
conf->setValue("astro/flag_nebula_magnitude_limit", conf->setValue("astro/flag_nebula_magnitude_limit",
skyd->getFlagNebulaMagnitudeLimit()); skyd->getFlagNebulaMagnitudeLimit());
conf->setValue("astro/nebula_magnitude_limit", conf->setValue("astro/nebula_magnitude_limit",
skyd->getCustomNebulaMagnitudeLimit()); skyd->getCustomNebulaMagnitudeLimit());
conf->setValue("viewing/use_luminance_adaptation", skyd->getFlagLumi nanceAdaptation()); conf->setValue("viewing/use_luminance_adaptation", skyd->getFlagLumi nanceAdaptation());
conf->setValue("astro/flag_planets", ssmgr->getFlagPlanets()); conf->setValue("astro/flag_planets", ssmgr->getFlagPlanets());
conf->setValue("astro/flag_planets_hints", ssmgr->getFlagHints()); conf->setValue("astro/flag_planets_hints", ssmgr->getFlagHints());
conf->setValue("astro/flag_planets_orbits", ssmgr->getFlagOrbits()); conf->setValue("astro/flag_planets_orbits", ssmgr->getFlagOrbits());
conf->setValue("astro/flag_light_travel_time", ssmgr->getFlagLightTr avelTime()); conf->setValue("astro/flag_light_travel_time", ssmgr->getFlagLightTr avelTime());
conf->setValue("viewing/flag_moon_scaled", ssmgr->getFlagMoonScale() ); conf->setValue("viewing/flag_moon_scaled", ssmgr->getFlagMoonScale() );
conf->setValue("viewing/moon_scale", ssmgr->getMoonScale()); conf->setValue("viewing/moon_scale", ssmgr->getMoonScale());
conf->setValue("astro/meteor_rate", mmgr->getZHR()); conf->setValue("astro/meteor_rate", mmgr->getZHR());
conf->setValue("astro/milky_way_intensity", GETSTELMODULE(MilkyWay)- >getIntensity()); conf->setValue("astro/milky_way_intensity", GETSTELMODULE(MilkyWay)- >getIntensity());
conf->setValue("astro/zodiacal_light_intensity", GETSTELMODULE(Zodia calLight)->getIntensity()); conf->setValue("astro/zodiacal_light_intensity", GETSTELMODULE(Zodia calLight)->getIntensity());
// view dialog / markings tab settings // view dialog / markings tab settings
conf->setValue("viewing/flag_azimuthal_grid", glmgr->getFlagAzimutha lGrid()); conf->setValue("viewing/flag_azimuthal_grid", glmgr->getFlagAzimutha lGrid());
conf->setValue("viewing/flag_equatorial_grid", glmgr->getFlagEquator Grid()); conf->setValue("viewing/flag_equatorial_grid", glmgr->getFlagEquator Grid());
conf->setValue("viewing/flag_equatorial_J2000_grid", glmgr->getFlagE quatorJ2000Grid());
conf->setValue("viewing/flag_equator_line", glmgr->getFlagEquatorLin e()); conf->setValue("viewing/flag_equator_line", glmgr->getFlagEquatorLin e());
conf->setValue("viewing/flag_equator_J2000_line", glmgr->getFlagEqua torJ2000Line());
conf->setValue("viewing/flag_ecliptic_line", glmgr->getFlagEclipticL ine()); conf->setValue("viewing/flag_ecliptic_line", glmgr->getFlagEclipticL ine());
conf->setValue("viewing/flag_ecliptic_J2000_line", glmgr->getFlagEcl
ipticJ2000Line());
conf->setValue("viewing/flag_ecliptic_grid", glmgr->getFlagEclipticG
rid());
conf->setValue("viewing/flag_ecliptic_J2000_grid", glmgr->getFlagEcl ipticJ2000Grid()); conf->setValue("viewing/flag_ecliptic_J2000_grid", glmgr->getFlagEcl ipticJ2000Grid());
conf->setValue("viewing/flag_meridian_line", glmgr->getFlagMeridianL ine()); conf->setValue("viewing/flag_meridian_line", glmgr->getFlagMeridianL ine());
conf->setValue("viewing/flag_longitude_line", glmgr->getFlagLongitud eLine()); conf->setValue("viewing/flag_longitude_line", glmgr->getFlagLongitud eLine());
conf->setValue("viewing/flag_horizon_line", glmgr->getFlagHorizonLin e()); conf->setValue("viewing/flag_horizon_line", glmgr->getFlagHorizonLin e());
conf->setValue("viewing/flag_equatorial_J2000_grid", glmgr->getFlagE quatorJ2000Grid());
conf->setValue("viewing/flag_galactic_grid", glmgr->getFlagGalacticG rid()); conf->setValue("viewing/flag_galactic_grid", glmgr->getFlagGalacticG rid());
conf->setValue("viewing/flag_galactic_equator_line", glmgr->getFlagG alacticEquatorLine()); conf->setValue("viewing/flag_galactic_equator_line", glmgr->getFlagG alacticEquatorLine());
conf->setValue("viewing/flag_cardinal_points", lmgr->getFlagCardinal sPoints()); conf->setValue("viewing/flag_cardinal_points", lmgr->getFlagCardinal sPoints());
conf->setValue("viewing/flag_constellation_drawing", cmgr->getFlagLi nes()); conf->setValue("viewing/flag_constellation_drawing", cmgr->getFlagLi nes());
conf->setValue("viewing/flag_constellation_name", cmgr->getFlagLabel s()); conf->setValue("viewing/flag_constellation_name", cmgr->getFlagLabel s());
conf->setValue("viewing/flag_constellation_boundaries", cmgr->getFla gBoundaries()); conf->setValue("viewing/flag_constellation_boundaries", cmgr->getFla gBoundaries());
conf->setValue("viewing/flag_constellation_art", cmgr->getFlagArt()) ; conf->setValue("viewing/flag_constellation_art", cmgr->getFlagArt()) ;
conf->setValue("viewing/flag_constellation_isolate_selected", cmgr-> getFlagIsolateSelected()); conf->setValue("viewing/flag_constellation_isolate_selected", cmgr-> getFlagIsolateSelected());
conf->setValue("viewing/flag_landscape_autoselection", lmgr->getFlag LandscapeAutoSelection()); conf->setValue("viewing/flag_landscape_autoselection", lmgr->getFlag LandscapeAutoSelection());
conf->setValue("viewing/flag_light_pollution_database", lmgr->getFla gUseLightPollutionFromDatabase()); conf->setValue("viewing/flag_light_pollution_database", lmgr->getFla gUseLightPollutionFromDatabase());
skipping to change at line 593 skipping to change at line 612
conf->setValue("viewing/flag_planets_native_names", ssmgr->getFlagNa tiveNames()); conf->setValue("viewing/flag_planets_native_names", ssmgr->getFlagNa tiveNames());
conf->setValue("viewing/constellation_art_intensity", cmgr->getArtIn tensity()); conf->setValue("viewing/constellation_art_intensity", cmgr->getArtIn tensity());
conf->setValue("viewing/constellation_name_style", cmgr->getConstell ationDisplayStyleString()); conf->setValue("viewing/constellation_name_style", cmgr->getConstell ationDisplayStyleString());
conf->setValue("viewing/constellation_line_thickness", cmgr->getCons tellationLineThickness()); conf->setValue("viewing/constellation_line_thickness", cmgr->getCons tellationLineThickness());
conf->setValue("viewing/flag_night", StelApp::getInstance().getVisio nModeNight()); conf->setValue("viewing/flag_night", StelApp::getInstance().getVisio nModeNight());
conf->setValue("astro/flag_star_name", smgr->getFlagLabels()); conf->setValue("astro/flag_star_name", smgr->getFlagLabels());
conf->setValue("stars/labels_amount", smgr->getLabelsAmount()); conf->setValue("stars/labels_amount", smgr->getLabelsAmount());
conf->setValue("astro/flag_planets_labels", ssmgr->getFlagLabels()); conf->setValue("astro/flag_planets_labels", ssmgr->getFlagLabels());
conf->setValue("astro/labels_amount", ssmgr->getLabelsAmount()); conf->setValue("astro/labels_amount", ssmgr->getLabelsAmount());
conf->setValue("astro/nebula_hints_amount", nmgr->getHintsAmount()); conf->setValue("astro/nebula_hints_amount", nmgr->getHintsAmount());
conf->setValue("astro/nebula_labels_amount", nmgr->getLabelsAmount()
);
conf->setValue("astro/flag_nebula_hints_proportional", nmgr->getHint
sProportional());
conf->setValue("astro/flag_surface_brightness_usage", nmgr->getFlagS
urfaceBrightnessUsage());
conf->setValue("astro/flag_nebula_name", nmgr->getFlagHints()); conf->setValue("astro/flag_nebula_name", nmgr->getFlagHints());
conf->setValue("astro/flag_nebula_display_no_texture", !GETSTELMODUL E(StelSkyLayerMgr)->getFlagShow()); conf->setValue("astro/flag_nebula_display_no_texture", !GETSTELMODUL E(StelSkyLayerMgr)->getFlagShow());
conf->setValue("astro/flag_use_type_filter", nmgr->getFlagTypeFilter sUsage());
conf->setValue("projection/type", core->getCurrentProjectionTypeKey( )); conf->setValue("projection/type", core->getCurrentProjectionTypeKey( ));
conf->setValue("astro/flag_nutation", core->getUseNutation());
conf->setValue("astro/flag_topocentric_coordinates", core->getUseTop
ocentricCoordinates());
// view dialog / DSO tag settings
const Nebula::CatalogGroup& cflags = nmgr->getCatalogFilters();
conf->beginGroup("dso_catalog_filters");
conf->setValue("flag_show_ngc", (bool) (cflags & Nebula::CatNGC));
conf->setValue("flag_show_ic", (bool) (cflags & Nebula::CatIC));
conf->setValue("flag_show_m", (bool) (cflags & Nebula::CatM));
conf->setValue("flag_show_c", (bool) (cflags & Nebula::CatC));
conf->setValue("flag_show_b", (bool) (cflags & Nebula::CatB));
conf->setValue("flag_show_vdb", (bool) (cflags & Nebula::CatVdB));
conf->setValue("flag_show_sh2", (bool) (cflags & Nebula::CatSh2));
conf->setValue("flag_show_rcw", (bool) (cflags & Nebula::CatRCW));
conf->setValue("flag_show_lbn", (bool) (cflags & Nebula::CatLBN));
conf->setValue("flag_show_ldn", (bool) (cflags & Nebula::CatLDN));
conf->setValue("flag_show_cr", (bool) (cflags & Nebula::CatCr));
conf->setValue("flag_show_mel", (bool) (cflags & Nebula::CatMel));
conf->setValue("flag_show_ced", (bool) (cflags & Nebula::CatCed));
conf->setValue("flag_show_pgc", (bool) (cflags & Nebula::CatPGC));
conf->setValue("flag_show_ugc", (bool) (cflags & Nebula::CatUGC));
conf->endGroup();
const Nebula::TypeGroup& tflags = nmgr->getTypeFilters();
conf->beginGroup("dso_type_filters");
conf->setValue("flag_show_galaxies", (bool) (tflags & Ne
bula::TypeGalaxies));
conf->setValue("flag_show_active_galaxies", (bool) (tflags & Ne
bula::TypeActiveGalaxies));
conf->setValue("flag_show_interacting_galaxies", (bool) (tflags & Ne
bula::TypeInteractingGalaxies));
conf->setValue("flag_show_clusters", (bool) (tflags & Ne
bula::TypeStarClusters));
conf->setValue("flag_show_bright_nebulae", (bool) (tflags & Ne
bula::TypeBrightNebulae));
conf->setValue("flag_show_dark_nebulae", (bool) (tflags & Ne
bula::TypeDarkNebulae));
conf->setValue("flag_show_planetary_nebulae", (bool) (tflags & Ne
bula::TypePlanetaryNebulae));
conf->setValue("flag_show_hydrogen_regions", (bool) (tflags & Ne
bula::TypeHydrogenRegions));
conf->setValue("flag_show_supernova_remnants", (bool) (tflags & Ne
bula::TypeSupernovaRemnants));
conf->setValue("flag_show_other", (bool) (tflags & Ne
bula::TypeOther));
conf->endGroup();
// view dialog / landscape tab settings // view dialog / landscape tab settings
lmgr->setDefaultLandscapeID(lmgr->getCurrentLandscapeID()); lmgr->setDefaultLandscapeID(lmgr->getCurrentLandscapeID());
conf->setValue("landscape/flag_landscape_sets_location", lmgr->getFl agLandscapeSetsLocation()); conf->setValue("landscape/flag_landscape_sets_location", lmgr->getFl agLandscapeSetsLocation());
conf->setValue("landscape/flag_landscape", lmgr->getFlagLandscape()) ; conf->setValue("landscape/flag_landscape", lmgr->getFlagLandscape()) ;
conf->setValue("landscape/flag_atmosphere", lmgr->getFlagAtmosphere( )); conf->setValue("landscape/flag_atmosphere", lmgr->getFlagAtmosphere( ));
conf->setValue("landscape/flag_brightness", lmgr->getFlagLandscapeSe tsMinimalBrightness()); conf->setValue("landscape/flag_brightness", lmgr->getFlagLandscapeSe tsMinimalBrightness());
conf->setValue("landscape/flag_fog", lmgr->getFlagFog()); conf->setValue("landscape/flag_fog", lmgr->getFlagFog());
conf->setValue("landscape/flag_enable_illumination_layer", lmgr->get FlagIllumination()); conf->setValue("landscape/flag_enable_illumination_layer", lmgr->get FlagIllumination());
conf->setValue("landscape/flag_enable_labels", lmgr->getFlagLabels() );
conf->setValue("stars/init_bortle_scale", core->getSkyDrawer()->getB ortleScaleIndex()); conf->setValue("stars/init_bortle_scale", core->getSkyDrawer()->getB ortleScaleIndex());
conf->setValue("landscape/atmospheric_extinction_coefficient", core ->getSkyDrawer()->getExtinctionCoefficient()); conf->setValue("landscape/atmospheric_extinction_coefficient", core ->getSkyDrawer()->getExtinctionCoefficient());
conf->setValue("landscape/pressure_mbar", core->getSkyDrawer()->get AtmospherePressure()); conf->setValue("landscape/pressure_mbar", core->getSkyDrawer()->get AtmospherePressure());
conf->setValue("landscape/temperature_C", core->getSkyDrawer()->get AtmosphereTemperature()); conf->setValue("landscape/temperature_C", core->getSkyDrawer()->get AtmosphereTemperature());
conf->setValue("landscape/flag_minimal_brightness", lmgr->getFlagLan dscapeUseMinimalBrightness()); conf->setValue("landscape/flag_minimal_brightness", lmgr->getFlagLan dscapeUseMinimalBrightness());
conf->setValue("landscape/flag_landscape_sets_minimal_brightness", l mgr->getFlagLandscapeSetsMinimalBrightness()); conf->setValue("landscape/flag_landscape_sets_minimal_brightness", l mgr->getFlagLandscapeSetsMinimalBrightness());
conf->setValue("landscape/minimal_brightness", lmgr->getDefaultMinim alBrightness()); conf->setValue("landscape/minimal_brightness", lmgr->getDefaultMinim alBrightness());
// view dialog / starlore tab // view dialog / starlore tab
StelApp::getInstance().getSkyCultureMgr().setDefaultSkyCultureID(Ste lApp::getInstance().getSkyCultureMgr().getCurrentSkyCultureID()); StelApp::getInstance().getSkyCultureMgr().setDefaultSkyCultureID(Ste lApp::getInstance().getSkyCultureMgr().getCurrentSkyCultureID());
skipping to change at line 673 skipping to change at line 734
conf->setValue("flag_show_eclcoord", conf->setValue("flag_show_eclcoord",
(bool) (flags & StelObject::EclipticCoord)); (bool) (flags & StelObject::EclipticCoord));
conf->endGroup(); conf->endGroup();
} }
// toolbar auto-hide status // toolbar auto-hide status
conf->setValue("gui/auto_hide_horizontal_toolbar", gui->getAutoHideH orizontalButtonBar()); conf->setValue("gui/auto_hide_horizontal_toolbar", gui->getAutoHideH orizontalButtonBar());
conf->setValue("gui/auto_hide_vertical_toolbar", gui->getAutoHideVer ticalButtonBar()); conf->setValue("gui/auto_hide_vertical_toolbar", gui->getAutoHideVer ticalButtonBar());
conf->setValue("gui/flag_show_nebulae_background_button", gui->getFl agShowNebulaBackgroundButton()); conf->setValue("gui/flag_show_nebulae_background_button", gui->getFl agShowNebulaBackgroundButton());
conf->setValue("gui/flag_show_decimal_degrees", StelApp::getInstance ().getFlagShowDecimalDegrees()); conf->setValue("gui/flag_show_decimal_degrees", StelApp::getInstance ().getFlagShowDecimalDegrees());
conf->setValue("gui/flag_use_azimuth_from_south", StelApp::getInstan ce().getFlagOldAzimuthUsage());
mvmgr->setInitFov(mvmgr->getCurrentFov()); mvmgr->setInitFov(mvmgr->getCurrentFov());
mvmgr->setInitViewDirectionToCurrent(); mvmgr->setInitViewDirectionToCurrent();
// configuration dialog / navigation tab // configuration dialog / navigation tab
conf->setValue("navigation/flag_enable_zoom_keys", mvmgr->getFlagEna bleZoomKeys()); conf->setValue("navigation/flag_enable_zoom_keys", mvmgr->getFlagEna bleZoomKeys());
conf->setValue("navigation/flag_enable_mouse_navigation", mvmgr->get FlagEnableMouseNavigation()); conf->setValue("navigation/flag_enable_mouse_navigation", mvmgr->get FlagEnableMouseNavigation());
conf->setValue("navigation/flag_enable_move_keys", mvmgr->getFlagEna bleMoveKeys()); conf->setValue("navigation/flag_enable_move_keys", mvmgr->getFlagEna bleMoveKeys());
conf->setValue("navigation/startup_time_mode", core->getStartupTimeM ode()); conf->setValue("navigation/startup_time_mode", core->getStartupTimeM ode());
conf->setValue("navigation/today_time", core->getInitTodayTime()); conf->setValue("navigation/today_time", core->getInitTodayTime());
skipping to change at line 695 skipping to change at line 757
conf->setValue("navigation/init_fov", mvmgr->getInitFov()); conf->setValue("navigation/init_fov", mvmgr->getInitFov());
if (mvmgr->getMountMode() == StelMovementMgr::MountAltAzimuthal) if (mvmgr->getMountMode() == StelMovementMgr::MountAltAzimuthal)
conf->setValue("navigation/viewing_mode", "horizon"); conf->setValue("navigation/viewing_mode", "horizon");
else else
conf->setValue("navigation/viewing_mode", "equator"); conf->setValue("navigation/viewing_mode", "equator");
// configuration dialog / tools tab // configuration dialog / tools tab
conf->setValue("gui/flag_show_flip_buttons", gui->getFlagShowFlipBut tons()); conf->setValue("gui/flag_show_flip_buttons", gui->getFlagShowFlipBut tons());
conf->setValue("video/viewport_effect", StelApp::getInstance().getVi ewportEffect()); conf->setValue("video/viewport_effect", StelApp::getInstance().getVi ewportEffect());
conf->setValue("projection/viewport", StelProjector::maskTypeToStrin g(proj->getMaskType())); conf->setValue("projection/viewport", StelProjector::maskTypeToStrin g(proj->getMaskType()));
conf->setValue("projection/viewport_center_offset_x", core->getCurre
ntStelProjectorParams().viewportCenterOffset[0]);
conf->setValue("projection/viewport_center_offset_y", core->getCurre
ntStelProjectorParams().viewportCenterOffset[1]);
conf->setValue("viewing/flag_gravity_labels", proj->getFlagGravityLa bels()); conf->setValue("viewing/flag_gravity_labels", proj->getFlagGravityLa bels());
conf->setValue("navigation/auto_zoom_out_resets_direction", mvmgr->g etFlagAutoZoomOutResetsDirection()); conf->setValue("navigation/auto_zoom_out_resets_direction", mvmgr->g etFlagAutoZoomOutResetsDirection());
conf->setValue("gui/flag_mouse_cursor_timeout", StelMainView::getIns tance().getFlagCursorTimeout()); conf->setValue("gui/flag_mouse_cursor_timeout", StelMainView::getIns tance().getFlagCursorTimeout());
conf->setValue("gui/mouse_cursor_timeout", StelMainView::getInstance ().getCursorTimeout()); conf->setValue("gui/mouse_cursor_timeout", StelMainView::getInstance ().getCursorTimeout());
conf->setValue("main/screenshot_dir", StelFileMgr::getScreenshotDir( )); conf->setValue("main/screenshot_dir", StelFileMgr::getScreenshotDir( ));
conf->setValue("main/invert_screenshots_colors", StelMainView::getIn stance().getFlagInvertScreenShotColors()); conf->setValue("main/invert_screenshots_colors", StelMainView::getIn stance().getFlagInvertScreenShotColors());
int screenNum = qApp->desktop()->screenNumber(&StelMainView::getInst ance()); int screenNum = qApp->desktop()->screenNumber(&StelMainView::getInst ance());
conf->setValue("video/screen_number", screenNum); conf->setValue("video/screen_number", screenNum);
skipping to change at line 924 skipping to change at line 988
{ {
ui->scriptStatusLabel->setText(q_("Running script: [none]")); ui->scriptStatusLabel->setText(q_("Running script: [none]"));
ui->runScriptButton->setEnabled(true); ui->runScriptButton->setEnabled(true);
ui->stopScriptButton->setEnabled(false); ui->stopScriptButton->setEnabled(false);
} }
#endif #endif
void ConfigurationDialog::setFixedDateTimeToCurrent(void) void ConfigurationDialog::setFixedDateTimeToCurrent(void)
{ {
StelCore* core = StelApp::getInstance().getCore(); StelCore* core = StelApp::getInstance().getCore();
double JD = core->getJDay(); double JD = core->getJD();
ui->fixedDateTimeEdit->setDateTime(StelUtils::jdToQDateTime(JD+StelU ui->fixedDateTimeEdit->setDateTime(StelUtils::jdToQDateTime(JD+StelU
tils::getGMTShiftFromQT(JD)/24-core->getDeltaT(JD)/86400)); tils::getGMTShiftFromQT(JD)/24));
ui->fixedTimeRadio->setChecked(true); ui->fixedTimeRadio->setChecked(true);
setStartupTimeMode(); setStartupTimeMode();
} }
void ConfigurationDialog::resetStarCatalogControls() void ConfigurationDialog::resetStarCatalogControls()
{ {
const QVariantList& catalogConfig = GETSTELMODULE(StarMgr)->getCatal ogsDescription(); const QVariantList& catalogConfig = GETSTELMODULE(StarMgr)->getCatal ogsDescription();
nextStarCatalogToDownload.clear(); nextStarCatalogToDownload.clear();
int idx=0; int idx=0;
foreach (const QVariant& catV, catalogConfig) foreach (const QVariant& catV, catalogConfig)
skipping to change at line 1244 skipping to change at line 1308
algorithms->addItem(q_("Stephenson (1997)"), "Stephenson1997"); algorithms->addItem(q_("Stephenson (1997)"), "Stephenson1997");
// The dropdown label is too long for the string, and Meeus 1998 is very popular, this should be in the beginning of the tag. // The dropdown label is too long for the string, and Meeus 1998 is very popular, this should be in the beginning of the tag.
algorithms->addItem(q_("Meeus (1998) (with Chapront, Chapront-Touze & Francou (1997))"), "ChaprontMeeus"); algorithms->addItem(q_("Meeus (1998) (with Chapront, Chapront-Touze & Francou (1997))"), "ChaprontMeeus");
algorithms->addItem(q_("JPL Horizons"), "JPLHorizons"); algorithms->addItem(q_("JPL Horizons"), "JPLHorizons");
algorithms->addItem(q_("Meeus & Simons (2000)"), "MeeusSimons"); algorithms->addItem(q_("Meeus & Simons (2000)"), "MeeusSimons");
algorithms->addItem(q_("Montenbruck & Pfleger (2000)"), "Montenbruck Pfleger"); algorithms->addItem(q_("Montenbruck & Pfleger (2000)"), "Montenbruck Pfleger");
algorithms->addItem(q_("Reingold & Dershowitz (2002, 2007)"), "Reing oldDershowitz"); algorithms->addItem(q_("Reingold & Dershowitz (2002, 2007)"), "Reing oldDershowitz");
algorithms->addItem(q_("Morrison & Stephenson (2004, 2005)"), "Morri sonStephenson2004"); algorithms->addItem(q_("Morrison & Stephenson (2004, 2005)"), "Morri sonStephenson2004");
// Espenak & Meeus (2006) used by default // Espenak & Meeus (2006) used by default
algorithms->addItem(q_("Espenak & Meeus (2006)").append(" *"), "Espe nakMeeus"); algorithms->addItem(q_("Espenak & Meeus (2006)").append(" *"), "Espe nakMeeus");
// GZ: I want to try out some things. Something is still wrong with
eclipses, see lp:1275092.
//algorithms->addItem(q_("Espenak & Meeus (2006) no extra moon accel
eration"), "EspenakMeeusZeroMoonAccel");
algorithms->addItem(q_("Reijs (2006)"), "Reijs"); algorithms->addItem(q_("Reijs (2006)"), "Reijs");
algorithms->addItem(q_("Banjevic (2006)"), "Banjevic"); algorithms->addItem(q_("Banjevic (2006)"), "Banjevic");
algorithms->addItem(q_("Islam, Sadiq & Qureshi (2008, 2013)"), "Isla mSadiqQureshi"); algorithms->addItem(q_("Islam, Sadiq & Qureshi (2008, 2013)"), "Isla mSadiqQureshi");
algorithms->addItem(q_("Khalid, Sultana & Zaidi (2014)"), "KhalidSul tanaZaidi"); algorithms->addItem(q_("Khalid, Sultana & Zaidi (2014)"), "KhalidSul tanaZaidi");
algorithms->addItem(q_("Custom equation of %1T").arg(QChar(0x0394)), "Custom"); algorithms->addItem(q_("Custom equation of %1T").arg(QChar(0x0394)), "Custom");
//Restore the selection //Restore the selection
index = algorithms->findData(selectedAlgorithmId, Qt::UserRole, Qt:: MatchCaseSensitive); index = algorithms->findData(selectedAlgorithmId, Qt::UserRole, Qt:: MatchCaseSensitive);
algorithms->setCurrentIndex(index); algorithms->setCurrentIndex(index);
//algorithms->model()->sort(0); //algorithms->model()->sort(0);
 End of changes. 19 change blocks. 
7 lines changed or deleted 98 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/