ArchaeoLinesDialog.cpp   ArchaeoLinesDialog.cpp 
skipping to change at line 33 skipping to change at line 33
#include "StelApp.hpp" #include "StelApp.hpp"
#include "StelLocaleMgr.hpp" #include "StelLocaleMgr.hpp"
#include "StelModule.hpp" #include "StelModule.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelMainView.hpp" #include "StelMainView.hpp"
#include "StelOpenGL.hpp" #include "StelOpenGL.hpp"
ArchaeoLinesDialog::ArchaeoLinesDialog() ArchaeoLinesDialog::ArchaeoLinesDialog()
: StelDialog("ArchaeoLines") : StelDialog("ArchaeoLines")
, al(NULL) , al(Q_NULLPTR)
{ {
ui = new Ui_archaeoLinesDialog(); ui = new Ui_archaeoLinesDialog();
} }
ArchaeoLinesDialog::~ArchaeoLinesDialog() ArchaeoLinesDialog::~ArchaeoLinesDialog()
{ {
delete ui; ui=NULL; delete ui; ui=Q_NULLPTR;
} }
void ArchaeoLinesDialog::retranslate() void ArchaeoLinesDialog::retranslate()
{ {
if (dialog) if (dialog)
{ {
ui->retranslateUi(dialog); ui->retranslateUi(dialog);
setAboutHtml(); setAboutHtml();
} }
} }
skipping to change at line 287 skipping to change at line 287
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> ";
//// TRANSLATORS: The numbers contain the opening and closing tag of an HTML link //// TRANSLATORS: The numbers contain the opening and closing tag of an HTML link
//html += "<li>" + q_("If you want to read full information about th is plugin and its history, you can %1get info here%2.").arg("<a href=\"http ://stellarium.org/wiki/index.php/ArchaeoLines_plugin\">").arg("</a>") + "</ li>"; //html += "<li>" + q_("If you want to read full information about th is plugin and its history, you can %1get info here%2.").arg("<a href=\"http ://stellarium.org/wiki/index.php/ArchaeoLines_plugin\">").arg("</a>") + "</ li>";
html += "</ul></p></body></html>"; html += "</ul></p></body></html>";
StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( )); StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui( ));
if(gui!=NULL) if(gui!=Q_NULLPTR)
{ {
QString htmlStyleSheet(gui->getStelStyle().htmlStyleSheet); QString htmlStyleSheet(gui->getStelStyle().htmlStyleSheet);
ui->aboutTextBrowser->document()->setDefaultStyleSheet(htmlS tyleSheet); ui->aboutTextBrowser->document()->setDefaultStyleSheet(htmlS tyleSheet);
} }
ui->aboutTextBrowser->setHtml(html); ui->aboutTextBrowser->setHtml(html);
} }
void ArchaeoLinesDialog::resetArchaeoLinesSettings() void ArchaeoLinesDialog::resetArchaeoLinesSettings()
{ {
skipping to change at line 362 skipping to change at line 362
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->customDeclination1LineEdit->setText(al->getLineLabel(ArchaeoLine ::CustomDeclination1));
ui->customDeclination2LineEdit->setText(al->getLineLabel(ArchaeoLine ::CustomDeclination2)); 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, Q_NULLPTR, 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);
equinoxColorPixmap.fill(c); equinoxColorPixmap.fill(c);
ui->equinoxColorToolButton->setIcon(QIcon(equinoxColorPixmap )); ui->equinoxColorToolButton->setIcon(QIcon(equinoxColorPixmap ));
} }
} }
void ArchaeoLinesDialog::askSolsticeColor() void ArchaeoLinesDialog::askSolsticeColor()
{ {
QColor c=QColorDialog::getColor(solsticeColor, NULL, q_("Select colo r for solstice lines")); QColor c=QColorDialog::getColor(solsticeColor, Q_NULLPTR, q_("Select color for solstice lines"));
if (c.isValid()) if (c.isValid())
{ {
solsticeColor=c; solsticeColor=c;
al->setLineColor(ArchaeoLine::Solstices, c); al->setLineColor(ArchaeoLine::Solstices, c);
solsticeColorPixmap.fill(c); solsticeColorPixmap.fill(c);
ui->solsticesColorToolButton->setIcon(QIcon(solsticeColorPix map)); ui->solsticesColorToolButton->setIcon(QIcon(solsticeColorPix map));
} }
} }
void ArchaeoLinesDialog::askCrossquarterColor() void ArchaeoLinesDialog::askCrossquarterColor()
{ {
QColor c=QColorDialog::getColor(crossquarterColor, NULL, q_("Select color for crossquarter lines")); QColor c=QColorDialog::getColor(crossquarterColor, Q_NULLPTR, q_("Se lect color for crossquarter lines"));
if (c.isValid()) if (c.isValid())
{ {
crossquarterColor=c; crossquarterColor=c;
al->setLineColor(ArchaeoLine::Crossquarters, c); al->setLineColor(ArchaeoLine::Crossquarters, c);
crossquarterColorPixmap.fill(c); crossquarterColorPixmap.fill(c);
ui->crossquarterColorToolButton->setIcon(QIcon(crossquarterC olorPixmap)); ui->crossquarterColorToolButton->setIcon(QIcon(crossquarterC olorPixmap));
} }
} }
void ArchaeoLinesDialog::askMajorStandstillColor() void ArchaeoLinesDialog::askMajorStandstillColor()
{ {
QColor c=QColorDialog::getColor(majorStandstillColor, NULL, q_("Sele ct color for major standstill lines")); QColor c=QColorDialog::getColor(majorStandstillColor, Q_NULLPTR, q_( "Select color for major standstill lines"));
if (c.isValid()) if (c.isValid())
{ {
majorStandstillColor=c; majorStandstillColor=c;
al->setLineColor(ArchaeoLine::MajorStandstill, c); al->setLineColor(ArchaeoLine::MajorStandstill, c);
majorStandstillColorPixmap.fill(c); majorStandstillColorPixmap.fill(c);
ui->majorStandstillColorToolButton->setIcon(QIcon(majorStand stillColorPixmap)); ui->majorStandstillColorToolButton->setIcon(QIcon(majorStand stillColorPixmap));
} }
} }
void ArchaeoLinesDialog::askMinorStandstillColor() void ArchaeoLinesDialog::askMinorStandstillColor()
{ {
QColor c=QColorDialog::getColor(minorStandstillColor, NULL, q_("Sele ct color for minor standstill lines")); QColor c=QColorDialog::getColor(minorStandstillColor, Q_NULLPTR, q_( "Select color for minor standstill lines"));
if (c.isValid()) if (c.isValid())
{ {
minorStandstillColor=c; minorStandstillColor=c;
al->setLineColor(ArchaeoLine::MinorStandstill, c); al->setLineColor(ArchaeoLine::MinorStandstill, c);
minorStandstillColorPixmap.fill(c); minorStandstillColorPixmap.fill(c);
ui->minorStandstillColorToolButton->setIcon(QIcon(minorStand stillColorPixmap)); ui->minorStandstillColorToolButton->setIcon(QIcon(minorStand stillColorPixmap));
} }
} }
void ArchaeoLinesDialog::askZenithPassageColor() void ArchaeoLinesDialog::askZenithPassageColor()
{ {
QColor c=QColorDialog::getColor(zenithPassageColor, NULL, q_("Select color for zenith passage line")); QColor c=QColorDialog::getColor(zenithPassageColor, Q_NULLPTR, q_("S elect color for zenith passage line"));
if (c.isValid()) if (c.isValid())
{ {
zenithPassageColor=c; zenithPassageColor=c;
al->setLineColor(ArchaeoLine::ZenithPassage, c); al->setLineColor(ArchaeoLine::ZenithPassage, c);
zenithPassageColorPixmap.fill(c); zenithPassageColorPixmap.fill(c);
ui->zenithPassageColorToolButton->setIcon(QIcon(zenithPassag eColorPixmap)); ui->zenithPassageColorToolButton->setIcon(QIcon(zenithPassag eColorPixmap));
} }
} }
void ArchaeoLinesDialog::askNadirPassageColor() void ArchaeoLinesDialog::askNadirPassageColor()
{ {
QColor c=QColorDialog::getColor(nadirPassageColor, NULL, q_("Select color for nadir passage line")); QColor c=QColorDialog::getColor(nadirPassageColor, Q_NULLPTR, q_("Se lect color for nadir passage line"));
if (c.isValid()) if (c.isValid())
{ {
nadirPassageColor=c; nadirPassageColor=c;
al->setLineColor(ArchaeoLine::NadirPassage, c); al->setLineColor(ArchaeoLine::NadirPassage, c);
nadirPassageColorPixmap.fill(c); nadirPassageColorPixmap.fill(c);
ui->nadirPassageColorToolButton->setIcon(QIcon(nadirPassageC olorPixmap)); ui->nadirPassageColorToolButton->setIcon(QIcon(nadirPassageC olorPixmap));
} }
} }
void ArchaeoLinesDialog::askSelectedObjectColor() void ArchaeoLinesDialog::askSelectedObjectColor()
{ {
QColor c=QColorDialog::getColor(selectedObjectColor, NULL, q_("Selec t color for selected object line")); QColor c=QColorDialog::getColor(selectedObjectColor, Q_NULLPTR, q_(" Select color for selected object line"));
if (c.isValid()) if (c.isValid())
{ {
selectedObjectColor=c; selectedObjectColor=c;
al->setLineColor(ArchaeoLine::SelectedObject, c); al->setLineColor(ArchaeoLine::SelectedObject, c);
selectedObjectColorPixmap.fill(c); selectedObjectColorPixmap.fill(c);
ui->selectedObjectColorToolButton->setIcon(QIcon(selectedObj ectColorPixmap)); ui->selectedObjectColorToolButton->setIcon(QIcon(selectedObj ectColorPixmap));
} }
} }
void ArchaeoLinesDialog::askCurrentSunColor() void ArchaeoLinesDialog::askCurrentSunColor()
{ {
QColor c=QColorDialog::getColor(currentSunColor, NULL, q_("Select co lor for current sun line")); QColor c=QColorDialog::getColor(currentSunColor, Q_NULLPTR, q_("Sele ct color for current sun line"));
if (c.isValid()) if (c.isValid())
{ {
currentSunColor=c; currentSunColor=c;
al->setLineColor(ArchaeoLine::CurrentSun, c); al->setLineColor(ArchaeoLine::CurrentSun, c);
currentSunColorPixmap.fill(c); currentSunColorPixmap.fill(c);
ui->currentSunColorToolButton->setIcon(QIcon(currentSunColor Pixmap)); ui->currentSunColorToolButton->setIcon(QIcon(currentSunColor Pixmap));
} }
} }
void ArchaeoLinesDialog::askCurrentMoonColor() void ArchaeoLinesDialog::askCurrentMoonColor()
{ {
QColor c=QColorDialog::getColor(currentMoonColor, NULL, q_("Select c olor for current moon line")); QColor c=QColorDialog::getColor(currentMoonColor, Q_NULLPTR, q_("Sel ect color for current moon line"));
if (c.isValid()) if (c.isValid())
{ {
currentMoonColor=c; currentMoonColor=c;
al->setLineColor(ArchaeoLine::CurrentMoon, c); al->setLineColor(ArchaeoLine::CurrentMoon, c);
currentMoonColorPixmap.fill(c); currentMoonColorPixmap.fill(c);
ui->currentMoonColorToolButton->setIcon(QIcon(currentMoonCol orPixmap)); ui->currentMoonColorToolButton->setIcon(QIcon(currentMoonCol orPixmap));
} }
} }
void ArchaeoLinesDialog::askCurrentPlanetColor() void ArchaeoLinesDialog::askCurrentPlanetColor()
{ {
QColor c=QColorDialog::getColor(currentPlanetColor, NULL, q_("Select color for current planet line")); QColor c=QColorDialog::getColor(currentPlanetColor, Q_NULLPTR, q_("S elect color for current planet line"));
if (c.isValid()) if (c.isValid())
{ {
currentPlanetColor=c; currentPlanetColor=c;
al->setLineColor(ArchaeoLine::CurrentPlanetNone, c); al->setLineColor(ArchaeoLine::CurrentPlanetNone, c);
currentPlanetColorPixmap.fill(c); currentPlanetColorPixmap.fill(c);
ui->currentPlanetColorToolButton->setIcon(QIcon(currentPlane tColorPixmap)); ui->currentPlanetColorToolButton->setIcon(QIcon(currentPlane tColorPixmap));
} }
} }
void ArchaeoLinesDialog::askGeographicLocation1Color() void ArchaeoLinesDialog::askGeographicLocation1Color()
{ {
QColor c=QColorDialog::getColor(geographicLocation1Color, NULL, q_(" Select color for Geographic Location 1 line")); QColor c=QColorDialog::getColor(geographicLocation1Color, Q_NULLPTR, q_("Select color for Geographic Location 1 line"));
if (c.isValid()) if (c.isValid())
{ {
geographicLocation1Color=c; geographicLocation1Color=c;
al->setLineColor(ArchaeoLine::GeographicLocation1, c); al->setLineColor(ArchaeoLine::GeographicLocation1, c);
geographicLocation1ColorPixmap.fill(c); geographicLocation1ColorPixmap.fill(c);
ui->geographicLocation1ColorToolButton->setIcon(QIcon(geogra phicLocation1ColorPixmap)); ui->geographicLocation1ColorToolButton->setIcon(QIcon(geogra phicLocation1ColorPixmap));
} }
} }
void ArchaeoLinesDialog::askGeographicLocation2Color() void ArchaeoLinesDialog::askGeographicLocation2Color()
{ {
QColor c=QColorDialog::getColor(geographicLocation2Color, NULL, q_(" Select color for Geographic Location 2 line")); QColor c=QColorDialog::getColor(geographicLocation2Color, Q_NULLPTR, q_("Select color for Geographic Location 2 line"));
if (c.isValid()) if (c.isValid())
{ {
geographicLocation2Color=c; geographicLocation2Color=c;
al->setLineColor(ArchaeoLine::GeographicLocation2, c); al->setLineColor(ArchaeoLine::GeographicLocation2, c);
geographicLocation2ColorPixmap.fill(c); geographicLocation2ColorPixmap.fill(c);
ui->geographicLocation2ColorToolButton->setIcon(QIcon(geogra phicLocation2ColorPixmap)); ui->geographicLocation2ColorToolButton->setIcon(QIcon(geogra phicLocation2ColorPixmap));
} }
} }
void ArchaeoLinesDialog::askCustomAzimuth1Color() void ArchaeoLinesDialog::askCustomAzimuth1Color()
{ {
QColor c=QColorDialog::getColor(customAzimuth1Color, NULL, q_("Selec t color for Custom Azimuth 1 line")); QColor c=QColorDialog::getColor(customAzimuth1Color, Q_NULLPTR, q_(" Select color for Custom Azimuth 1 line"));
if (c.isValid()) if (c.isValid())
{ {
customAzimuth1Color=c; customAzimuth1Color=c;
al->setLineColor(ArchaeoLine::CustomAzimuth1, c); al->setLineColor(ArchaeoLine::CustomAzimuth1, c);
customAzimuth1ColorPixmap.fill(c); customAzimuth1ColorPixmap.fill(c);
ui->customAzimuth1ColorToolButton->setIcon(QIcon(customAzimu th1ColorPixmap)); ui->customAzimuth1ColorToolButton->setIcon(QIcon(customAzimu th1ColorPixmap));
} }
} }
void ArchaeoLinesDialog::askCustomAzimuth2Color() void ArchaeoLinesDialog::askCustomAzimuth2Color()
{ {
QColor c=QColorDialog::getColor(customAzimuth2Color, NULL, q_("Selec t color for Custom Azimuth 2 line")); QColor c=QColorDialog::getColor(customAzimuth2Color, Q_NULLPTR, q_(" Select 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() void ArchaeoLinesDialog::askCustomDeclination1Color()
{ {
QColor c=QColorDialog::getColor(customDeclination1Color, NULL, q_("S elect color for Custom Declination 1 line")); QColor c=QColorDialog::getColor(customDeclination1Color, Q_NULLPTR, q_("Select color for Custom Declination 1 line"));
if (c.isValid()) if (c.isValid())
{ {
customDeclination1Color=c; customDeclination1Color=c;
al->setLineColor(ArchaeoLine::CustomDeclination1, c); al->setLineColor(ArchaeoLine::CustomDeclination1, c);
customDeclination1ColorPixmap.fill(c); customDeclination1ColorPixmap.fill(c);
ui->customDeclination1ColorToolButton->setIcon(QIcon(customD eclination1ColorPixmap)); ui->customDeclination1ColorToolButton->setIcon(QIcon(customD eclination1ColorPixmap));
} }
} }
void ArchaeoLinesDialog::askCustomDeclination2Color() void ArchaeoLinesDialog::askCustomDeclination2Color()
{ {
QColor c=QColorDialog::getColor(customDeclination2Color, NULL, q_("S elect color for Custom Declination 2 line")); QColor c=QColorDialog::getColor(customDeclination2Color, Q_NULLPTR, q_("Select color for Custom Declination 2 line"));
if (c.isValid()) if (c.isValid())
{ {
customDeclination2Color=c; customDeclination2Color=c;
al->setLineColor(ArchaeoLine::CustomDeclination2, c); al->setLineColor(ArchaeoLine::CustomDeclination2, c);
customDeclination2ColorPixmap.fill(c); customDeclination2ColorPixmap.fill(c);
ui->customDeclination2ColorToolButton->setIcon(QIcon(customD eclination2ColorPixmap)); 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.
 End of changes. 20 change blocks. 
20 lines changed or deleted 20 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/