ViewDialog.cpp   ViewDialog.cpp 
skipping to change at line 63 skipping to change at line 63
#include <QDebug> #include <QDebug>
#include <QFrame> #include <QFrame>
#include <QFile> #include <QFile>
#include <QFileInfo> #include <QFileInfo>
#include <QSettings> #include <QSettings>
#include <QTimer> #include <QTimer>
#include <QDialog> #include <QDialog>
#include <QStringList> #include <QStringList>
#include <QColorDialog> #include <QColorDialog>
ViewDialog::ViewDialog(QObject* parent) : StelDialog(parent) ViewDialog::ViewDialog(QObject* parent) : StelDialog("View", parent)
, addRemoveLandscapesDialog(NULL)
, atmosphereDialog(NULL)
, greatRedSpotDialog(NULL)
, configureDSOColorsDialog(NULL)
, configureOrbitColorsDialog(NULL)
{ {
dialogName = "View";
ui = new Ui_viewDialogForm; ui = new Ui_viewDialogForm;
addRemoveLandscapesDialog = NULL;
atmosphereDialog=NULL;
greatRedSpotDialog=NULL;
configureDSOColorsDialog=NULL;
configureOrbitColorsDialog=NULL;
} }
ViewDialog::~ViewDialog() ViewDialog::~ViewDialog()
{ {
delete ui; delete ui;
ui=NULL; ui=NULL;
delete addRemoveLandscapesDialog; delete addRemoveLandscapesDialog;
addRemoveLandscapesDialog = NULL; addRemoveLandscapesDialog = NULL;
delete atmosphereDialog; delete atmosphereDialog;
atmosphereDialog = NULL; atmosphereDialog = NULL;
skipping to change at line 130 skipping to change at line 129
} }
void ViewDialog::createDialogContent() void ViewDialog::createDialogContent()
{ {
ui->setupUi(dialog); ui->setupUi(dialog);
connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SL OT(retranslate())); connect(&StelApp::getInstance(), SIGNAL(languageChanged()), this, SL OT(retranslate()));
// Set the Sky tab activated by default // Set the Sky tab activated by default
ui->stackedWidget->setCurrentIndex(0); ui->stackedWidget->setCurrentIndex(0);
ui->stackListWidget->setCurrentRow(0); ui->stackListWidget->setCurrentRow(0);
connect(ui->stackListWidget, SIGNAL(currentItemChanged(QListWidgetIt em *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWi dgetItem*)));
//ui->viewTabWidget->removeTab(4); //ui->viewTabWidget->removeTab(4);
#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->projectionListWidget << ui->culturesListWidget << u i->skyCultureTextBrowser << ui->landscapesListWidget; addscroll << ui->projectionListWidget << ui->culturesListWidget << u i->skyCultureTextBrowser << ui->landscapesListWidget;
StelDialog::installKineticScrolling(addscroll); StelDialog::installKineticScrolling(addscroll);
#endif #endif
connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())) ; connect(ui->closeStelWindow, SIGNAL(clicked()), this, SLOT(close())) ;
connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMove dTo(QPoint))); connect(ui->TitleBar, SIGNAL(movedTo(QPoint)), this, SLOT(handleMove dTo(QPoint)));
populateLists(); populateLists();
// Note: GZ had a day of "fun" on 20160411-12 sorting out the merge // TODOs after properties merge:
with the restructured method from trunk. // New method: populateLightPollution may be useful. Make sure it is
// I had to check whether all entries from re-arranged trunk are pre .
sent in the property-enabled versions here. // Jupiter's GRS should become property, and recheck the other "from
// I hope I have everything working again. trunk" entries.
// TODO: New method: populateLightPollution may be useful. Make sure
it is.
// Jupiter's GRS must become property, and recheck the other "from t
runk" entries.
connectDoubleProperty(ui->viewportOffsetSpinBox, "StelMovementMgr.vi
ewportVerticalOffsetTarget");
connect(ui->culturesListWidget, SIGNAL(currentTextChanged(const QStr ing&)),&StelApp::getInstance().getSkyCultureMgr(),SLOT(setCurrentSkyCulture NameI18(QString))); connect(ui->culturesListWidget, SIGNAL(currentTextChanged(const QStr ing&)),&StelApp::getInstance().getSkyCultureMgr(),SLOT(setCurrentSkyCulture NameI18(QString)));
connect(&StelApp::getInstance().getSkyCultureMgr(), SIGNAL(currentSk yCultureChanged(QString)), this, SLOT(skyCultureChanged())); connect(&StelApp::getInstance().getSkyCultureMgr(), SIGNAL(currentSk yCultureChanged(QString)), this, SLOT(skyCultureChanged()));
connect(ui->projectionListWidget, SIGNAL(currentTextChanged(const QS
tring&)), this, SLOT(changeProjection(const QString&)));
connect(StelApp::getInstance().getCore(), SIGNAL(currentProjectionTy
peChanged(StelCore::ProjectionType)),this,SLOT(projectionChanged()));
// Connect and initialize checkboxes and other widgets // Connect and initialize checkboxes and other widgets
NebulaMgr* nmgr = GETSTELMODULE(NebulaMgr);
// DSO
updateSelectedCatalogsCheckBoxes();
connect(nmgr, SIGNAL(catalogFiltersChanged(Nebula::CatalogGroup)), t
his, SLOT(updateSelectedCatalogsCheckBoxes()));
connect(ui->buttonGroupDisplayedDSOCatalogs, SIGNAL(buttonClicked(in
t)), this, SLOT(setSelectedCatalogsFromCheckBoxes()));
updateSelectedTypesCheckBoxes();
connect(nmgr, SIGNAL(typeFiltersChanged(Nebula::TypeGroup)), this, S
LOT(updateSelectedTypesCheckBoxes()));
connect(ui->buttonGroupDisplayedDSOTypes, SIGNAL(buttonClicked(int))
, this, SLOT(setSelectedTypesFromCheckBoxes()));
connectGroupBox(ui->groupBoxDSOTypeFilters,"actionSet_Nebula_TypeFil
terUsage");
connectBoolProperty(ui->checkBoxProportionalHints, "NebulaMgr.hintsP
roportional");
connectBoolProperty(ui->checkBoxSurfaceBrightnessUsage, "NebulaMgr.f
lagSurfaceBrightnessUsage");
connectBoolProperty(ui->checkBoxDesignationsOnlyUsage, "NebulaMgr.fl
agDesignationLabels");
connect(ui->pushButtonConfigureDSOColors, SIGNAL(clicked()), this, S
LOT(showConfigureDSOColorsDialog()));
// From Trunk, but seems OK here. It was close to end before.
connect(ui->stackListWidget, SIGNAL(currentItemChanged(QListWidgetIt
em *, QListWidgetItem *)), this, SLOT(changePage(QListWidgetItem *, QListWi
dgetItem*)));
// Stars section // Stars section
connectGroupBox(ui->starGroupBox, "actionShow_Stars"); connectGroupBox(ui->starGroupBox, "actionShow_Stars");
connectBoolProperty(ui->starTwinkleCheckBox, "StelSkyDrawer.flagTwin kle");
connectDoubleProperty(ui->starScaleRadiusDoubleSpinBox,"StelSkyDrawe r.absoluteStarScale"); connectDoubleProperty(ui->starScaleRadiusDoubleSpinBox,"StelSkyDrawe r.absoluteStarScale");
connectDoubleProperty(ui->starRelativeScaleDoubleSpinBox, "StelSkyDr awer.relativeStarScale"); connectDoubleProperty(ui->starRelativeScaleDoubleSpinBox, "StelSkyDr awer.relativeStarScale");
connectDoubleProperty(ui->milkyWayBrightnessDoubleSpinBox, "MilkyWay connectBoolProperty(ui->starTwinkleCheckBox, "StelSkyDrawer.flagTwin
.intensity"); kle");
connectDoubleProperty(ui->starTwinkleAmountDoubleSpinBox, "StelSkyDr
awer.twinkleAmount");
connectBoolProperty(ui->starLimitMagnitudeCheckBox,"StelSkyDrawer.fl
agStarMagnitudeLimit");
connectDoubleProperty(ui->starLimitMagnitudeDoubleSpinBox, "StelSkyD
rawer.customStarMagLimit");
connectCheckBox(ui->starLabelCheckBox, "actionShow_Stars_Labels");
connectDoubleProperty(ui->starsLabelsHorizontalSlider,"StarMgr.label
sAmount",0.0,10.0);
// Sky section
connectBoolProperty(ui->milkyWayCheckBox, "MilkyWay.flagMilkyWayDisp layed"); connectBoolProperty(ui->milkyWayCheckBox, "MilkyWay.flagMilkyWayDisp layed");
connectDoubleProperty(ui->milkyWayBrightnessDoubleSpinBox, "MilkyWay .intensity");
connectBoolProperty(ui->zodiacalLightCheckBox, "ZodiacalLight.flagZo diacalLightDisplayed"); connectBoolProperty(ui->zodiacalLightCheckBox, "ZodiacalLight.flagZo diacalLightDisplayed");
connectDoubleProperty(ui->zodiacalLightBrightnessDoubleSpinBox, "Zod iacalLight.intensity"); connectDoubleProperty(ui->zodiacalLightBrightnessDoubleSpinBox, "Zod iacalLight.intensity");
connectDoubleProperty(ui->starTwinkleAmountDoubleSpinBox, "StelSkyDr awer.twinkleAmount");
connectBoolProperty(ui->adaptationCheckbox, "StelSkyDrawer.flagLumin anceAdaptation"); connectBoolProperty(ui->adaptationCheckbox, "StelSkyDrawer.flagLumin anceAdaptation");
// Limit Magnitudes // Light pollution
// Stars LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr);
connectBoolProperty(ui->starLimitMagnitudeCheckBox,"StelSkyDrawer.fl Q_ASSERT(lmgr);
agStarMagnitudeLimit"); StelSkyDrawer* drawer = StelApp::getInstance().getCore()->getSkyDraw
connectDoubleProperty(ui->starLimitMagnitudeDoubleSpinBox, "StelSkyD er();
rawer.customStarMagLimit"); Q_ASSERT(drawer);
// Planets // TODO: In trunk, populateLightPollution has been added, while soci
connectBoolProperty(ui->planetLimitMagnitudeCheckBox,"StelSkyDrawer. s15 has setLightPollutionSpinBoxStatus.
flagPlanetMagnitudeLimit"); // TODO: Decide which is better?
connectDoubleProperty(ui->planetLimitMagnitudeDoubleSpinBox,"StelSky // The trunk version also sets value of the spinbox, this seems more
Drawer.customPlanetMagLimit"); complete.
// DSO //setLightPollutionSpinBoxStatus();
connectBoolProperty(ui->nebulaLimitMagnitudeCheckBox,"StelSkyDrawer. populateLightPollution();
flagNebulaMagnitudeLimit"); connectBoolProperty(ui->useLightPollutionFromLocationDataCheckBox, "
connectDoubleProperty(ui->nebulaLimitMagnitudeDoubleSpinBox,"StelSky LandscapeMgr.flagUseLightPollutionFromDatabase");
Drawer.customNebulaMagLimit");
// Planets section //connect(lmgr, SIGNAL(lightPollutionUsageChanged(bool)), this, SLOT
//connectCheckBox(ui->showPlanetCheckBox, "actionShow_Planets"); // (setLightPollutionSpinBoxStatus()));
ui element MAY HAVE BEEN RENAMED IN TRUNK? connect(lmgr, SIGNAL(flagUseLightPollutionFromDatabaseChanged(bool))
connectGroupBox(ui->planetsGroupBox, "actionShow_Planets"); // THIS , this, SLOT(populateLightPollution()));
ONE FROM TRUNK
connectCheckBox(ui->planetMarkerCheckBox, "actionShow_Planets_Hints"
);
connectBoolProperty(ui->planetScaleMoonCheckBox, "SolarSystem.flagMo connectIntProperty(ui->lightPollutionSpinBox, "StelSkyDrawer.bortleS
onScale"); caleIndex");
connectDoubleProperty(ui->moonScaleFactor,"SolarSystem.moonScale"); connect(drawer, SIGNAL(bortleScaleIndexChanged(int)), this, SLOT(set
BortleScaleToolTip(int)));
// atmosphere details
connect(ui->pushButtonAtmosphereDetails, SIGNAL(clicked()), this, SL
OT(showAtmosphereDialog()));
// Planets section
connectGroupBox(ui->planetsGroupBox, "actionShow_Planets");
connectCheckBox(ui->planetMarkerCheckBox, "actionShow_Planets_Hints"
);
connectCheckBox(ui->planetOrbitCheckBox, "actionShow_Planets_Orbits" ); connectCheckBox(ui->planetOrbitCheckBox, "actionShow_Planets_Orbits" );
connectBoolProperty(ui->planetIsolatedOrbitCheckBox, "SolarSystem.fl agIsolatedOrbits"); connectBoolProperty(ui->planetIsolatedOrbitCheckBox, "SolarSystem.fl agIsolatedOrbits");
connectBoolProperty(ui->planetIsolatedTrailsCheckBox, "SolarSystem.f lagIsolatedTrails"); connectBoolProperty(ui->planetIsolatedTrailsCheckBox, "SolarSystem.f lagIsolatedTrails");
connectBoolProperty(ui->planetLightSpeedCheckBox, "SolarSystem.flagL ightTravelTime"); connectBoolProperty(ui->planetLightSpeedCheckBox, "SolarSystem.flagL ightTravelTime");
connectBoolProperty(ui->planetLimitMagnitudeCheckBox,"StelSkyDrawer.
flagPlanetMagnitudeLimit");
connectDoubleProperty(ui->planetLimitMagnitudeDoubleSpinBox,"StelSky
Drawer.customPlanetMagLimit");
connectBoolProperty(ui->planetScaleMoonCheckBox, "SolarSystem.flagMo
onScale");
connectDoubleProperty(ui->moonScaleFactor,"SolarSystem.moonScale");
connectCheckBox(ui->planetLabelCheckBox, "actionShow_Planets_Labels"
);
connectDoubleProperty(ui->planetsLabelsHorizontalSlider, "SolarSyste
m.labelsAmount",0.0,10.0);
connect(ui->pushButtonOrbitColors, SIGNAL(clicked(bool)), this, SLOT
(showConfigureOrbitColorsDialog()));
// NEW SECTION FROM TRUNK: GreatRedSpot (Jupiter) // GreatRedSpot (Jupiter)
// TODO: put under Properties system! // TODO: put under Properties system!
SolarSystem* ssmgr = GETSTELMODULE(SolarSystem); SolarSystem* ssmgr = GETSTELMODULE(SolarSystem);
Q_ASSERT(ssmgr); Q_ASSERT(ssmgr);
bool grsFlag = ssmgr->getFlagCustomGrsSettings(); bool grsFlag = ssmgr->getFlagCustomGrsSettings();
ui->customGrsSettingsCheckBox->setChecked(grsFlag); ui->customGrsSettingsCheckBox->setChecked(grsFlag);
connect(ui->customGrsSettingsCheckBox, SIGNAL(toggled(bool)), this, SLOT(setFlagCustomGrsSettings(bool))); connect(ui->customGrsSettingsCheckBox, SIGNAL(toggled(bool)), this, SLOT(setFlagCustomGrsSettings(bool)));
ui->pushButtonGrsDetails->setEnabled(grsFlag); ui->pushButtonGrsDetails->setEnabled(grsFlag);
connect(ui->pushButtonGrsDetails, SIGNAL(clicked()), this, SLOT(show GreatRedSpotDialog())); connect(ui->pushButtonGrsDetails, SIGNAL(clicked()), this, SLOT(show GreatRedSpotDialog()));
connect(ui->pushButtonOrbitColors, SIGNAL(clicked(bool)), this, SLOT (showConfigureOrbitColorsDialog()));
// Shooting stars section // Shooting stars section
SporadicMeteorMgr* mmgr = GETSTELMODULE(SporadicMeteorMgr); SporadicMeteorMgr* mmgr = GETSTELMODULE(SporadicMeteorMgr);
Q_ASSERT(mmgr); Q_ASSERT(mmgr);
connectIntProperty(ui->zhrSpinBox, "SporadicMeteorMgr.zhr");
int zhr = mmgr->getZHR(); connectIntProperty(ui->zhrSlider, "SporadicMeteorMgr.zhr", ui->zhrSl
ui->zhrSlider->setValue(zhr); ider->minimum(), ui->zhrSlider->maximum());
ui->zhrSpinBox->setValue(zhr); updateZhrDescription(mmgr->getZHR());
updateZhrDescription(zhr);
//connect to the data, instead of the GUI
connect(mmgr, SIGNAL(zhrChanged(int)), this, SLOT(updateZhrDescripti on(int))); connect(mmgr, SIGNAL(zhrChanged(int)), this, SLOT(updateZhrDescripti on(int)));
connect(mmgr, SIGNAL(zhrChanged(int)), ui->zhrSlider, SLOT(setValue(
int)));
connect(mmgr, SIGNAL(zhrChanged(int)), ui->zhrSpinBox, SLOT(setValue
(int)));
connect(ui->zhrSlider, SIGNAL(valueChanged(int)), mmgr, SLOT(setZHR(
int)));
connect(ui->zhrSpinBox, SIGNAL(valueChanged(int)), mmgr, SLOT(setZHR
(int)));
// Labels section // DSO tab contents
connectCheckBox(ui->starLabelCheckBox, "actionShow_Stars_Labels"); NebulaMgr* nmgr = GETSTELMODULE(NebulaMgr);
connectGroupBox(ui->groupBoxLabelsAndMarkers, "actionShow_Nebulas"); updateSelectedCatalogsCheckBoxes();
connectCheckBox(ui->planetLabelCheckBox, "actionShow_Planets_Labels" connect(nmgr, SIGNAL(catalogFiltersChanged(Nebula::CatalogGroup)), t
); his, SLOT(updateSelectedCatalogsCheckBoxes()));
connect(ui->buttonGroupDisplayedDSOCatalogs, SIGNAL(buttonClicked(in
t)), this, SLOT(setSelectedCatalogsFromCheckBoxes()));
updateSelectedTypesCheckBoxes();
connect(nmgr, SIGNAL(typeFiltersChanged(Nebula::TypeGroup)), this, S
LOT(updateSelectedTypesCheckBoxes()));
connect(ui->buttonGroupDisplayedDSOTypes, SIGNAL(buttonClicked(int))
, this, SLOT(setSelectedTypesFromCheckBoxes()));
connectGroupBox(ui->groupBoxDSOTypeFilters,"actionSet_Nebula_TypeFil
terUsage");
connectDoubleProperty(ui->starsLabelsHorizontalSlider,"StarMgr.label // DSO Labels section
sAmount",0.0,10.0); connectGroupBox(ui->groupBoxDSOLabelsAndMarkers, "actionShow_Nebulas
connectDoubleProperty(ui->planetsLabelsHorizontalSlider, "SolarSyste ");
m.labelsAmount",0.0,10.0);
connectDoubleProperty(ui->nebulasLabelsHorizontalSlider, "NebulaMgr. labelsAmount",0.0,10.0); connectDoubleProperty(ui->nebulasLabelsHorizontalSlider, "NebulaMgr. labelsAmount",0.0,10.0);
connectDoubleProperty(ui->nebulasHintsHorizontalSlider, "NebulaMgr.h intsAmount",0.0,10.0); connectDoubleProperty(ui->nebulasHintsHorizontalSlider, "NebulaMgr.h intsAmount",0.0,10.0);
connectBoolProperty(ui->checkBoxDesignationsOnlyUsage, "NebulaMgr.fl
agDesignationLabels");
connectBoolProperty(ui->checkBoxProportionalHints, "NebulaMgr.hintsP
roportional");
connectBoolProperty(ui->checkBoxSurfaceBrightnessUsage, "NebulaMgr.f
lagSurfaceBrightnessUsage");
connectBoolProperty(ui->nebulaLimitMagnitudeCheckBox,"StelSkyDrawer.
flagNebulaMagnitudeLimit");
connectDoubleProperty(ui->nebulaLimitMagnitudeDoubleSpinBox,"StelSky
Drawer.customNebulaMagLimit");
connect(ui->pushButtonConfigureDSOColors, SIGNAL(clicked()), this, S
LOT(showConfigureDSOColorsDialog()));
// Landscape section // Landscape section
LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr);
Q_ASSERT(lmgr);
connectCheckBox(ui->showGroundCheckBox, "actionShow_Ground"); connectCheckBox(ui->showGroundCheckBox, "actionShow_Ground");
connectCheckBox(ui->showFogCheckBox, "actionShow_Fog"); connectCheckBox(ui->showFogCheckBox, "actionShow_Fog");
connectGroupBox(ui->atmosphereGroupBox, "actionShow_Atmosphere"); connectGroupBox(ui->atmosphereGroupBox, "actionShow_Atmosphere");
connectCheckBox(ui->landscapeIlluminationCheckBox, "actionShow_Lands capeIllumination"); connectCheckBox(ui->landscapeIlluminationCheckBox, "actionShow_Lands capeIllumination");
connectCheckBox(ui->landscapeLabelsCheckBox, "actionShow_LandscapeLa bels"); connectCheckBox(ui->landscapeLabelsCheckBox, "actionShow_LandscapeLa bels");
connectBoolProperty(ui->landscapePositionCheckBox, "LandscapeMgr.fla gLandscapeSetsLocation"); connectBoolProperty(ui->landscapePositionCheckBox, "LandscapeMgr.fla gLandscapeSetsLocation");
connectBoolProperty(ui->landscapeBrightnessCheckBox,"LandscapeMgr.fl agLandscapeUseMinimalBrightness"); connectBoolProperty(ui->landscapeBrightnessCheckBox,"LandscapeMgr.fl agLandscapeUseMinimalBrightness");
connect(lmgr,SIGNAL(flagLandscapeUseMinimalBrightnessChanged(bool)), ui->localLandscapeBrightnessCheckBox,SLOT(setEnabled(bool))); connect(lmgr,SIGNAL(flagLandscapeUseMinimalBrightnessChanged(bool)), ui->localLandscapeBrightnessCheckBox,SLOT(setEnabled(bool)));
skipping to change at line 280 skipping to change at line 275
connect(ui->landscapesListWidget, SIGNAL(currentItemChanged(QListWid getItem*,QListWidgetItem*)), this, SLOT(changeLandscape(QListWidgetItem*))) ; connect(ui->landscapesListWidget, SIGNAL(currentItemChanged(QListWid getItem*,QListWidgetItem*)), this, SLOT(changeLandscape(QListWidgetItem*))) ;
connect(lmgr, SIGNAL(currentLandscapeChanged(QString,QString)), this , SLOT(landscapeChanged(QString,QString))); connect(lmgr, SIGNAL(currentLandscapeChanged(QString,QString)), this , SLOT(landscapeChanged(QString,QString)));
connect(ui->useAsDefaultLandscapeCheckBox, SIGNAL(clicked()), this, SLOT(setCurrentLandscapeAsDefault())); connect(ui->useAsDefaultLandscapeCheckBox, SIGNAL(clicked()), this, SLOT(setCurrentLandscapeAsDefault()));
connect(lmgr,SIGNAL(defaultLandscapeChanged(QString)),this,SLOT(upda teDefaultLandscape())); connect(lmgr,SIGNAL(defaultLandscapeChanged(QString)),this,SLOT(upda teDefaultLandscape()));
updateDefaultLandscape(); updateDefaultLandscape();
connect(lmgr, SIGNAL(landscapesChanged()), this, SLOT(populateLists( ))); connect(lmgr, SIGNAL(landscapesChanged()), this, SLOT(populateLists( )));
connect(ui->pushButtonAddRemoveLandscapes, SIGNAL(clicked()), this, SLOT(showAddRemoveLandscapesDialog())); connect(ui->pushButtonAddRemoveLandscapes, SIGNAL(clicked()), this, SLOT(showAddRemoveLandscapesDialog()));
// Light pollution
StelSkyDrawer* drawer = StelApp::getInstance().getCore()->getSkyDraw
er();
// TODO: In trunk, populateLightPollution has been added, while soci
s has setLightPollutionSpinBoxStatus.
// The trunk version also sets value of the spinbox, this seems more
complete.
//setLightPollutionSpinBoxStatus();
populateLightPollution();
ui->useLocationDataCheckBox->setChecked(lmgr->getFlagUseLightPolluti
onFromDatabase());
connect(ui->useLocationDataCheckBox, SIGNAL(toggled(bool)), lmgr, SL
OT(setFlagUseLightPollutionFromDatabase(bool)));
connect(lmgr, SIGNAL(lightPollutionUsageChanged(bool)), ui->useLocat
ionDataCheckBox, SLOT(setChecked(bool)));
// TODO: Decide which is better?
//connect(lmgr, SIGNAL(lightPollutionUsageChanged(bool)), this, SLOT
(setLightPollutionSpinBoxStatus()));
connect(lmgr, SIGNAL(lightPollutionUsageChanged(bool)), this, SLOT(p
opulateLightPollution()));
ui->lightPollutionSpinBox->setValue(drawer->getBortleScaleIndex());
connect(ui->lightPollutionSpinBox, SIGNAL(valueChanged(int)), drawer
, SLOT(setBortleScaleIndex(int)));
connect(drawer, SIGNAL(bortleScaleIndexChanged(int)), ui->lightPollu
tionSpinBox, SLOT(setValue(int)));
connect(drawer, SIGNAL(bortleScaleIndexChanged(int)), this, SLOT(set
BortleScaleToolTip(int)));
// Note: This has vanished in the merge on 20160411. -- Ah, moved to
ConfigurationDialog.
//connectBoolProperty(ui->autoChangeLandscapesCheckBox,"LandscapeMgr
.flagLandscapeAutoSelection");
// atmosphere details
connect(ui->pushButtonAtmosphereDetails, SIGNAL(clicked()), this, SL
OT(showAtmosphereDialog()));
// Grid and lines // Grid and lines
connectCheckBox(ui->showEquatorLineCheckBox, "actionShow_ Equator_Line"); connectCheckBox(ui->showEquatorLineCheckBox, "actionShow_ Equator_Line");
connectCheckBox(ui->showEquatorJ2000LineCheckBox, "actionShow_ Equator_J2000_Line"); connectCheckBox(ui->showEquatorJ2000LineCheckBox, "actionShow_ Equator_J2000_Line");
connectCheckBox(ui->showEclipticLineJ2000CheckBox, "actionShow_ Ecliptic_J2000_Line"); connectCheckBox(ui->showEclipticLineJ2000CheckBox, "actionShow_ Ecliptic_J2000_Line");
connectCheckBox(ui->showEclipticLineOfDateCheckBox, "actionShow_ Ecliptic_Line"); connectCheckBox(ui->showEclipticLineOfDateCheckBox, "actionShow_ Ecliptic_Line");
connectCheckBox(ui->showMeridianLineCheckBox, "actionShow_ Meridian_Line"); connectCheckBox(ui->showMeridianLineCheckBox, "actionShow_ Meridian_Line");
connectCheckBox(ui->showLongitudeLineCheckBox, "actionShow_ Longitude_Line"); connectCheckBox(ui->showLongitudeLineCheckBox, "actionShow_ Longitude_Line");
connectCheckBox(ui->showHorizonLineCheckBox, "actionShow_ Horizon_Line"); connectCheckBox(ui->showHorizonLineCheckBox, "actionShow_ Horizon_Line");
connectCheckBox(ui->showEquatorialGridCheckBox, "actionShow_ Equatorial_Grid"); connectCheckBox(ui->showEquatorialGridCheckBox, "actionShow_ Equatorial_Grid");
connectCheckBox(ui->showGalacticGridCheckBox, "actionShow_ Galactic_Grid"); connectCheckBox(ui->showGalacticGridCheckBox, "actionShow_ Galactic_Grid");
skipping to change at line 335 skipping to change at line 306
connectCheckBox(ui->showCircumpolarCirclesCheckBox, "actionShow_ Circumpolar_Circles"); connectCheckBox(ui->showCircumpolarCirclesCheckBox, "actionShow_ Circumpolar_Circles");
connectCheckBox(ui->showCelestialJ2000PolesCheckBox, "actionShow_ Celestial_J2000_Poles"); connectCheckBox(ui->showCelestialJ2000PolesCheckBox, "actionShow_ Celestial_J2000_Poles");
connectCheckBox(ui->showCelestialPolesCheckBox, "actionShow_ Celestial_Poles"); connectCheckBox(ui->showCelestialPolesCheckBox, "actionShow_ Celestial_Poles");
connectCheckBox(ui->showZenithNadirCheckBox, "actionShow_ Zenith_Nadir"); connectCheckBox(ui->showZenithNadirCheckBox, "actionShow_ Zenith_Nadir");
connectCheckBox(ui->showEclipticJ2000PolesCheckBox, "actionShow_ Ecliptic_J2000_Poles"); connectCheckBox(ui->showEclipticJ2000PolesCheckBox, "actionShow_ Ecliptic_J2000_Poles");
connectCheckBox(ui->showEclipticPolesCheckBox, "actionShow_ Ecliptic_Poles"); connectCheckBox(ui->showEclipticPolesCheckBox, "actionShow_ Ecliptic_Poles");
connectCheckBox(ui->showGalacticPolesCheckBox, "actionShow_ Galactic_Poles"); connectCheckBox(ui->showGalacticPolesCheckBox, "actionShow_ Galactic_Poles");
connectCheckBox(ui->showSupergalacticPolesCheckBox, "actionShow_ Supergalactic_Poles"); connectCheckBox(ui->showSupergalacticPolesCheckBox, "actionShow_ Supergalactic_Poles");
connectCheckBox(ui->showEquinoxJ2000PointsCheckBox, "actionShow_ Equinox_J2000_Points"); connectCheckBox(ui->showEquinoxJ2000PointsCheckBox, "actionShow_ Equinox_J2000_Points");
connectCheckBox(ui->showEquinoxPointsCheckBox, "actionShow_ Equinox_Points"); connectCheckBox(ui->showEquinoxPointsCheckBox, "actionShow_ Equinox_Points");
connectCheckBox(ui->showSolsticeJ2000PointsCheckBox, "actionShow_
Solstice_J2000_Points");
connectCheckBox(ui->showSolsticePointsCheckBox, "actionShow_
Solstice_Points");
colorButton(ui->colorEclipticGridJ2000, "GridLinesMgr.eclipt icJ2000GridColor"); colorButton(ui->colorEclipticGridJ2000, "GridLinesMgr.eclipt icJ2000GridColor");
colorButton(ui->colorEclipticGridOfDate, "GridLinesMgr.eclipt icGridColor"); colorButton(ui->colorEclipticGridOfDate, "GridLinesMgr.eclipt icGridColor");
colorButton(ui->colorEquatorialJ2000Grid, "GridLinesMgr.equato rJ2000GridColor"); colorButton(ui->colorEquatorialJ2000Grid, "GridLinesMgr.equato rJ2000GridColor");
colorButton(ui->colorEquatorialGrid, "GridLinesMgr.equato rGridColor"); colorButton(ui->colorEquatorialGrid, "GridLinesMgr.equato rGridColor");
colorButton(ui->colorGalacticGrid, "GridLinesMgr.galact icGridColor"); colorButton(ui->colorGalacticGrid, "GridLinesMgr.galact icGridColor");
colorButton(ui->colorSupergalacticGrid, "GridLinesMgr.superg alacticGridColor"); colorButton(ui->colorSupergalacticGrid, "GridLinesMgr.superg alacticGridColor");
colorButton(ui->colorAzimuthalGrid, "GridLinesMgr.azimut halGridColor"); colorButton(ui->colorAzimuthalGrid, "GridLinesMgr.azimut halGridColor");
colorButton(ui->colorEclipticLineJ2000, "GridLinesMgr.eclipt icJ2000LineColor"); colorButton(ui->colorEclipticLineJ2000, "GridLinesMgr.eclipt icJ2000LineColor");
colorButton(ui->colorEclipticLineOfDate, "GridLinesMgr.eclipt icLineColor"); colorButton(ui->colorEclipticLineOfDate, "GridLinesMgr.eclipt icLineColor");
skipping to change at line 365 skipping to change at line 338
colorButton(ui->colorMeridianLine, "GridLinesMgr.meridi anLineColor"); colorButton(ui->colorMeridianLine, "GridLinesMgr.meridi anLineColor");
colorButton(ui->colorCelestialJ2000Poles, "GridLinesMgr.celest ialJ2000PolesColor"); colorButton(ui->colorCelestialJ2000Poles, "GridLinesMgr.celest ialJ2000PolesColor");
colorButton(ui->colorCelestialPoles, "GridLinesMgr.celest ialPolesColor"); colorButton(ui->colorCelestialPoles, "GridLinesMgr.celest ialPolesColor");
colorButton(ui->colorZenithNadir, "GridLinesMgr.zenith NadirColor"); colorButton(ui->colorZenithNadir, "GridLinesMgr.zenith NadirColor");
colorButton(ui->colorEclipticJ2000Poles, "GridLinesMgr.eclipt icJ2000PolesColor"); colorButton(ui->colorEclipticJ2000Poles, "GridLinesMgr.eclipt icJ2000PolesColor");
colorButton(ui->colorEclipticPoles, "GridLinesMgr.eclipt icPolesColor"); colorButton(ui->colorEclipticPoles, "GridLinesMgr.eclipt icPolesColor");
colorButton(ui->colorGalacticPoles, "GridLinesMgr.galact icPolesColor"); colorButton(ui->colorGalacticPoles, "GridLinesMgr.galact icPolesColor");
colorButton(ui->colorSupergalacticPoles, "GridLinesMgr.superg alacticPolesColor"); colorButton(ui->colorSupergalacticPoles, "GridLinesMgr.superg alacticPolesColor");
colorButton(ui->colorEquinoxJ2000Points, "GridLinesMgr.equino xJ2000PointsColor"); colorButton(ui->colorEquinoxJ2000Points, "GridLinesMgr.equino xJ2000PointsColor");
colorButton(ui->colorEquinoxPoints, "GridLinesMgr.equino xPointsColor"); colorButton(ui->colorEquinoxPoints, "GridLinesMgr.equino xPointsColor");
colorButton(ui->colorSolsticeJ2000Points, "GridLinesMgr.solsti
ceJ2000PointsColor");
colorButton(ui->colorSolsticePoints, "GridLinesMgr.solsti
cePointsColor");
colorButton(ui->colorCardinalPoints, "LandscapeMgr.cardin alsPointsColor"); colorButton(ui->colorCardinalPoints, "LandscapeMgr.cardin alsPointsColor");
connect(ui->colorEclipticGridJ2000, SIGNAL(released()), this, SLOT(askEclipticJ2000GridColor())); connect(ui->colorEclipticGridJ2000, SIGNAL(released()), this, SLOT(askEclipticJ2000GridColor()));
connect(ui->colorEclipticGridOfDate, SIGNAL(released()), this, SLOT(askEclipticGridColor())); connect(ui->colorEclipticGridOfDate, SIGNAL(released()), this, SLOT(askEclipticGridColor()));
connect(ui->colorEquatorialJ2000Grid, SIGNAL(released()), this, SLOT(askEquatorJ2000GridColor())); connect(ui->colorEquatorialJ2000Grid, SIGNAL(released()), this, SLOT(askEquatorJ2000GridColor()));
connect(ui->colorEquatorialGrid, SIGNAL(released()), this, SLOT(askEquatorGridColor())); connect(ui->colorEquatorialGrid, SIGNAL(released()), this, SLOT(askEquatorGridColor()));
connect(ui->colorGalacticGrid, SIGNAL(released()), this, SLOT(askGalacticGridColor())); connect(ui->colorGalacticGrid, SIGNAL(released()), this, SLOT(askGalacticGridColor()));
connect(ui->colorSupergalacticGrid, SIGNAL(released()), this, SLOT(askSupergalacticGridColor())); connect(ui->colorSupergalacticGrid, SIGNAL(released()), this, SLOT(askSupergalacticGridColor()));
connect(ui->colorAzimuthalGrid, SIGNAL(released()), this, SLOT(askAzimuthalGridColor())); connect(ui->colorAzimuthalGrid, SIGNAL(released()), this, SLOT(askAzimuthalGridColor()));
connect(ui->colorEclipticLineJ2000, SIGNAL(released()), this, SLOT(askEclipticLineJ2000Color())); connect(ui->colorEclipticLineJ2000, SIGNAL(released()), this, SLOT(askEclipticLineJ2000Color()));
skipping to change at line 396 skipping to change at line 371
connect(ui->colorMeridianLine, SIGNAL(released()), this, SLOT(askMeridianLineColor())); connect(ui->colorMeridianLine, SIGNAL(released()), this, SLOT(askMeridianLineColor()));
connect(ui->colorCelestialJ2000Poles, SIGNAL(released()), this, SLOT(askCelestialJ2000PolesColor())); connect(ui->colorCelestialJ2000Poles, SIGNAL(released()), this, SLOT(askCelestialJ2000PolesColor()));
connect(ui->colorCelestialPoles, SIGNAL(released()), this, SLOT(askCelestialPolesColor())); connect(ui->colorCelestialPoles, SIGNAL(released()), this, SLOT(askCelestialPolesColor()));
connect(ui->colorZenithNadir, SIGNAL(released()), this, SLOT(askZenithNadirColor())); connect(ui->colorZenithNadir, SIGNAL(released()), this, SLOT(askZenithNadirColor()));
connect(ui->colorEclipticJ2000Poles, SIGNAL(released()), this, SLOT(askEclipticJ2000PolesColor())); connect(ui->colorEclipticJ2000Poles, SIGNAL(released()), this, SLOT(askEclipticJ2000PolesColor()));
connect(ui->colorEclipticPoles, SIGNAL(released()), this, SLOT(askEclipticPolesColor())); connect(ui->colorEclipticPoles, SIGNAL(released()), this, SLOT(askEclipticPolesColor()));
connect(ui->colorGalacticPoles, SIGNAL(released()), this, SLOT(askGalacticPolesColor())); connect(ui->colorGalacticPoles, SIGNAL(released()), this, SLOT(askGalacticPolesColor()));
connect(ui->colorSupergalacticPoles, SIGNAL(released()), this, SLOT(askSupergalacticPolesColor())); connect(ui->colorSupergalacticPoles, SIGNAL(released()), this, SLOT(askSupergalacticPolesColor()));
connect(ui->colorEquinoxJ2000Points, SIGNAL(released()), this, SLOT(askEquinoxJ2000PointsColor())); connect(ui->colorEquinoxJ2000Points, SIGNAL(released()), this, SLOT(askEquinoxJ2000PointsColor()));
connect(ui->colorEquinoxPoints, SIGNAL(released()), this, SLOT(askEquinoxPointsColor())); connect(ui->colorEquinoxPoints, SIGNAL(released()), this, SLOT(askEquinoxPointsColor()));
connect(ui->colorSolsticeJ2000Points, SIGNAL(released()),
this, SLOT(askSolsticeJ2000PointsColor()));
connect(ui->colorSolsticePoints, SIGNAL(released()),
this, SLOT(askSolsticePointsColor()));
connect(ui->colorCardinalPoints, SIGNAL(released()), this, SLOT(askCardinalPointsColor())); connect(ui->colorCardinalPoints, SIGNAL(released()), this, SLOT(askCardinalPointsColor()));
// Constellations // Projection
connect(ui->projectionListWidget, SIGNAL(currentTextChanged(const QS
tring&)), this, SLOT(changeProjection(const QString&)));
connect(StelApp::getInstance().getCore(), SIGNAL(currentProjectionTy
peChanged(StelCore::ProjectionType)),this,SLOT(projectionChanged()));
connectDoubleProperty(ui->viewportOffsetSpinBox, "StelMovementMgr.vi
ewportVerticalOffsetTarget");
// Starlore
connect(ui->useAsDefaultSkyCultureCheckBox, SIGNAL(clicked()), this,
SLOT(setCurrentCultureAsDefault()));
connect(&StelApp::getInstance().getSkyCultureMgr(), SIGNAL(defaultSk
yCultureChanged(QString)),this,SLOT(updateDefaultSkyCulture()));
updateDefaultSkyCulture();
// allow to display short names and inhibit translation.
connectIntProperty(ui->skyCultureNamesStyleComboBox,"ConstellationMg
r.constellationDisplayStyle");
connectCheckBox(ui->nativePlanetNamesCheckBox,"actionShow_Skyculture
_NativePlanetNames");
connectCheckBox(ui->showConstellationLinesCheckBox, "actionShow_Cons tellation_Lines"); connectCheckBox(ui->showConstellationLinesCheckBox, "actionShow_Cons tellation_Lines");
connectDoubleProperty(ui->constellationLineThicknessSpinBox,"Constel lationMgr.constellationLineThickness");
connectCheckBox(ui->showConstellationLabelsCheckBox, "actionShow_Con stellation_Labels"); connectCheckBox(ui->showConstellationLabelsCheckBox, "actionShow_Con stellation_Labels");
connectCheckBox(ui->showConstellationBoundariesCheckBox, "actionShow _Constellation_Boundaries"); connectCheckBox(ui->showConstellationBoundariesCheckBox, "actionShow _Constellation_Boundaries");
connectCheckBox(ui->showConstellationArtCheckBox, "actionShow_Conste llation_Art"); connectCheckBox(ui->showConstellationArtCheckBox, "actionShow_Conste llation_Art");
connectDoubleProperty(ui->constellationArtBrightnessSpinBox,"Constel lationMgr.artIntensity"); connectDoubleProperty(ui->constellationArtBrightnessSpinBox,"Constel lationMgr.artIntensity");
connectDoubleProperty(ui->constellationLineThicknessSpinBox,"Constel lationMgr.constellationLineThickness");
colorButton(ui->colorConstellationBoundaries, "ConstellationMgr.bo undariesColor"); colorButton(ui->colorConstellationBoundaries, "ConstellationMgr.bo undariesColor");
colorButton(ui->colorConstellationLabels, "ConstellationMgr.na mesColor"); colorButton(ui->colorConstellationLabels, "ConstellationMgr.na mesColor");
colorButton(ui->colorConstellationLines, "ConstellationMgr.li nesColor"); colorButton(ui->colorConstellationLines, "ConstellationMgr.li nesColor");
connect(ui->colorConstellationBoundaries, SIGNAL(released()), this, SLOT(askConstellationBoundariesColor())); connect(ui->colorConstellationBoundaries, SIGNAL(released()), this, SLOT(askConstellationBoundariesColor()));
connect(ui->colorConstellationLabels, SIGNAL(released()), this, SLOT(askConstellationLabelsColor())); connect(ui->colorConstellationLabels, SIGNAL(released()), this, SLOT(askConstellationLabelsColor()));
connect(ui->colorConstellationLines, SIGNAL(released()), this, SLOT(askConstellationLinesColor())); connect(ui->colorConstellationLines, SIGNAL(released()), this, SLOT(askConstellationLinesColor()));
// Starlore
connect(ui->useAsDefaultSkyCultureCheckBox, SIGNAL(clicked()), this,
SLOT(setCurrentCultureAsDefault()));
connect(&StelApp::getInstance().getSkyCultureMgr(), SIGNAL(defaultSk
yCultureChanged(QString)),this,SLOT(updateDefaultSkyCulture()));
updateDefaultSkyCulture();
connectCheckBox(ui->nativeNameCheckBox,"actionShow_Skyculture_Native
names");
// allow to display short names and inhibit translation.
connectIntProperty(ui->skyCultureNamesStyleComboBox,"ConstellationMg
r.constellationDisplayStyle");
// Sky layers. This not yet finished and not visible in releases. // Sky layers. This not yet finished and not visible in releases.
// TODO: These 4 lines are commented away in trunk. // TODO: These 4 lines are commented away in trunk.
populateSkyLayersList(); populateSkyLayersList();
connect(this, SIGNAL(visibleChanged(bool)), this, SLOT(populateSkyLa yersList())); connect(this, SIGNAL(visibleChanged(bool)), this, SLOT(populateSkyLa yersList()));
connect(ui->skyLayerListWidget, SIGNAL(currentTextChanged(const QStr ing&)), this, SLOT(skyLayersSelectionChanged(const QString&))); connect(ui->skyLayerListWidget, SIGNAL(currentTextChanged(const QStr ing&)), this, SLOT(skyLayersSelectionChanged(const QString&)));
connect(ui->skyLayerEnableCheckBox, SIGNAL(stateChanged(int)), this, SLOT(skyLayersEnabledChanged(int))); connect(ui->skyLayerEnableCheckBox, SIGNAL(stateChanged(int)), this, SLOT(skyLayersEnabledChanged(int)));
updateTabBarListWidgetWidth(); updateTabBarListWidgetWidth();
} }
skipping to change at line 666 skipping to change at line 644
void ViewDialog::askLongitudeLineColor() void ViewDialog::askLongitudeLineColor()
{ {
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP roperty("GridLinesMgr.longitudeLineColor")->getValue().value<Vec3f>(); Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP roperty("GridLinesMgr.longitudeLineColor")->getValue().value<Vec3f>();
QColor color(0,0,0); QColor color(0,0,0);
color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]); color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorLongitude Line->toolTip())); QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorLongitude Line->toolTip()));
if (c.isValid()) if (c.isValid())
{ {
vColor = Vec3f(c.redF(), c.greenF(), c.blueF()); vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(GridLinesMgr)->setColorLongitudeLine(vColor); GETSTELMODULE(GridLinesMgr)->setColorLongitudeLine(vColor);
StelApp::getInstance().getSettings()->setValue("color/longit ude_color", StelUtils::vec3fToStr(vColor)); StelApp::getInstance().getSettings()->setValue("color/oc_lon gitude_color", StelUtils::vec3fToStr(vColor));
ui->colorLongitudeLine->setStyleSheet("QToolButton { backgro und-color:" + c.name() + "; }"); ui->colorLongitudeLine->setStyleSheet("QToolButton { backgro und-color:" + c.name() + "; }");
} }
} }
void ViewDialog::askColureLinesColor() void ViewDialog::askColureLinesColor()
{ {
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP roperty("GridLinesMgr.colureLinesColor")->getValue().value<Vec3f>(); Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP roperty("GridLinesMgr.colureLinesColor")->getValue().value<Vec3f>();
QColor color(0,0,0); QColor color(0,0,0);
color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]); color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorColuresLi ne->toolTip())); QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorColuresLi ne->toolTip()));
skipping to change at line 881 skipping to change at line 859
QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorEquinoxPo ints->toolTip())); QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorEquinoxPo ints->toolTip()));
if (c.isValid()) if (c.isValid())
{ {
vColor = Vec3f(c.redF(), c.greenF(), c.blueF()); vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(GridLinesMgr)->setColorEquinoxPoints(vColor); GETSTELMODULE(GridLinesMgr)->setColorEquinoxPoints(vColor);
StelApp::getInstance().getSettings()->setValue("color/equino x_points_color", StelUtils::vec3fToStr(vColor)); StelApp::getInstance().getSettings()->setValue("color/equino x_points_color", StelUtils::vec3fToStr(vColor));
ui->colorEquinoxPoints->setStyleSheet("QToolButton { backgro und-color:" + c.name() + "; }"); ui->colorEquinoxPoints->setStyleSheet("QToolButton { backgro und-color:" + c.name() + "; }");
} }
} }
void ViewDialog::askSolsticeJ2000PointsColor()
{
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP
roperty("GridLinesMgr.solsticeJ2000PointsColor")->getValue().value<Vec3f>()
;
QColor color(0,0,0);
color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorSolsticeJ
2000Points->toolTip()));
if (c.isValid())
{
vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(GridLinesMgr)->setColorSolsticeJ2000Points(vCo
lor);
StelApp::getInstance().getSettings()->setValue("color/solsti
ce_J2000_points_color", StelUtils::vec3fToStr(vColor));
ui->colorSolsticeJ2000Points->setStyleSheet("QToolButton { b
ackground-color:" + c.name() + "; }");
}
}
void ViewDialog::askSolsticePointsColor()
{
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP
roperty("GridLinesMgr.solsticePointsColor")->getValue().value<Vec3f>();
QColor color(0,0,0);
color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorSolsticeP
oints->toolTip()));
if (c.isValid())
{
vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(GridLinesMgr)->setColorSolsticePoints(vColor);
StelApp::getInstance().getSettings()->setValue("color/solsti
ce_points_color", StelUtils::vec3fToStr(vColor));
ui->colorSolsticePoints->setStyleSheet("QToolButton { backgr
ound-color:" + c.name() + "; }");
}
}
void ViewDialog::askCardinalPointsColor() void ViewDialog::askCardinalPointsColor()
{ {
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP roperty("LandscapeMgr.cardinalsPointsColor")->getValue().value<Vec3f>(); Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP roperty("LandscapeMgr.cardinalsPointsColor")->getValue().value<Vec3f>();
QColor color(0,0,0); QColor color(0,0,0);
color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]); color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorCardinalP oints->toolTip())); QColor c = QColorDialog::getColor(color, NULL, q_(ui->colorCardinalP oints->toolTip()));
if (c.isValid()) if (c.isValid())
{ {
vColor = Vec3f(c.redF(), c.greenF(), c.blueF()); vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(LandscapeMgr)->setColorCardinalPoints(vColor); GETSTELMODULE(LandscapeMgr)->setColorCardinalPoints(vColor);
 End of changes. 36 change blocks. 
166 lines changed or deleted 179 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/