ConfigureDSOColorsDialog.cpp   ConfigureDSOColorsDialog.cpp 
skipping to change at line 72 skipping to change at line 72
colorButton(ui->colorDSORadioGalaxies, "NebulaMgr.r adioGalaxiesColor"); colorButton(ui->colorDSORadioGalaxies, "NebulaMgr.r adioGalaxiesColor");
colorButton(ui->colorDSOInteractingGalaxies, "NebulaMgr.i nteractingGalaxiesColor"); colorButton(ui->colorDSOInteractingGalaxies, "NebulaMgr.i nteractingGalaxiesColor");
colorButton(ui->colorDSOQuasars, "NebulaMgr.q uasarsColor"); colorButton(ui->colorDSOQuasars, "NebulaMgr.q uasarsColor");
colorButton(ui->colorDSOPossibleQuasars, "NebulaMgr.p ossibleQuasarsColor"); colorButton(ui->colorDSOPossibleQuasars, "NebulaMgr.p ossibleQuasarsColor");
colorButton(ui->colorDSOStarClusters, "NebulaMgr.c lustersColor"); colorButton(ui->colorDSOStarClusters, "NebulaMgr.c lustersColor");
colorButton(ui->colorDSOOpenStarClusters, "NebulaMgr.o penClustersColor"); colorButton(ui->colorDSOOpenStarClusters, "NebulaMgr.o penClustersColor");
colorButton(ui->colorDSOGlobularStarClusters, "NebulaMgr.g lobularClustersColor"); colorButton(ui->colorDSOGlobularStarClusters, "NebulaMgr.g lobularClustersColor");
colorButton(ui->colorDSOStellarAssociations, "NebulaMgr.s tellarAssociationsColor"); colorButton(ui->colorDSOStellarAssociations, "NebulaMgr.s tellarAssociationsColor");
colorButton(ui->colorDSOStarClouds, "NebulaMgr.s tarCloudsColor"); colorButton(ui->colorDSOStarClouds, "NebulaMgr.s tarCloudsColor");
colorButton(ui->colorDSOStars, "NebulaMgr.s tarsColor"); colorButton(ui->colorDSOStars, "NebulaMgr.s tarsColor");
colorButton(ui->colorDSOSymbioticStars, "NebulaMgr.s
ymbioticStarsColor");
colorButton(ui->colorDSOEmissionLineStars, "NebulaMgr.e
missionLineStarsColor");
colorButton(ui->colorDSONebulae, "NebulaMgr.n ebulaeColor"); colorButton(ui->colorDSONebulae, "NebulaMgr.n ebulaeColor");
colorButton(ui->colorDSOPlanetaryNebulae, "NebulaMgr.p lanetaryNebulaeColor"); colorButton(ui->colorDSOPlanetaryNebulae, "NebulaMgr.p lanetaryNebulaeColor");
colorButton(ui->colorDSODarkNebulae, "NebulaMgr.d arkNebulaeColor"); colorButton(ui->colorDSODarkNebulae, "NebulaMgr.d arkNebulaeColor");
colorButton(ui->colorDSOReflectionNebulae, "NebulaMgr.r eflectionNebulaeColor"); colorButton(ui->colorDSOReflectionNebulae, "NebulaMgr.r eflectionNebulaeColor");
colorButton(ui->colorDSOBipolarNebulae, "NebulaMgr.b ipolarNebulaeColor"); colorButton(ui->colorDSOBipolarNebulae, "NebulaMgr.b ipolarNebulaeColor");
colorButton(ui->colorDSOEmissionNebulae, "NebulaMgr.e missionNebulaeColor"); colorButton(ui->colorDSOEmissionNebulae, "NebulaMgr.e missionNebulaeColor");
colorButton(ui->colorDSONebulosityClusters, "NebulaMgr.c lusterWithNebulosityColor"); colorButton(ui->colorDSONebulosityClusters, "NebulaMgr.c lusterWithNebulosityColor");
colorButton(ui->colorDSOPossiblePlanetaryNebulae, "NebulaMgr.p ossiblePlanetaryNebulaeColor"); colorButton(ui->colorDSOPossiblePlanetaryNebulae, "NebulaMgr.p ossiblePlanetaryNebulaeColor");
colorButton(ui->colorDSOProtoplanetaryNebulae, "NebulaMgr.p rotoplanetaryNebulaeColor"); colorButton(ui->colorDSOProtoplanetaryNebulae, "NebulaMgr.p rotoplanetaryNebulaeColor");
colorButton(ui->colorDSOHydrogenRegions, "NebulaMgr.h ydrogenRegionsColor"); colorButton(ui->colorDSOHydrogenRegions, "NebulaMgr.h ydrogenRegionsColor");
colorButton(ui->colorDSOInterstellarMatter, "NebulaMgr.i nterstellarMatterColor"); colorButton(ui->colorDSOInterstellarMatter, "NebulaMgr.i nterstellarMatterColor");
colorButton(ui->colorDSOEmissionObjects, "NebulaMgr.e missionObjectsColor"); colorButton(ui->colorDSOEmissionObjects, "NebulaMgr.e missionObjectsColor");
colorButton(ui->colorDSOMolecularClouds, "NebulaMgr.m olecularCloudsColor"); colorButton(ui->colorDSOMolecularClouds, "NebulaMgr.m olecularCloudsColor");
colorButton(ui->colorDSOBLLacObjects, "NebulaMgr.b lLacObjectsColor"); colorButton(ui->colorDSOBLLacObjects, "NebulaMgr.b lLacObjectsColor");
colorButton(ui->colorDSOBlazars, "NebulaMgr.b lazarsColor"); colorButton(ui->colorDSOBlazars, "NebulaMgr.b lazarsColor");
colorButton(ui->colorDSOYoungStellarObjects, "NebulaMgr.y oungStellarObjectsColor"); colorButton(ui->colorDSOYoungStellarObjects, "NebulaMgr.y oungStellarObjectsColor");
colorButton(ui->colorDSOSupernovaRemnants, "NebulaMgr.s upernovaRemnantsColor"); colorButton(ui->colorDSOSupernovaRemnants, "NebulaMgr.s upernovaRemnantsColor");
colorButton(ui->colorDSOSupernovaCandidates, "NebulaMgr.s
upernovaCandidatesColor");
colorButton(ui->colorDSOSupernovaRemnantCandidates, "NebulaMgr.s
upernovaRemnantCandidatesColor");
colorButton(ui->colorDSOGalaxyClusters, "NebulaMgr.g
alaxyClustersColor");
connect(ui->colorDSOLabels, SIGNAL(relea sed()), this, SLOT(askDSOLabelsColor())); connect(ui->colorDSOLabels, SIGNAL(relea sed()), this, SLOT(askDSOLabelsColor()));
connect(ui->colorDSOMarkers, SIGNAL(relea sed()), this, SLOT(askDSOMarkersColor())); connect(ui->colorDSOMarkers, SIGNAL(relea sed()), this, SLOT(askDSOMarkersColor()));
connect(ui->colorDSOGalaxies, SIGNAL(relea sed()), this, SLOT(askDSOGalaxiesColor())); connect(ui->colorDSOGalaxies, SIGNAL(relea sed()), this, SLOT(askDSOGalaxiesColor()));
connect(ui->colorDSOActiveGalaxies, SIGNAL(relea sed()), this, SLOT(askDSOActiveGalaxiesColor())); connect(ui->colorDSOActiveGalaxies, SIGNAL(relea sed()), this, SLOT(askDSOActiveGalaxiesColor()));
connect(ui->colorDSORadioGalaxies, SIGNAL(relea sed()), this, SLOT(askDSORadioGalaxiesColor())); connect(ui->colorDSORadioGalaxies, SIGNAL(relea sed()), this, SLOT(askDSORadioGalaxiesColor()));
connect(ui->colorDSOInteractingGalaxies, SIGNAL(relea sed()), this, SLOT(askDSOInteractingGalaxiesColor())); connect(ui->colorDSOInteractingGalaxies, SIGNAL(relea sed()), this, SLOT(askDSOInteractingGalaxiesColor()));
connect(ui->colorDSOQuasars, SIGNAL(relea sed()), this, SLOT(askDSOQuasarsColor())); connect(ui->colorDSOQuasars, SIGNAL(relea sed()), this, SLOT(askDSOQuasarsColor()));
connect(ui->colorDSOPossibleQuasars, SIGNAL(relea sed()), this, SLOT(askDSOPossibleQuasarsColor())); connect(ui->colorDSOPossibleQuasars, SIGNAL(relea sed()), this, SLOT(askDSOPossibleQuasarsColor()));
connect(ui->colorDSOStarClusters, SIGNAL(relea sed()), this, SLOT(askDSOStarClustersColor())); connect(ui->colorDSOStarClusters, SIGNAL(relea sed()), this, SLOT(askDSOStarClustersColor()));
connect(ui->colorDSOOpenStarClusters, SIGNAL(relea sed()), this, SLOT(askDSOOpenStarClustersColor())); connect(ui->colorDSOOpenStarClusters, SIGNAL(relea sed()), this, SLOT(askDSOOpenStarClustersColor()));
connect(ui->colorDSOGlobularStarClusters, SIGNAL(relea sed()), this, SLOT(askDSOGlobularStarClustersColor())); connect(ui->colorDSOGlobularStarClusters, SIGNAL(relea sed()), this, SLOT(askDSOGlobularStarClustersColor()));
connect(ui->colorDSOStellarAssociations, SIGNAL(relea sed()), this, SLOT(askDSOStellarAssociationsColor())); connect(ui->colorDSOStellarAssociations, SIGNAL(relea sed()), this, SLOT(askDSOStellarAssociationsColor()));
connect(ui->colorDSOStarClouds, SIGNAL(relea sed()), this, SLOT(askDSOStarCloudsColor())); connect(ui->colorDSOStarClouds, SIGNAL(relea sed()), this, SLOT(askDSOStarCloudsColor()));
connect(ui->colorDSOStars, SIGNAL(relea sed()), this, SLOT(askDSOStarsColor())); connect(ui->colorDSOStars, SIGNAL(relea sed()), this, SLOT(askDSOStarsColor()));
connect(ui->colorDSOSymbioticStars, SIGNAL(relea
sed()), this, SLOT(askDSOSymbioticStarsColor()));
connect(ui->colorDSOEmissionLineStars, SIGNAL(relea
sed()), this, SLOT(askDSOEmissionLineStarsColor()));
connect(ui->colorDSONebulae, SIGNAL(relea sed()), this, SLOT(askDSONebulaeColor())); connect(ui->colorDSONebulae, SIGNAL(relea sed()), this, SLOT(askDSONebulaeColor()));
connect(ui->colorDSOPlanetaryNebulae, SIGNAL(relea sed()), this, SLOT(askDSOPlanetaryNebulaeColor())); connect(ui->colorDSOPlanetaryNebulae, SIGNAL(relea sed()), this, SLOT(askDSOPlanetaryNebulaeColor()));
connect(ui->colorDSODarkNebulae, SIGNAL(relea sed()), this, SLOT(askDSODarkNebulaeColor())); connect(ui->colorDSODarkNebulae, SIGNAL(relea sed()), this, SLOT(askDSODarkNebulaeColor()));
connect(ui->colorDSOReflectionNebulae, SIGNAL(relea sed()), this, SLOT(askDSOReflectionNebulaeColor())); connect(ui->colorDSOReflectionNebulae, SIGNAL(relea sed()), this, SLOT(askDSOReflectionNebulaeColor()));
connect(ui->colorDSOBipolarNebulae, SIGNAL(relea sed()), this, SLOT(askDSOBipolarNebulaeColor())); connect(ui->colorDSOBipolarNebulae, SIGNAL(relea sed()), this, SLOT(askDSOBipolarNebulaeColor()));
connect(ui->colorDSOEmissionNebulae, SIGNAL(relea sed()), this, SLOT(askDSOEmissionNebulaeColor())); connect(ui->colorDSOEmissionNebulae, SIGNAL(relea sed()), this, SLOT(askDSOEmissionNebulaeColor()));
connect(ui->colorDSONebulosityClusters, SIGNAL(relea sed()), this, SLOT(askDSONebulosityClustersColor())); connect(ui->colorDSONebulosityClusters, SIGNAL(relea sed()), this, SLOT(askDSONebulosityClustersColor()));
connect(ui->colorDSOPossiblePlanetaryNebulae, SIGNAL(relea sed()), this, SLOT(askDSOPossiblePlanetaryNebulaeColor())); connect(ui->colorDSOPossiblePlanetaryNebulae, SIGNAL(relea sed()), this, SLOT(askDSOPossiblePlanetaryNebulaeColor()));
connect(ui->colorDSOProtoplanetaryNebulae, SIGNAL(relea sed()), this, SLOT(askDSOProtoplanetaryNebulaeColor())); connect(ui->colorDSOProtoplanetaryNebulae, SIGNAL(relea sed()), this, SLOT(askDSOProtoplanetaryNebulaeColor()));
connect(ui->colorDSOHydrogenRegions, SIGNAL(relea sed()), this, SLOT(askDSOHydrogenRegionsColor())); connect(ui->colorDSOHydrogenRegions, SIGNAL(relea sed()), this, SLOT(askDSOHydrogenRegionsColor()));
connect(ui->colorDSOInterstellarMatter, SIGNAL(relea sed()), this, SLOT(askDSOInterstellarMatterColor())); connect(ui->colorDSOInterstellarMatter, SIGNAL(relea sed()), this, SLOT(askDSOInterstellarMatterColor()));
connect(ui->colorDSOEmissionObjects, SIGNAL(relea sed()), this, SLOT(askDSOEmissionObjectsColor())); connect(ui->colorDSOEmissionObjects, SIGNAL(relea sed()), this, SLOT(askDSOEmissionObjectsColor()));
connect(ui->colorDSOMolecularClouds, SIGNAL(relea sed()), this, SLOT(askDSOMolecularCloudsColor())); connect(ui->colorDSOMolecularClouds, SIGNAL(relea sed()), this, SLOT(askDSOMolecularCloudsColor()));
connect(ui->colorDSOBLLacObjects, SIGNAL(relea sed()), this, SLOT(askDSOBLLacObjectsColor())); connect(ui->colorDSOBLLacObjects, SIGNAL(relea sed()), this, SLOT(askDSOBLLacObjectsColor()));
connect(ui->colorDSOBlazars, SIGNAL(relea sed()), this, SLOT(askDSOBlazarsColor())); connect(ui->colorDSOBlazars, SIGNAL(relea sed()), this, SLOT(askDSOBlazarsColor()));
connect(ui->colorDSOYoungStellarObjects, SIGNAL(relea sed()), this, SLOT(askDSOYoungStellarObjectsColor())); connect(ui->colorDSOYoungStellarObjects, SIGNAL(relea sed()), this, SLOT(askDSOYoungStellarObjectsColor()));
connect(ui->colorDSOSupernovaRemnants, SIGNAL(relea sed()), this, SLOT(askDSOSupernovaRemnantsColor())); connect(ui->colorDSOSupernovaRemnants, SIGNAL(relea sed()), this, SLOT(askDSOSupernovaRemnantsColor()));
connect(ui->colorDSOSupernovaCandidates, SIGNAL(relea
sed()), this, SLOT(askDSOSupernovaCandidatesColor()));
connect(ui->colorDSOSupernovaRemnantCandidates, SIGNAL(relea
sed()), this, SLOT(askDSOSupernovaRemnantCandidatesColor()));
connect(ui->colorDSOGalaxyClusters, SIGNAL(relea
sed()), this, SLOT(askDSOGalaxyClustersColor()));
} }
void ConfigureDSOColorsDialog::colorButton(QToolButton* toolButton, QString propName) void ConfigureDSOColorsDialog::colorButton(QToolButton* toolButton, QString propName)
{ {
StelProperty* prop = StelApp::getInstance().getStelPropertyManager() ->getProperty(propName); StelProperty* prop = StelApp::getInstance().getStelPropertyManager() ->getProperty(propName);
Vec3f vColor = prop->getValue().value<Vec3f>(); Vec3f vColor = prop->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]);
// Use style sheet for create a nice buttons :) // Use style sheet for create a nice buttons :)
toolButton->setStyleSheet("QToolButton { background-color:" + color. name() + "; }"); toolButton->setStyleSheet("QToolButton { background-color:" + color. name() + "; }");
skipping to change at line 585 skipping to change at line 594
QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOS upernovaRemnants->toolTip())); QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOS upernovaRemnants->toolTip()));
if (c.isValid()) if (c.isValid())
{ {
vColor = Vec3f(c.redF(), c.greenF(), c.blueF()); vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(NebulaMgr)->setSupernovaRemnantColor(vColor); GETSTELMODULE(NebulaMgr)->setSupernovaRemnantColor(vColor);
StelApp::getInstance().getSettings()->setValue("color/dso_su pernova_remnant_color", StelUtils::vec3fToStr(vColor)); StelApp::getInstance().getSettings()->setValue("color/dso_su pernova_remnant_color", StelUtils::vec3fToStr(vColor));
ui->colorDSOSupernovaRemnants->setStyleSheet("QToolButton { background-color:" + c.name() + "; }"); ui->colorDSOSupernovaRemnants->setStyleSheet("QToolButton { background-color:" + c.name() + "; }");
} }
} }
void ConfigureDSOColorsDialog::askDSOSupernovaCandidatesColor()
{
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP
roperty("NebulaMgr.supernovaCandidatesColor")->getValue().value<Vec3f>();
QColor color(0,0,0);
color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOS
upernovaCandidates->toolTip()));
if (c.isValid())
{
vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(NebulaMgr)->setSupernovaCandidateColor(vColor)
;
StelApp::getInstance().getSettings()->setValue("color/dso_su
pernova_candidate_color", StelUtils::vec3fToStr(vColor));
ui->colorDSOSupernovaCandidates->setStyleSheet("QToolButton
{ background-color:" + c.name() + "; }");
}
}
void ConfigureDSOColorsDialog::askDSOSupernovaRemnantCandidatesColor()
{
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP
roperty("NebulaMgr.supernovaRemnantCandidatesColor")->getValue().value<Vec3
f>();
QColor color(0,0,0);
color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOS
upernovaRemnantCandidates->toolTip()));
if (c.isValid())
{
vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(NebulaMgr)->setSupernovaRemnantCandidateColor(
vColor);
StelApp::getInstance().getSettings()->setValue("color/dso_su
pernova_remnant_cand_color", StelUtils::vec3fToStr(vColor));
ui->colorDSOSupernovaRemnantCandidates->setStyleSheet("QTool
Button { background-color:" + c.name() + "; }");
}
}
void ConfigureDSOColorsDialog::askDSOStarsColor() void ConfigureDSOColorsDialog::askDSOStarsColor()
{ {
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP roperty("NebulaMgr.starsColor")->getValue().value<Vec3f>(); Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP roperty("NebulaMgr.starsColor")->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, Q_NULLPTR, q_(ui->colorDSOS tars->toolTip())); QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOS tars->toolTip()));
if (c.isValid()) if (c.isValid())
{ {
vColor = Vec3f(c.redF(), c.greenF(), c.blueF()); vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(NebulaMgr)->setStarColor(vColor); GETSTELMODULE(NebulaMgr)->setStarColor(vColor);
StelApp::getInstance().getSettings()->setValue("color/dso_st ar_color", StelUtils::vec3fToStr(vColor)); StelApp::getInstance().getSettings()->setValue("color/dso_st ar_color", StelUtils::vec3fToStr(vColor));
ui->colorDSOStars->setStyleSheet("QToolButton { background-c olor:" + c.name() + "; }"); ui->colorDSOStars->setStyleSheet("QToolButton { background-c olor:" + c.name() + "; }");
} }
} }
void ConfigureDSOColorsDialog::askDSOSymbioticStarsColor()
{
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP
roperty("NebulaMgr.symbioticStarsColor")->getValue().value<Vec3f>();
QColor color(0,0,0);
color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOS
ymbioticStars->toolTip()));
if (c.isValid())
{
vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(NebulaMgr)->setSymbioticStarColor(vColor);
StelApp::getInstance().getSettings()->setValue("color/dso_sy
mbiotic_star_color", StelUtils::vec3fToStr(vColor));
ui->colorDSOSymbioticStars->setStyleSheet("QToolButton { bac
kground-color:" + c.name() + "; }");
}
}
void ConfigureDSOColorsDialog::askDSOEmissionLineStarsColor()
{
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP
roperty("NebulaMgr.emissionLineStarsColor")->getValue().value<Vec3f>();
QColor color(0,0,0);
color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOE
missionLineStars->toolTip()));
if (c.isValid())
{
vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(NebulaMgr)->setEmissionLineStarColor(vColor);
StelApp::getInstance().getSettings()->setValue("color/dso_em
ission_star_color", StelUtils::vec3fToStr(vColor));
ui->colorDSOEmissionLineStars->setStyleSheet("QToolButton {
background-color:" + c.name() + "; }");
}
}
void ConfigureDSOColorsDialog::askDSOGalaxyClustersColor()
{
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP
roperty("NebulaMgr.galaxyClustersColor")->getValue().value<Vec3f>();
QColor color(0,0,0);
color.setRgbF(vColor.v[0], vColor.v[1], vColor.v[2]);
QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorDSOG
alaxyClusters->toolTip()));
if (c.isValid())
{
vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(NebulaMgr)->setGalaxyClusterColor(vColor);
StelApp::getInstance().getSettings()->setValue("color/dso_ga
laxy_cluster_color", StelUtils::vec3fToStr(vColor));
ui->colorDSOGalaxyClusters->setStyleSheet("QToolButton { bac
kground-color:" + c.name() + "; }");
}
}
 End of changes. 6 change blocks. 
1 lines changed or deleted 61 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/