ConfigurationDialog.cpp   ConfigurationDialog.cpp 
skipping to change at line 204 skipping to change at line 204
ui->allSelectedInfoRadio->setChecked(true); ui->allSelectedInfoRadio->setChecked(true);
} }
else else
{ {
ui->customSelectedInfoRadio->setChecked(true); ui->customSelectedInfoRadio->setChecked(true);
} }
updateSelectedInfoCheckBoxes(); updateSelectedInfoCheckBoxes();
// Additional settings for selected object info // Additional settings for selected object info
connectBoolProperty(ui->checkBoxUMSurfaceBrightness, "NebulaMgr.flag SurfaceBrightnessArcsecUsage"); connectBoolProperty(ui->checkBoxUMSurfaceBrightness, "NebulaMgr.flag SurfaceBrightnessArcsecUsage");
connectBoolProperty(ui->checkBoxUMShortNotationSurfaceBrightness, "N
ebulaMgr.flagSurfaceBrightnessShortNotationUsage");
ui->checkBoxUseFormattingOutput->setChecked(StelApp::getInstance().g
etFlagUseFormattingOutput());
connect(ui->checkBoxUseFormattingOutput, SIGNAL(toggled(bool)), this
, SLOT(updateSettingFormattingOutput(bool)));
ui->checkBoxUseCCSDesignations->setChecked(StelApp::getInstance().ge
tFlagUseCCSDesignation());
connect(ui->checkBoxUseCCSDesignations, SIGNAL(toggled(bool)), this,
SLOT(updateSettingCCSDesignations(bool)));
connect(ui->noSelectedInfoRadio, SIGNAL(released()), this, SLOT(setN oSelectedInfo())); connect(ui->noSelectedInfoRadio, SIGNAL(released()), this, SLOT(setN oSelectedInfo()));
connect(ui->allSelectedInfoRadio, SIGNAL(released()), this, SLOT(set AllSelectedInfo())); connect(ui->allSelectedInfoRadio, SIGNAL(released()), this, SLOT(set AllSelectedInfo()));
connect(ui->briefSelectedInfoRadio, SIGNAL(released()), this, SLOT(s etBriefSelectedInfo())); connect(ui->briefSelectedInfoRadio, SIGNAL(released()), this, SLOT(s etBriefSelectedInfo()));
connect(ui->buttonGroupDisplayedFields, SIGNAL(buttonClicked(int)), this, SLOT(setSelectedInfoFromCheckBoxes())); connect(ui->buttonGroupDisplayedFields, SIGNAL(buttonClicked(int)), this, SLOT(setSelectedInfoFromCheckBoxes()));
// Navigation tab // Navigation tab
// Startup time // Startup time
if (core->getStartupTimeMode()=="actual") if (core->getStartupTimeMode()=="actual")
ui->systemTimeRadio->setChecked(true); ui->systemTimeRadio->setChecked(true);
skipping to change at line 551 skipping to change at line 556
flags |= StelObject::SiderealTime; flags |= StelObject::SiderealTime;
gui->setInfoTextFilters(flags); gui->setInfoTextFilters(flags);
} }
void ConfigurationDialog::updateStartPointForAzimuth(bool b) void ConfigurationDialog::updateStartPointForAzimuth(bool b)
{ {
StelApp::getInstance().setFlagSouthAzimuthUsage(b); StelApp::getInstance().setFlagSouthAzimuthUsage(b);
} }
void ConfigurationDialog::updateSettingFormattingOutput(bool b)
{
StelApp::getInstance().setFlagUseFormattingOutput(b);
}
void ConfigurationDialog::updateSettingCCSDesignations(bool b)
{
StelApp::getInstance().setFlagUseCCSDesignation(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::usageButtonsBackgroundChanged(bool b) void ConfigurationDialog::usageButtonsBackgroundChanged(bool b)
{ {
StelMainView::getInstance().setFlagUseButtonsBackground(b); StelMainView::getInstance().setFlagUseButtonsBackground(b);
emit StelMainView::getInstance().updateIconsRequested(); emit StelMainView::getInstance().updateIconsRequested();
skipping to change at line 704 skipping to change at line 719
conf->setValue("viewing/flag_constellation_drawing", propMgr->get StelPropertyValue("ConstellationMgr.linesDisplayed").toBool()); conf->setValue("viewing/flag_constellation_drawing", propMgr->get StelPropertyValue("ConstellationMgr.linesDisplayed").toBool());
conf->setValue("viewing/flag_constellation_name", propMgr->get StelPropertyValue("ConstellationMgr.namesDisplayed").toBool()); conf->setValue("viewing/flag_constellation_name", propMgr->get StelPropertyValue("ConstellationMgr.namesDisplayed").toBool());
conf->setValue("viewing/flag_constellation_boundaries", propMgr->get StelPropertyValue("ConstellationMgr.boundariesDisplayed").toBool()); conf->setValue("viewing/flag_constellation_boundaries", propMgr->get StelPropertyValue("ConstellationMgr.boundariesDisplayed").toBool());
conf->setValue("viewing/flag_constellation_art", propMgr->get StelPropertyValue("ConstellationMgr.artDisplayed").toBool()); conf->setValue("viewing/flag_constellation_art", propMgr->get StelPropertyValue("ConstellationMgr.artDisplayed").toBool());
conf->setValue("viewing/flag_constellation_isolate_selected", propMg r->getStelPropertyValue("ConstellationMgr.isolateSelected").toBool()); conf->setValue("viewing/flag_constellation_isolate_selected", propMg r->getStelPropertyValue("ConstellationMgr.isolateSelected").toBool());
conf->setValue("viewing/flag_landscape_autoselection", propMgr->get StelPropertyValue("LandscapeMgr.flagLandscapeAutoSelection").toBool()); conf->setValue("viewing/flag_landscape_autoselection", propMgr->get StelPropertyValue("LandscapeMgr.flagLandscapeAutoSelection").toBool());
conf->setValue("viewing/flag_light_pollution_database", propMgr->get StelPropertyValue("LandscapeMgr.flagUseLightPollutionFromDatabase").toBool( )); conf->setValue("viewing/flag_light_pollution_database", propMgr->get StelPropertyValue("LandscapeMgr.flagUseLightPollutionFromDatabase").toBool( ));
conf->setValue("viewing/flag_atmosphere_auto_enable", propMgr->get StelPropertyValue("LandscapeMgr.flagAtmosphereAutoEnabling").toBool()); conf->setValue("viewing/flag_atmosphere_auto_enable", propMgr->get StelPropertyValue("LandscapeMgr.flagAtmosphereAutoEnabling").toBool());
conf->setValue("viewing/constellation_art_intensity", propMgr->get StelPropertyValue("ConstellationMgr.artIntensity").toFloat()); conf->setValue("viewing/constellation_art_intensity", propMgr->get StelPropertyValue("ConstellationMgr.artIntensity").toFloat());
conf->setValue("viewing/constellation_name_style", Constellatio nMgr::getConstellationDisplayStyleString(static_cast<ConstellationMgr::Cons tellationDisplayStyle> (propMgr->getStelPropertyValue("ConstellationMgr.con stellationDisplayStyle").toInt()) )); conf->setValue("viewing/constellation_name_style", Constellatio nMgr::getConstellationDisplayStyleString(static_cast<ConstellationMgr::Cons tellationDisplayStyle> (propMgr->getStelPropertyValue("ConstellationMgr.con stellationDisplayStyle").toInt()) ));
conf->setValue("viewing/constellation_line_thickness", propMgr->get StelPropertyValue("ConstellationMgr.constellationLineThickness").toFloat()) ; conf->setValue("viewing/constellation_line_thickness", propMgr->get StelPropertyValue("ConstellationMgr.constellationLineThickness").toInt());
conf->setValue("viewing/flag_asterism_drawing", propMgr->get StelPropertyValue("AsterismMgr.linesDisplayed").toBool()); conf->setValue("viewing/flag_asterism_drawing", propMgr->get StelPropertyValue("AsterismMgr.linesDisplayed").toBool());
conf->setValue("viewing/flag_asterism_name", propMgr->get StelPropertyValue("AsterismMgr.namesDisplayed").toBool()); conf->setValue("viewing/flag_asterism_name", propMgr->get StelPropertyValue("AsterismMgr.namesDisplayed").toBool());
conf->setValue("viewing/asterism_line_thickness", propMgr->get conf->setValue("viewing/asterism_line_thickness", propMgr->get
StelPropertyValue("AsterismMgr.asterismLineThickness").toFloat()); StelPropertyValue("AsterismMgr.asterismLineThickness").toInt());
conf->setValue("viewing/flag_rayhelper_drawing", propMgr->get
StelPropertyValue("AsterismMgr.rayHelpersDisplayed").toBool());
conf->setValue("viewing/rayhelper_line_thickness", propMgr->get
StelPropertyValue("AsterismMgr.rayHelperThickness").toInt());
conf->setValue("viewing/flag_night", StelApp::get Instance().getVisionModeNight()); conf->setValue("viewing/flag_night", StelApp::get Instance().getVisionModeNight());
conf->setValue("astro/flag_stars", propMgr->get StelPropertyValue("StarMgr.flagStarsDisplayed").toBool()); conf->setValue("astro/flag_stars", propMgr->get StelPropertyValue("StarMgr.flagStarsDisplayed").toBool());
conf->setValue("astro/flag_star_name", propMgr->get StelPropertyValue("StarMgr.flagLabelsDisplayed").toBool()); conf->setValue("astro/flag_star_name", propMgr->get StelPropertyValue("StarMgr.flagLabelsDisplayed").toBool());
conf->setValue("stars/labels_amount", propMgr->get StelPropertyValue("StarMgr.labelsAmount").toDouble()); conf->setValue("stars/labels_amount", propMgr->get StelPropertyValue("StarMgr.labelsAmount").toDouble());
conf->setValue("astro/nebula_hints_amount", propMgr->get StelPropertyValue("NebulaMgr.hintsAmount").toDouble()); conf->setValue("astro/nebula_hints_amount", propMgr->get StelPropertyValue("NebulaMgr.hintsAmount").toDouble());
conf->setValue("astro/nebula_labels_amount", propMgr->get StelPropertyValue("NebulaMgr.labelsAmount").toDouble()); conf->setValue("astro/nebula_labels_amount", propMgr->get StelPropertyValue("NebulaMgr.labelsAmount").toDouble());
conf->setValue("astro/flag_nebula_hints_proportional", propMgr->get StelPropertyValue("NebulaMgr.hintsProportional").toBool()); conf->setValue("astro/flag_nebula_hints_proportional", propMgr->get StelPropertyValue("NebulaMgr.hintsProportional").toBool());
conf->setValue("astro/flag_surface_brightness_usage", propMgr->get StelPropertyValue("NebulaMgr.flagSurfaceBrightnessUsage").toBool()); conf->setValue("astro/flag_surface_brightness_usage", propMgr->get StelPropertyValue("NebulaMgr.flagSurfaceBrightnessUsage").toBool());
conf->setValue("astro/flag_surface_brightness_arcsec", propMgr->get conf->setValue("gui/flag_surface_brightness_arcsec", propMgr->get
StelPropertyValue("NebulaMgr.flagSurfaceBrightnessArcsecUsage").toBool()); StelPropertyValue("NebulaMgr.flagSurfaceBrightnessArcsecUsage").toBool());
conf->setValue("gui/flag_surface_brightness_short", propMgr->get
StelPropertyValue("NebulaMgr.flagSurfaceBrightnessShortNotationUsage").toBo
ol());
conf->setValue("gui/flag_dso_designation_usage", propMgr->get StelPropertyValue("NebulaMgr.flagDesignationLabels").toBool()); conf->setValue("gui/flag_dso_designation_usage", propMgr->get StelPropertyValue("NebulaMgr.flagDesignationLabels").toBool());
conf->setValue("gui/flag_dso_outlines_usage", propMgr->get StelPropertyValue("NebulaMgr.flagOutlinesDisplayed").toBool());
conf->setValue("astro/flag_nebula_name", propMgr->get StelPropertyValue("NebulaMgr.flagHintDisplayed").toBool()); conf->setValue("astro/flag_nebula_name", propMgr->get StelPropertyValue("NebulaMgr.flagHintDisplayed").toBool());
conf->setValue("astro/flag_use_type_filter", propMgr->get StelPropertyValue("NebulaMgr.flagTypeFiltersUsage").toBool()); conf->setValue("astro/flag_use_type_filter", propMgr->get StelPropertyValue("NebulaMgr.flagTypeFiltersUsage").toBool());
conf->setValue("astro/flag_nebula_display_no_texture", !propMgr->ge tStelPropertyValue("StelSkyLayerMgr.flagShow").toBool() ); conf->setValue("astro/flag_nebula_display_no_texture", !propMgr->ge tStelPropertyValue("StelSkyLayerMgr.flagShow").toBool() );
conf->setValue("projection/type", core->getCur rentProjectionTypeKey()); conf->setValue("projection/type", core->getCur rentProjectionTypeKey());
conf->setValue("astro/flag_nutation", core->getUse Nutation()); conf->setValue("astro/flag_nutation", core->getUse Nutation());
conf->setValue("astro/flag_topocentric_coordinates", core->getUse TopocentricCoordinates()); conf->setValue("astro/flag_topocentric_coordinates", core->getUse TopocentricCoordinates());
// view dialog / DSO tag settings // view dialog / DSO tag settings
const Nebula::CatalogGroup& cflags = nmgr->getCatalogFilters(); const Nebula::CatalogGroup& cflags = nmgr->getCatalogFilters();
conf->beginGroup("dso_catalog_filters"); conf->beginGroup("dso_catalog_filters");
conf->setValue("flag_show_ngc", (bool) (cflags & Nebula::CatNGC)); conf->setValue("flag_show_ngc", (bool) (cflags & Nebula::Cat
conf->setValue("flag_show_ic", (bool) (cflags & Nebula::CatIC)); NGC));
conf->setValue("flag_show_m", (bool) (cflags & Nebula::CatM)); conf->setValue("flag_show_ic", (bool) (cflags & Nebula::Cat
conf->setValue("flag_show_c", (bool) (cflags & Nebula::CatC)); IC));
conf->setValue("flag_show_b", (bool) (cflags & Nebula::CatB)); conf->setValue("flag_show_m", (bool) (cflags & Nebula::Cat
conf->setValue("flag_show_vdb", (bool) (cflags & Nebula::CatVdB)); M));
conf->setValue("flag_show_sh2", (bool) (cflags & Nebula::CatSh2)); conf->setValue("flag_show_c", (bool) (cflags & Nebula::Cat
conf->setValue("flag_show_rcw", (bool) (cflags & Nebula::CatRCW)); C));
conf->setValue("flag_show_lbn", (bool) (cflags & Nebula::CatLBN)); conf->setValue("flag_show_b", (bool) (cflags & Nebula::Cat
conf->setValue("flag_show_ldn", (bool) (cflags & Nebula::CatLDN)); B));
conf->setValue("flag_show_cr", (bool) (cflags & Nebula::CatCr)); conf->setValue("flag_show_vdb", (bool) (cflags & Nebula::Cat
conf->setValue("flag_show_mel", (bool) (cflags & Nebula::CatMel)); VdB));
conf->setValue("flag_show_ced", (bool) (cflags & Nebula::CatCed)); conf->setValue("flag_show_sh2", (bool) (cflags & Nebula::Cat
conf->setValue("flag_show_pgc", (bool) (cflags & Nebula::CatPGC)); Sh2));
conf->setValue("flag_show_ugc", (bool) (cflags & Nebula::CatUGC)); conf->setValue("flag_show_rcw", (bool) (cflags & Nebula::Cat
conf->setValue("flag_show_arp", (bool) (cflags & Nebula::CatArp)); RCW));
conf->setValue("flag_show_vv", (bool) (cflags & Nebula::CatVV)); conf->setValue("flag_show_lbn", (bool) (cflags & Nebula::Cat
conf->setValue("flag_show_pk", (bool) (cflags & Nebula::CatPK)); LBN));
conf->setValue("flag_show_ldn", (bool) (cflags & Nebula::Cat
LDN));
conf->setValue("flag_show_cr", (bool) (cflags & Nebula::Cat
Cr));
conf->setValue("flag_show_mel", (bool) (cflags & Nebula::Cat
Mel));
conf->setValue("flag_show_ced", (bool) (cflags & Nebula::Cat
Ced));
conf->setValue("flag_show_pgc", (bool) (cflags & Nebula::Cat
PGC));
conf->setValue("flag_show_ugc", (bool) (cflags & Nebula::Cat
UGC));
conf->setValue("flag_show_arp", (bool) (cflags & Nebula::Cat
Arp));
conf->setValue("flag_show_vv", (bool) (cflags & Nebula::Cat
VV));
conf->setValue("flag_show_pk", (bool) (cflags & Nebula::Cat
PK));
conf->setValue("flag_show_png", (bool) (cflags & Nebula::Cat
PNG));
conf->setValue("flag_show_snrg", (bool) (cflags & Nebula::Cat
SNRG));
conf->setValue("flag_show_aco", (bool) (cflags & Nebula::Cat
ACO));
conf->endGroup(); conf->endGroup();
const Nebula::TypeGroup& tflags = nmgr->getTypeFilters(); const Nebula::TypeGroup& tflags = nmgr->getTypeFilters();
conf->beginGroup("dso_type_filters"); conf->beginGroup("dso_type_filters");
conf->setValue("flag_show_galaxies", (bool) (tflags & Ne bula::TypeGalaxies)); 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_active_galaxies", (bool) (tflags & Ne bula::TypeActiveGalaxies));
conf->setValue("flag_show_interacting_galaxies", (bool) (tflags & Ne bula::TypeInteractingGalaxies)); 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_clusters", (bool) (tflags & Ne bula::TypeStarClusters));
conf->setValue("flag_show_bright_nebulae", (bool) (tflags & Ne bula::TypeBrightNebulae)); 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_dark_nebulae", (bool) (tflags & Ne bula::TypeDarkNebulae));
conf->setValue("flag_show_planetary_nebulae", (bool) (tflags & Ne bula::TypePlanetaryNebulae)); 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_hydrogen_regions", (bool) (tflags & Ne bula::TypeHydrogenRegions));
conf->setValue("flag_show_supernova_remnants", (bool) (tflags & Ne bula::TypeSupernovaRemnants)); conf->setValue("flag_show_supernova_remnants", (bool) (tflags & Ne bula::TypeSupernovaRemnants));
conf->setValue("flag_show_galaxy_clusters", (bool) (tflags & Ne bula::TypeGalaxyClusters));
conf->setValue("flag_show_other", (bool) (tflags & Ne bula::TypeOther)); conf->setValue("flag_show_other", (bool) (tflags & Ne bula::TypeOther));
conf->endGroup(); conf->endGroup();
// view dialog / landscape tab settings // view dialog / landscape tab settings
conf->setValue("init_location/landscape_name", p // DO NOT SAVE CURRENT LANDSCAPE ID! There is a dedicated button in
ropMgr->getStelPropertyValue("LandscapeMgr.currentLandscapeID").toString()) the landscape tab of the View dialog.
; //conf->setValue("init_location/landscape_name",
propMgr->getStelPropertyValue("LandscapeMgr.currentLandscapeID").toString(
));
conf->setValue("landscape/flag_landscape_sets_location", p ropMgr->getStelPropertyValue("LandscapeMgr.flagLandscapeSetsLocation").toBo ol()); conf->setValue("landscape/flag_landscape_sets_location", p ropMgr->getStelPropertyValue("LandscapeMgr.flagLandscapeSetsLocation").toBo ol());
conf->setValue("landscape/flag_landscape", p ropMgr->getStelPropertyValue("LandscapeMgr.landscapeDisplayed").toBool()); conf->setValue("landscape/flag_landscape", p ropMgr->getStelPropertyValue("LandscapeMgr.landscapeDisplayed").toBool());
conf->setValue("landscape/flag_atmosphere", p ropMgr->getStelPropertyValue("LandscapeMgr.atmosphereDisplayed").toBool()); conf->setValue("landscape/flag_atmosphere", p ropMgr->getStelPropertyValue("LandscapeMgr.atmosphereDisplayed").toBool());
conf->setValue("landscape/flag_fog", p ropMgr->getStelPropertyValue("LandscapeMgr.fogDisplayed").toBool()); conf->setValue("landscape/flag_fog", p ropMgr->getStelPropertyValue("LandscapeMgr.fogDisplayed").toBool());
conf->setValue("landscape/flag_enable_illumination_layer", p ropMgr->getStelPropertyValue("LandscapeMgr.illuminationDisplayed").toBool() ); conf->setValue("landscape/flag_enable_illumination_layer", p ropMgr->getStelPropertyValue("LandscapeMgr.illuminationDisplayed").toBool() );
conf->setValue("landscape/flag_enable_labels", p ropMgr->getStelPropertyValue("LandscapeMgr.labelsDisplayed").toBool()); conf->setValue("landscape/flag_enable_labels", p ropMgr->getStelPropertyValue("LandscapeMgr.labelsDisplayed").toBool());
conf->setValue("landscape/flag_minimal_brightness", p ropMgr->getStelPropertyValue("LandscapeMgr.flagLandscapeUseMinimalBrightnes s").toBool()); conf->setValue("landscape/flag_minimal_brightness", p ropMgr->getStelPropertyValue("LandscapeMgr.flagLandscapeUseMinimalBrightnes s").toBool());
conf->setValue("landscape/flag_landscape_sets_minimal_brightness", p ropMgr->getStelPropertyValue("LandscapeMgr.flagLandscapeSetsMinimalBrightne ss").toBool()); conf->setValue("landscape/flag_landscape_sets_minimal_brightness", p ropMgr->getStelPropertyValue("LandscapeMgr.flagLandscapeSetsMinimalBrightne ss").toBool());
conf->setValue("landscape/minimal_brightness", p ropMgr->getStelPropertyValue("LandscapeMgr.defaultMinimalBrightness").toFlo at()); conf->setValue("landscape/minimal_brightness", p ropMgr->getStelPropertyValue("LandscapeMgr.defaultMinimalBrightness").toFlo at());
conf->setValue("stars/init_bortle_scale", p ropMgr->getStelPropertyValue("StelSkyDrawer.bortleScaleIndex").toInt()); conf->setValue("stars/init_bortle_scale", p ropMgr->getStelPropertyValue("StelSkyDrawer.bortleScaleIndex").toInt());
skipping to change at line 846 skipping to change at line 870
conf->setValue("flag_show_eclcoordj2000", conf->setValue("flag_show_eclcoordj2000",
(bool) (flags & StelObject::EclipticCoordJ200 0)); (bool) (flags & StelObject::EclipticCoordJ200 0));
conf->setValue("flag_show_constellation", conf->setValue("flag_show_constellation",
(bool) (flags & StelObject::IAUConstellation) ); (bool) (flags & StelObject::IAUConstellation) );
conf->setValue("flag_show_sidereal_time", conf->setValue("flag_show_sidereal_time",
(bool) (flags & StelObject::SiderealTime)); (bool) (flags & StelObject::SiderealTime));
conf->endGroup(); conf->endGroup();
} }
// toolbar auto-hide status // toolbar auto-hide status
StelApp& app = StelApp::getInstance();
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_toast_survey_button", gui->getFlagShow ToastSurveyButton()); conf->setValue("gui/flag_show_toast_survey_button", gui->getFlagShow ToastSurveyButton());
conf->setValue("gui/flag_show_bookmarks_button", gui->getFlagShowBoo kmarksButton()); conf->setValue("gui/flag_show_bookmarks_button", gui->getFlagShowBoo kmarksButton());
conf->setValue("gui/flag_show_icrs_grid_button", gui->getFlagShowICR SGridButton()); conf->setValue("gui/flag_show_icrs_grid_button", gui->getFlagShowICR SGridButton());
conf->setValue("gui/flag_show_galactic_grid_button", gui->getFlagSho wGalacticGridButton()); conf->setValue("gui/flag_show_galactic_grid_button", gui->getFlagSho wGalacticGridButton());
conf->setValue("gui/flag_show_ecliptic_grid_button", gui->getFlagSho wEclipticGridButton()); conf->setValue("gui/flag_show_ecliptic_grid_button", gui->getFlagSho wEclipticGridButton());
conf->setValue("gui/flag_show_boundaries_button", gui->getFlagShowCo nstellationBoundariesButton()); conf->setValue("gui/flag_show_boundaries_button", gui->getFlagShowCo nstellationBoundariesButton());
conf->setValue("gui/flag_show_decimal_degrees", StelApp::getInstance conf->setValue("gui/flag_show_decimal_degrees", app.getFlagShowDecim
().getFlagShowDecimalDegrees()); alDegrees());
conf->setValue("gui/flag_use_azimuth_from_south", StelApp::getInstan conf->setValue("gui/flag_use_azimuth_from_south", app.getFlagSouthAz
ce().getFlagSouthAzimuthUsage()); imuthUsage());
conf->setValue("gui/flag_use_formatting_output", app.getFlagUseForma
ttingOutput());
conf->setValue("gui/flag_use_ccs_designations", app.getFlagUseCCSDes
ignation());
conf->setValue("gui/flag_time_jd", gui->getButtonBar()->getFlagTimeJ d()); conf->setValue("gui/flag_time_jd", gui->getButtonBar()->getFlagTimeJ d());
conf->setValue("gui/flag_show_buttons_background", StelMainView::get Instance().getFlagUseButtonsBackground()); conf->setValue("gui/flag_show_buttons_background", StelMainView::get Instance().getFlagUseButtonsBackground());
conf->setValue("gui/flag_indication_mount_mode", mvmgr->getFlagIndic ationMountMode()); conf->setValue("gui/flag_indication_mount_mode", mvmgr->getFlagIndic ationMountMode());
// 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 881 skipping to change at line 908
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");
StelLocaleMgr & localeManager = StelApp::getInstance().getLocaleMgr( ); StelLocaleMgr & localeManager = StelApp::getInstance().getLocaleMgr( );
conf->setValue("localization/time_display_format", localeManager.get TimeFormatStr()); conf->setValue("localization/time_display_format", localeManager.get TimeFormatStr());
conf->setValue("localization/date_display_format", localeManager.get DateFormatStr()); conf->setValue("localization/date_display_format", localeManager.get DateFormatStr());
// 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", app.getViewportEffect());
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_x", core->getCurre ntStelProjectorParams().viewportCenterOffset[0]);
conf->setValue("projection/viewport_center_offset_y", core->getCurre ntStelProjectorParams().viewportCenterOffset[1]); conf->setValue("projection/viewport_center_offset_y", core->getCurre ntStelProjectorParams().viewportCenterOffset[1]);
conf->setValue("projection/flip_horz", core->getCurrentStelProjector Params().flipHorz); conf->setValue("projection/flip_horz", core->getCurrentStelProjector Params().flipHorz);
conf->setValue("projection/flip_vert", core->getCurrentStelProjector Params().flipVert); conf->setValue("projection/flip_vert", core->getCurrentStelProjector Params().flipVert);
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());
skipping to change at line 991 skipping to change at line 1018
{ {
QString html = "<html><head></head><body>"; QString html = "<html><head></head><body>";
html += "<h2>" + q_(desc.info.displayedName) + "</h2 >"; html += "<h2>" + q_(desc.info.displayedName) + "</h2 >";
QString d = desc.info.description; QString d = desc.info.description;
d.replace("\n", "<br />"); d.replace("\n", "<br />");
html += "<p>" + q_(d) + "</p>"; html += "<p>" + q_(d) + "</p>";
html += "<p><strong>" + q_("Authors") + "</strong>: " + desc.info.authors; html += "<p><strong>" + q_("Authors") + "</strong>: " + desc.info.authors;
html += "<br /><strong>" + q_("Contact") + "</strong >: " + desc.info.contact; html += "<br /><strong>" + q_("Contact") + "</strong >: " + desc.info.contact;
if (!desc.info.version.isEmpty()) if (!desc.info.version.isEmpty())
html += "<br /><strong>" + q_("Version") + " </strong>: " + desc.info.version; html += "<br /><strong>" + q_("Version") + " </strong>: " + desc.info.version;
html += "<br /><strong>" + q_("License") + "</strong
>: ";
if (!desc.info.license.isEmpty())
html += desc.info.license;
else
html += qc_("unknown", "license");
html += "</p></body></html>"; html += "</p></body></html>";
ui->pluginsInfoBrowser->document()->setDefaultStyleS heet(QString(gui->getStelStyle().htmlStyleSheet)); ui->pluginsInfoBrowser->document()->setDefaultStyleS heet(QString(gui->getStelStyle().htmlStyleSheet));
ui->pluginsInfoBrowser->setHtml(html); ui->pluginsInfoBrowser->setHtml(html);
ui->pluginLoadAtStartupCheckBox->setChecked(desc.loa dAtStartup); ui->pluginLoadAtStartupCheckBox->setChecked(desc.loa dAtStartup);
StelModule* pmod = StelApp::getInstance().getModuleM gr().getModule(desc.info.id, true); StelModule* pmod = StelApp::getInstance().getModuleM gr().getModule(desc.info.id, true);
if (pmod != Q_NULLPTR) if (pmod != Q_NULLPTR)
ui->pluginConfigureButton->setEnabled(pmod-> configureGui(false)); ui->pluginConfigureButton->setEnabled(pmod-> configureGui(false));
else else
ui->pluginConfigureButton->setEnabled(false) ; ui->pluginConfigureButton->setEnabled(false) ;
return; return;
skipping to change at line 1272 skipping to change at line 1304
ui->getStarsButton->setVisible(false); ui->getStarsButton->setVisible(false);
ui->getStarsButton->setEnabled(true); ui->getStarsButton->setEnabled(true);
} }
void ConfigurationDialog::downloadFinished() void ConfigurationDialog::downloadFinished()
{ {
Q_ASSERT(currentDownloadFile); Q_ASSERT(currentDownloadFile);
Q_ASSERT(starCatalogDownloadReply); Q_ASSERT(starCatalogDownloadReply);
Q_ASSERT(progressBar); Q_ASSERT(progressBar);
if (starCatalogDownloadReply->error()!=QNetworkReply::NoError) if (starCatalogDownloadReply->error()!=QNetworkReply::NoError || sta rCatalogDownloadReply->bytesAvailable()==0)
{ {
starCatalogDownloadReply->deleteLater(); starCatalogDownloadReply->deleteLater();
starCatalogDownloadReply = Q_NULLPTR; starCatalogDownloadReply = Q_NULLPTR;
currentDownloadFile->close(); currentDownloadFile->close();
currentDownloadFile->deleteLater(); currentDownloadFile->deleteLater();
currentDownloadFile = Q_NULLPTR; currentDownloadFile = Q_NULLPTR;
StelApp::getInstance().removeProgressBar(progressBar); StelApp::getInstance().removeProgressBar(progressBar);
progressBar=Q_NULLPTR; progressBar=Q_NULLPTR;
return; return;
} }
 End of changes. 14 change blocks. 
32 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/