ArchaeoLinesDialog.cpp   ArchaeoLinesDialog.cpp 
skipping to change at line 104 skipping to change at line 104
connectBoolProperty(ui->customAzimuth1CheckBox, "ArchaeoLines .flagShowCustomAzimuth1"); connectBoolProperty(ui->customAzimuth1CheckBox, "ArchaeoLines .flagShowCustomAzimuth1");
connectBoolProperty(ui->customAzimuth2CheckBox, "ArchaeoLines .flagShowCustomAzimuth2"); connectBoolProperty(ui->customAzimuth2CheckBox, "ArchaeoLines .flagShowCustomAzimuth2");
connectDoubleProperty(ui->customAzimuth1DoubleSpinBox, "ArchaeoLines .customAzimuth1"); connectDoubleProperty(ui->customAzimuth1DoubleSpinBox, "ArchaeoLines .customAzimuth1");
connectDoubleProperty(ui->customAzimuth2DoubleSpinBox, "ArchaeoLines .customAzimuth2"); connectDoubleProperty(ui->customAzimuth2DoubleSpinBox, "ArchaeoLines .customAzimuth2");
ui->customAzimuth1LineEdit->setText(al->getLineLabel(ArchaeoLine::Cu stomAzimuth1)); ui->customAzimuth1LineEdit->setText(al->getLineLabel(ArchaeoLine::Cu stomAzimuth1));
ui->customAzimuth2LineEdit->setText(al->getLineLabel(ArchaeoLine::Cu stomAzimuth2)); ui->customAzimuth2LineEdit->setText(al->getLineLabel(ArchaeoLine::Cu stomAzimuth2));
connect(ui->customAzimuth1LineEdit, SIGNAL(textChanged(QString)), al , SLOT(setCustomAzimuth1Label(QString))); connect(ui->customAzimuth1LineEdit, SIGNAL(textChanged(QString)), al , SLOT(setCustomAzimuth1Label(QString)));
connect(ui->customAzimuth2LineEdit, SIGNAL(textChanged(QString)), al , SLOT(setCustomAzimuth2Label(QString))); connect(ui->customAzimuth2LineEdit, SIGNAL(textChanged(QString)), al , SLOT(setCustomAzimuth2Label(QString)));
connectBoolProperty(ui->customDeclination1CheckBox, "ArchaeoL
ines.flagShowCustomDeclination1");
connectBoolProperty(ui->customDeclination2CheckBox, "ArchaeoL
ines.flagShowCustomDeclination2");
connectDoubleProperty(ui->customDeclination1DoubleSpinBox, "ArchaeoL
ines.customDeclination1");
connectDoubleProperty(ui->customDeclination2DoubleSpinBox, "ArchaeoL
ines.customDeclination2");
ui->customDeclination1LineEdit->setText(al->getLineLabel(ArchaeoLine
::CustomDeclination1));
ui->customDeclination2LineEdit->setText(al->getLineLabel(ArchaeoLine
::CustomDeclination2));
connect(ui->customDeclination1LineEdit, SIGNAL(textChanged(QString))
, al, SLOT(setCustomDeclination1Label(QString)));
connect(ui->customDeclination2LineEdit, SIGNAL(textChanged(QString))
, al, SLOT(setCustomDeclination2Label(QString)));
{ // just to allow code folding. { // just to allow code folding.
equinoxColor = al->getLineColor(ArchaeoLine::Equinox); equinoxColor = al->getLineColor(ArchaeoLine::Equinox);
solsticeColor = al->getLineColor(ArchaeoLine::Solstices); solsticeColor = al->getLineColor(ArchaeoLine::Solstices);
crossquarterColor = al->getLineColor(ArchaeoLine::Crossquarters); crossquarterColor = al->getLineColor(ArchaeoLine::Crossquarters);
majorStandstillColor = al->getLineColor(ArchaeoLine::MajorStandstill ); majorStandstillColor = al->getLineColor(ArchaeoLine::MajorStandstill );
minorStandstillColor = al->getLineColor(ArchaeoLine::MinorStandstill ); minorStandstillColor = al->getLineColor(ArchaeoLine::MinorStandstill );
zenithPassageColor = al->getLineColor(ArchaeoLine::ZenithPassage); zenithPassageColor = al->getLineColor(ArchaeoLine::ZenithPassage);
nadirPassageColor = al->getLineColor(ArchaeoLine::NadirPassage); nadirPassageColor = al->getLineColor(ArchaeoLine::NadirPassage);
selectedObjectColor = al->getLineColor(ArchaeoLine::SelectedObject) ; selectedObjectColor = al->getLineColor(ArchaeoLine::SelectedObject) ;
currentSunColor = al->getLineColor(ArchaeoLine::CurrentSun); currentSunColor = al->getLineColor(ArchaeoLine::CurrentSun);
currentMoonColor = al->getLineColor(ArchaeoLine::CurrentMoon); currentMoonColor = al->getLineColor(ArchaeoLine::CurrentMoon);
currentPlanetColor = al->getLineColor(ArchaeoLine::CurrentPlanetNo ne); currentPlanetColor = al->getLineColor(ArchaeoLine::CurrentPlanetNo ne);
geographicLocation1Color = al->getLineColor(ArchaeoLine::Geographic Location1); geographicLocation1Color = al->getLineColor(ArchaeoLine::Geographic Location1);
geographicLocation2Color = al->getLineColor(ArchaeoLine::Geographic Location2); geographicLocation2Color = al->getLineColor(ArchaeoLine::Geographic Location2);
customAzimuth1Color = al->getLineColor(ArchaeoLine::CustomAzimuth1) ; customAzimuth1Color = al->getLineColor(ArchaeoLine::CustomAzimuth1) ;
customAzimuth2Color = al->getLineColor(ArchaeoLine::CustomAzimuth2) ; customAzimuth2Color = al->getLineColor(ArchaeoLine::CustomAzimuth2) ;
customDeclination1Color = al->getLineColor(ArchaeoLine::CustomDecli
nation1);
customDeclination2Color = al->getLineColor(ArchaeoLine::CustomDecli
nation2);
equinoxColorPixmap=QPixmap(48, 12); equinoxColorPixmap=QPixmap(48, 12);
equinoxColorPixmap.fill(equinoxColor); equinoxColorPixmap.fill(equinoxColor);
ui->equinoxColorToolButton->setIconSize(QSize(48, 12)); ui->equinoxColorToolButton->setIconSize(QSize(48, 12));
ui->equinoxColorToolButton->setIcon(QIcon(equinoxColorPixmap)); ui->equinoxColorToolButton->setIcon(QIcon(equinoxColorPixmap));
solsticeColorPixmap=QPixmap(48, 12); solsticeColorPixmap=QPixmap(48, 12);
solsticeColorPixmap.fill(solsticeColor); solsticeColorPixmap.fill(solsticeColor);
ui->solsticesColorToolButton->setIconSize(QSize(48, 12)); ui->solsticesColorToolButton->setIconSize(QSize(48, 12));
ui->solsticesColorToolButton->setIcon(QIcon(solsticeColorPixmap)); ui->solsticesColorToolButton->setIcon(QIcon(solsticeColorPixmap));
crossquarterColorPixmap=QPixmap(48, 12); crossquarterColorPixmap=QPixmap(48, 12);
crossquarterColorPixmap.fill(crossquarterColor); crossquarterColorPixmap.fill(crossquarterColor);
skipping to change at line 180 skipping to change at line 191
ui->geographicLocation2ColorToolButton->setIconSize(QSize(48, 12)); ui->geographicLocation2ColorToolButton->setIconSize(QSize(48, 12));
ui->geographicLocation2ColorToolButton->setIcon(QIcon(geographicLoca tion2ColorPixmap)); ui->geographicLocation2ColorToolButton->setIcon(QIcon(geographicLoca tion2ColorPixmap));
customAzimuth1ColorPixmap=QPixmap(48, 12); customAzimuth1ColorPixmap=QPixmap(48, 12);
customAzimuth1ColorPixmap.fill(customAzimuth1Color); customAzimuth1ColorPixmap.fill(customAzimuth1Color);
ui->customAzimuth1ColorToolButton->setIconSize(QSize(48, 12)); ui->customAzimuth1ColorToolButton->setIconSize(QSize(48, 12));
ui->customAzimuth1ColorToolButton->setIcon(QIcon(customAzimuth1Color Pixmap)); ui->customAzimuth1ColorToolButton->setIcon(QIcon(customAzimuth1Color Pixmap));
customAzimuth2ColorPixmap=QPixmap(48, 12); customAzimuth2ColorPixmap=QPixmap(48, 12);
customAzimuth2ColorPixmap.fill(customAzimuth2Color); customAzimuth2ColorPixmap.fill(customAzimuth2Color);
ui->customAzimuth2ColorToolButton->setIconSize(QSize(48, 12)); ui->customAzimuth2ColorToolButton->setIconSize(QSize(48, 12));
ui->customAzimuth2ColorToolButton->setIcon(QIcon(customAzimuth2Color Pixmap)); ui->customAzimuth2ColorToolButton->setIcon(QIcon(customAzimuth2Color Pixmap));
customDeclination1ColorPixmap=QPixmap(48, 12);
customDeclination1ColorPixmap.fill(customDeclination1Color);
ui->customDeclination1ColorToolButton->setIconSize(QSize(48, 12));
ui->customDeclination1ColorToolButton->setIcon(QIcon(customDeclinati
on1ColorPixmap));
customDeclination2ColorPixmap=QPixmap(48, 12);
customDeclination2ColorPixmap.fill(customDeclination2Color);
ui->customDeclination2ColorToolButton->setIconSize(QSize(48, 12));
ui->customDeclination2ColorToolButton->setIcon(QIcon(customDeclinati
on2ColorPixmap));
} }
connect(ui->equinoxColorToolButton, SIGNAL(released()), this, SLOT(askEquinoxColor())); connect(ui->equinoxColorToolButton, SIGNAL(released()), this, SLOT(askEquinoxColor()));
connect(ui->solsticesColorToolButton, SIGNAL(released()), this, SLOT(askSolsticeColor())); connect(ui->solsticesColorToolButton, SIGNAL(released()), this, SLOT(askSolsticeColor()));
connect(ui->crossquarterColorToolButton, SIGNAL(released()), this, SLOT(askCrossquarterColor())); connect(ui->crossquarterColorToolButton, SIGNAL(released()), this, SLOT(askCrossquarterColor()));
connect(ui->majorStandstillColorToolButton, SIGNAL(released()), this, SLOT(askMajorStandstillColor())); connect(ui->majorStandstillColorToolButton, SIGNAL(released()), this, SLOT(askMajorStandstillColor()));
connect(ui->minorStandstillColorToolButton, SIGNAL(released()), this, SLOT(askMinorStandstillColor())); connect(ui->minorStandstillColorToolButton, SIGNAL(released()), this, SLOT(askMinorStandstillColor()));
connect(ui->zenithPassageColorToolButton, SIGNAL(released()), this, SLOT(askZenithPassageColor())); connect(ui->zenithPassageColorToolButton, SIGNAL(released()), this, SLOT(askZenithPassageColor()));
connect(ui->nadirPassageColorToolButton, SIGNAL(released()), this, SLOT(askNadirPassageColor())); connect(ui->nadirPassageColorToolButton, SIGNAL(released()), this, SLOT(askNadirPassageColor()));
connect(ui->selectedObjectColorToolButton, SIGNAL(released()), this, SLOT(askSelectedObjectColor())); connect(ui->selectedObjectColorToolButton, SIGNAL(released()), this, SLOT(askSelectedObjectColor()));
connect(ui->currentSunColorToolButton, SIGNAL(released()), this, SLOT(askCurrentSunColor())); connect(ui->currentSunColorToolButton, SIGNAL(released()), this, SLOT(askCurrentSunColor()));
connect(ui->currentMoonColorToolButton, SIGNAL(released()), this, SLOT(askCurrentMoonColor())); connect(ui->currentMoonColorToolButton, SIGNAL(released()), this, SLOT(askCurrentMoonColor()));
connect(ui->currentPlanetColorToolButton, SIGNAL(released()), this, SLOT(askCurrentPlanetColor())); connect(ui->currentPlanetColorToolButton, SIGNAL(released()), this, SLOT(askCurrentPlanetColor()));
connect(ui->geographicLocation1ColorToolButton, SIGNAL(released()), this, SLOT(askGeographicLocation1Color())); connect(ui->geographicLocation1ColorToolButton, SIGNAL(released()), this, SLOT(askGeographicLocation1Color()));
connect(ui->geographicLocation2ColorToolButton, SIGNAL(released()), this, SLOT(askGeographicLocation2Color())); connect(ui->geographicLocation2ColorToolButton, SIGNAL(released()), this, SLOT(askGeographicLocation2Color()));
connect(ui->customAzimuth1ColorToolButton, SIGNAL(released()), this, SLOT(askCustomAzimuth1Color())); connect(ui->customAzimuth1ColorToolButton, SIGNAL(released()), this, SLOT(askCustomAzimuth1Color()));
connect(ui->customAzimuth2ColorToolButton, SIGNAL(released()), this, SLOT(askCustomAzimuth2Color())); connect(ui->customAzimuth2ColorToolButton, SIGNAL(released()), this, SLOT(askCustomAzimuth2Color()));
connect(ui->customDeclination1ColorToolButton, SIGNAL(released()),
this, SLOT(askCustomDeclination1Color()));
connect(ui->customDeclination2ColorToolButton, SIGNAL(released()),
this, SLOT(askCustomDeclination2Color()));
connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(res etArchaeoLinesSettings())); connect(ui->restoreDefaultsButton, SIGNAL(clicked()), this, SLOT(res etArchaeoLinesSettings()));
// We must apparently warn about a potential problem, but only on Wi ndows in OpenGL mode. (QTBUG-35302?) // We must apparently warn about a potential problem, but only on Wi ndows in OpenGL mode. (QTBUG-35302?)
#ifndef Q_OS_WIN #ifndef Q_OS_WIN
ui->switchToWindowedModeLabel->hide(); ui->switchToWindowedModeLabel->hide();
#else #else
QString glRenderer(reinterpret_cast<const char*>(glGetString(GL_REND ERER))); QString glRenderer(reinterpret_cast<const char*>(glGetString(GL_REND ERER)));
if (glRenderer.startsWith("ANGLE", Qt::CaseSensitive)) if (glRenderer.startsWith("ANGLE", Qt::CaseSensitive))
ui->switchToWindowedModeLabel->hide(); ui->switchToWindowedModeLabel->hide();
skipping to change at line 250 skipping to change at line 271
html += "<li>" + q_("Current declination of the sun") + "</li>"; html += "<li>" + q_("Current declination of the sun") + "</li>";
html += "<li>" + q_("Current declination of the moon") + "</li>"; html += "<li>" + q_("Current declination of the moon") + "</li>";
html += "<li>" + q_("Current declination of a naked-eye planet") + " </li></ul>"; html += "<li>" + q_("Current declination of a naked-eye planet") + " </li></ul>";
html += "<p>" + q_("The lunar lines include horizon parallax effects . " html += "<p>" + q_("The lunar lines include horizon parallax effects . "
"There are two lines each drawn, for maximum and minimum distance of the moon. " "There are two lines each drawn, for maximum and minimum distance of the moon. "
"Note that declination of the moon at the major s tandstill can exceed the " "Note that declination of the moon at the major s tandstill can exceed the "
"indicated limits if it is high in the sky due to parallax effects.") + "</p>"; "indicated limits if it is high in the sky due to parallax effects.") + "</p>";
html += "<p>" + q_("Some religions, most notably Islam, adhere to a practice of observing a prayer direction towards a particular location. " html += "<p>" + q_("Some religions, most notably Islam, adhere to a practice of observing a prayer direction towards a particular location. "
"Azimuth lines for two locations can be shown. De fault locations are Mecca (Kaaba) and Jerusalem. " "Azimuth lines for two locations can be shown. De fault locations are Mecca (Kaaba) and Jerusalem. "
"The directions are computed based on spherical t rigonometry on a spherical Earth.") + "</p>"; "The directions are computed based on spherical t rigonometry on a spherical Earth.") + "</p>";
html += "<p>" + q_("In addition, up to two vertical lines with arbit rary azimuth and custom label can be shown.") + "</p>"; html += "<p>" + q_("In addition, up to two vertical lines with arbit rary azimuth and declination lines with custom label can be shown.") + "</p >";
html += "<h3>" + q_("Links") + "</h3>"; html += "<h3>" + q_("Links") + "</h3>";
html += "<p>" + QString(q_("Support is provided via the Launchpad we bsite. Be sure to put \"%1\" in the subject when posting.")).arg("ArchaeoL ines plugin") + "</p>"; html += "<p>" + QString(q_("Support is provided via the Launchpad we bsite. Be sure to put \"%1\" in the subject when posting.")).arg("ArchaeoL ines plugin") + "</p>";
html += "<p><ul>"; html += "<p><ul>";
// TRANSLATORS: The numbers contain the opening and closing tag of a n HTML link // TRANSLATORS: The numbers contain the opening and closing tag of a n HTML link
html += "<li>" + QString(q_("If you have a question, you can %1get a n answer here%2").arg("<a href=\"https://answers.launchpad.net/stellarium\" >")).arg("</a>") + "</li>"; html += "<li>" + QString(q_("If you have a question, you can %1get a n answer here%2").arg("<a href=\"https://answers.launchpad.net/stellarium\" >")).arg("</a>") + "</li>";
// TRANSLATORS: The numbers contain the opening and closing tag of a n HTML link // TRANSLATORS: The numbers contain the opening and closing tag of a n HTML link
html += "<li>" + QString(q_("Bug reports can be made %1here%2.")).ar g("<a href=\"https://bugs.launchpad.net/stellarium\">").arg("</a>") + "</li >"; html += "<li>" + QString(q_("Bug reports can be made %1here%2.")).ar g("<a href=\"https://bugs.launchpad.net/stellarium\">").arg("</a>") + "</li >";
// TRANSLATORS: The numbers contain the opening and closing tag of a n HTML link // TRANSLATORS: The numbers contain the opening and closing tag of a n HTML link
html += "<li>" + q_("If you would like to make a feature request, yo u can create a bug report, and set the severity to \"wishlist\".") + "</li> "; html += "<li>" + q_("If you would like to make a feature request, yo u can create a bug report, and set the severity to \"wishlist\".") + "</li> ";
skipping to change at line 293 skipping to change at line 314
zenithPassageColor = al->getLineColor(ArchaeoLine::ZenithPassage); zenithPassageColor = al->getLineColor(ArchaeoLine::ZenithPassage);
nadirPassageColor = al->getLineColor(ArchaeoLine::NadirPassage); nadirPassageColor = al->getLineColor(ArchaeoLine::NadirPassage);
selectedObjectColor = al->getLineColor(ArchaeoLine::SelectedObject) ; selectedObjectColor = al->getLineColor(ArchaeoLine::SelectedObject) ;
currentSunColor = al->getLineColor(ArchaeoLine::CurrentSun); currentSunColor = al->getLineColor(ArchaeoLine::CurrentSun);
currentMoonColor = al->getLineColor(ArchaeoLine::CurrentMoon); currentMoonColor = al->getLineColor(ArchaeoLine::CurrentMoon);
currentPlanetColor = al->getLineColor(ArchaeoLine::CurrentPlanetNo ne); currentPlanetColor = al->getLineColor(ArchaeoLine::CurrentPlanetNo ne);
geographicLocation1Color = al->getLineColor(ArchaeoLine::Geographic Location1); geographicLocation1Color = al->getLineColor(ArchaeoLine::Geographic Location1);
geographicLocation2Color = al->getLineColor(ArchaeoLine::Geographic Location2); geographicLocation2Color = al->getLineColor(ArchaeoLine::Geographic Location2);
customAzimuth1Color = al->getLineColor(ArchaeoLine::CustomAzimuth1) ; customAzimuth1Color = al->getLineColor(ArchaeoLine::CustomAzimuth1) ;
customAzimuth2Color = al->getLineColor(ArchaeoLine::CustomAzimuth2) ; customAzimuth2Color = al->getLineColor(ArchaeoLine::CustomAzimuth2) ;
customDeclination1Color = al->getLineColor(ArchaeoLine::CustomDecli
nation1);
customDeclination2Color = al->getLineColor(ArchaeoLine::CustomDecli
nation2);
equinoxColorPixmap.fill(equinoxColor); equinoxColorPixmap.fill(equinoxColor);
ui->equinoxColorToolButton->setIcon(QIcon(equinoxColorPixmap)); ui->equinoxColorToolButton->setIcon(QIcon(equinoxColorPixmap));
solsticeColorPixmap.fill(solsticeColor); solsticeColorPixmap.fill(solsticeColor);
ui->solsticesColorToolButton->setIcon(QIcon(solsticeColorPixmap)); ui->solsticesColorToolButton->setIcon(QIcon(solsticeColorPixmap));
crossquarterColorPixmap.fill(crossquarterColor); crossquarterColorPixmap.fill(crossquarterColor);
ui->crossquarterColorToolButton->setIcon(QIcon(crossquarterColorPixm ap)); ui->crossquarterColorToolButton->setIcon(QIcon(crossquarterColorPixm ap));
minorStandstillColorPixmap.fill(minorStandstillColor); minorStandstillColorPixmap.fill(minorStandstillColor);
ui->minorStandstillColorToolButton->setIcon(QIcon(minorStandstillCol orPixmap)); ui->minorStandstillColorToolButton->setIcon(QIcon(minorStandstillCol orPixmap));
majorStandstillColorPixmap.fill(majorStandstillColor); majorStandstillColorPixmap.fill(majorStandstillColor);
ui->majorStandstillColorToolButton->setIcon(QIcon(majorStandstillCol orPixmap)); ui->majorStandstillColorToolButton->setIcon(QIcon(majorStandstillCol orPixmap));
skipping to change at line 323 skipping to change at line 346
currentPlanetColorPixmap.fill(currentPlanetColor); currentPlanetColorPixmap.fill(currentPlanetColor);
ui->currentPlanetColorToolButton->setIcon(QIcon(currentPlanetColorPi xmap)); ui->currentPlanetColorToolButton->setIcon(QIcon(currentPlanetColorPi xmap));
geographicLocation1ColorPixmap.fill(geographicLocation1Color); geographicLocation1ColorPixmap.fill(geographicLocation1Color);
ui->geographicLocation1ColorToolButton->setIcon(QIcon(geographicLoca tion1ColorPixmap)); ui->geographicLocation1ColorToolButton->setIcon(QIcon(geographicLoca tion1ColorPixmap));
geographicLocation2ColorPixmap.fill(geographicLocation2Color); geographicLocation2ColorPixmap.fill(geographicLocation2Color);
ui->geographicLocation2ColorToolButton->setIcon(QIcon(geographicLoca tion2ColorPixmap)); ui->geographicLocation2ColorToolButton->setIcon(QIcon(geographicLoca tion2ColorPixmap));
customAzimuth1ColorPixmap.fill(customAzimuth1Color); customAzimuth1ColorPixmap.fill(customAzimuth1Color);
ui->customAzimuth1ColorToolButton->setIcon(QIcon(customAzimuth1Color Pixmap)); ui->customAzimuth1ColorToolButton->setIcon(QIcon(customAzimuth1Color Pixmap));
customAzimuth2ColorPixmap.fill(customAzimuth2Color); customAzimuth2ColorPixmap.fill(customAzimuth2Color);
ui->customAzimuth2ColorToolButton->setIcon(QIcon(customAzimuth2Color Pixmap)); ui->customAzimuth2ColorToolButton->setIcon(QIcon(customAzimuth2Color Pixmap));
customDeclination1ColorPixmap.fill(customDeclination1Color);
// These should no longer be required due to property connections. ui->customDeclination1ColorToolButton->setIcon(QIcon(customDeclinati
// ui->equinoxCheckBox->setChecked(al->isEquinoxDisplayed()); on1ColorPixmap));
// ui->solsticesCheckBox->setChecked(al->isSolsticesDisplayed()); customDeclination2ColorPixmap.fill(customDeclination2Color);
// ui->crossquarterCheckBox->setChecked(al->isCrossquartersDisplayed()) ui->customDeclination2ColorToolButton->setIcon(QIcon(customDeclinati
; on2ColorPixmap));
// ui->majorStandstillCheckBox->setChecked(al->isMajorStandstillsDispla
yed());
// ui->minorStandstillCheckBox->setChecked(al->isMinorStandstillsDispla
yed());
// ui->zenithPassageCheckBox->setChecked(al->isZenithPassageDisplayed()
);
// ui->nadirPassageCheckBox->setChecked(al->isNadirPassageDisplayed());
// ui->selectedObjectCheckBox->setChecked(al->isSelectedObjectDisplayed
());
// ui->currentSunCheckBox->setChecked(al->isCurrentSunDisplayed());
// ui->currentMoonCheckBox->setChecked(al->isCurrentMoonDisplayed());
// ui->currentPlanetComboBox->setCurrentIndex(al->whichCurrentPlanetDis
played()-ArchaeoLine::CurrentPlanetNone);
// ui->geographicLocation1CheckBox->setChecked(al->isGeographicLocation
1Displayed());
// ui->geographicLocation2CheckBox->setChecked(al->isGeographicLocation
2Displayed());
// ui->customAzimuth1CheckBox->setChecked(al->isCustomAzimuth1Displayed
());
// ui->customAzimuth2CheckBox->setChecked(al->isCustomAzimuth2Displayed
());
// ui->geographicLocation1LongitudeDoubleSpinBox->setValue(al->getGeogr
aphicLocation1Longitude());
// ui->geographicLocation1LatitudeDoubleSpinBox->setValue(al->getGeogra
phicLocation1Latitude());
// ui->geographicLocation2LongitudeDoubleSpinBox->setValue(al->getGeogr
aphicLocation2Longitude());
// ui->geographicLocation2LatitudeDoubleSpinBox->setValue(al->getGeogra
phicLocation2Latitude());
ui->geographicLocation1LineEdit->setText(al->getLineLabel(ArchaeoLin e::GeographicLocation1)); ui->geographicLocation1LineEdit->setText(al->getLineLabel(ArchaeoLin e::GeographicLocation1));
ui->geographicLocation2LineEdit->setText(al->getLineLabel(ArchaeoLin e::GeographicLocation2)); ui->geographicLocation2LineEdit->setText(al->getLineLabel(ArchaeoLin e::GeographicLocation2));
ui->customAzimuth1LineEdit->setText(al->getLineLabel(ArchaeoLine::Cu stomAzimuth1)); ui->customAzimuth1LineEdit->setText(al->getLineLabel(ArchaeoLine::Cu stomAzimuth1));
ui->customAzimuth2LineEdit->setText(al->getLineLabel(ArchaeoLine::Cu stomAzimuth2)); ui->customAzimuth2LineEdit->setText(al->getLineLabel(ArchaeoLine::Cu stomAzimuth2));
ui->customDeclination1LineEdit->setText(al->getLineLabel(ArchaeoLine
::CustomDeclination1));
ui->customDeclination2LineEdit->setText(al->getLineLabel(ArchaeoLine
::CustomDeclination2));
} }
// These are called by the respective buttons. // These are called by the respective buttons.
void ArchaeoLinesDialog::askEquinoxColor() void ArchaeoLinesDialog::askEquinoxColor()
{ {
QColor c=QColorDialog::getColor(equinoxColor, NULL, q_("Select color for equinox line")); QColor c=QColorDialog::getColor(equinoxColor, NULL, q_("Select color for equinox line"));
if (c.isValid()) if (c.isValid())
{ {
equinoxColor=c; equinoxColor=c;
al->setLineColor(ArchaeoLine::Equinox, c); al->setLineColor(ArchaeoLine::Equinox, c);
skipping to change at line 517 skipping to change at line 525
{ {
QColor c=QColorDialog::getColor(customAzimuth2Color, NULL, q_("Selec t color for Custom Azimuth 2 line")); QColor c=QColorDialog::getColor(customAzimuth2Color, NULL, q_("Selec t color for Custom Azimuth 2 line"));
if (c.isValid()) if (c.isValid())
{ {
customAzimuth2Color=c; customAzimuth2Color=c;
al->setLineColor(ArchaeoLine::CustomAzimuth2, c); al->setLineColor(ArchaeoLine::CustomAzimuth2, c);
customAzimuth2ColorPixmap.fill(c); customAzimuth2ColorPixmap.fill(c);
ui->customAzimuth2ColorToolButton->setIcon(QIcon(customAzimu th2ColorPixmap)); ui->customAzimuth2ColorToolButton->setIcon(QIcon(customAzimu th2ColorPixmap));
} }
} }
void ArchaeoLinesDialog::askCustomDeclination1Color()
{
QColor c=QColorDialog::getColor(customDeclination1Color, NULL, q_("S
elect color for Custom Declination 1 line"));
if (c.isValid())
{
customDeclination1Color=c;
al->setLineColor(ArchaeoLine::CustomDeclination1, c);
customDeclination1ColorPixmap.fill(c);
ui->customDeclination1ColorToolButton->setIcon(QIcon(customD
eclination1ColorPixmap));
}
}
void ArchaeoLinesDialog::askCustomDeclination2Color()
{
QColor c=QColorDialog::getColor(customDeclination2Color, NULL, q_("S
elect color for Custom Declination 2 line"));
if (c.isValid())
{
customDeclination2Color=c;
al->setLineColor(ArchaeoLine::CustomDeclination2, c);
customDeclination2ColorPixmap.fill(c);
ui->customDeclination2ColorToolButton->setIcon(QIcon(customD
eclination2ColorPixmap));
}
}
// Notes/Observations by GZ in 2015-04 with Qt5.4.0/MinGW on Windows7SP1. // Notes/Observations by GZ in 2015-04 with Qt5.4.0/MinGW on Windows7SP1.
// (1) There are issues in calling the QColorPanel that seem to be related to QTBUG-35302, // (1) There are issues in calling the QColorPanel that seem to be related to QTBUG-35302,
// although it was reportedly fixed at least for X11 in Qt5.3.0. // although it was reportedly fixed at least for X11 in Qt5.3.0.
// On Win7 with NVidia Geforce and Win8.1 on Radeon, the color panel hides behind the Stellarium main window if set to fullscreen. // On Win7 with NVidia Geforce and Win8.1 on Radeon, the color panel hides behind the Stellarium main window if set to fullscreen.
// On Win7 with Intel HD4600, and various Linuces, no problem is seen, the color panel is right on top of the fullscreen main window. // On Win7 with Intel HD4600, and various Linuces, no problem is seen, the color panel is right on top of the fullscreen main window.
// It seems not to depend on MinGW vs. MSVC builds, but on details in GPU d rivers and Qt. // It seems not to depend on MinGW vs. MSVC builds, but on details in GPU d rivers and Qt.
// (2) Likely another bug in QColorDialog: If you choose one of the preconf igured colors (left half), // (2) Likely another bug in QColorDialog: If you choose one of the preconf igured colors (left half),
// on next change of that color it will have toggled one high bit of one co mponent. // on next change of that color it will have toggled one high bit of one co mponent.
 End of changes. 9 change blocks. 
36 lines changed or deleted 76 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/