ViewDialog.cpp   ViewDialog.cpp 
skipping to change at line 270 skipping to change at line 270
connect(nmgr, SIGNAL(typeFiltersChanged(Nebula::TypeGroup)), this, S LOT(updateSelectedTypesCheckBoxes())); connect(nmgr, SIGNAL(typeFiltersChanged(Nebula::TypeGroup)), this, S LOT(updateSelectedTypesCheckBoxes()));
connect(ui->buttonGroupDisplayedDSOTypes, SIGNAL(buttonClicked(int)) , this, SLOT(setSelectedTypesFromCheckBoxes())); connect(ui->buttonGroupDisplayedDSOTypes, SIGNAL(buttonClicked(int)) , this, SLOT(setSelectedTypesFromCheckBoxes()));
connectGroupBox(ui->groupBoxDSOTypeFilters,"actionSet_Nebula_TypeFil terUsage"); connectGroupBox(ui->groupBoxDSOTypeFilters,"actionSet_Nebula_TypeFil terUsage");
// DSO Labels section // DSO Labels section
connectGroupBox(ui->groupBoxDSOLabelsAndMarkers, "actionShow_Nebulas "); connectGroupBox(ui->groupBoxDSOLabelsAndMarkers, "actionShow_Nebulas ");
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->checkBoxDesignationsOnlyUsage, "NebulaMgr.fl agDesignationLabels");
connectBoolProperty(ui->checkBoxProportionalHints, "NebulaMgr.hintsP roportional"); connectBoolProperty(ui->checkBoxProportionalHints, "NebulaMgr.hintsP roportional");
connectBoolProperty(ui->checkBoxOutlines, "NebulaMgr.flagOutlinesDis played");
connectBoolProperty(ui->checkBoxSurfaceBrightnessUsage, "NebulaMgr.f lagSurfaceBrightnessUsage"); connectBoolProperty(ui->checkBoxSurfaceBrightnessUsage, "NebulaMgr.f lagSurfaceBrightnessUsage");
connectBoolProperty(ui->nebulaLimitMagnitudeCheckBox,"StelSkyDrawer. flagNebulaMagnitudeLimit"); connectBoolProperty(ui->nebulaLimitMagnitudeCheckBox,"StelSkyDrawer. flagNebulaMagnitudeLimit");
connectDoubleProperty(ui->nebulaLimitMagnitudeDoubleSpinBox,"StelSky Drawer.customNebulaMagLimit"); connectDoubleProperty(ui->nebulaLimitMagnitudeDoubleSpinBox,"StelSky Drawer.customNebulaMagLimit");
connect(ui->pushButtonConfigureDSOColors, SIGNAL(clicked()), this, S LOT(showConfigureDSOColorsDialog())); connect(ui->pushButtonConfigureDSOColors, SIGNAL(clicked()), this, S LOT(showConfigureDSOColorsDialog()));
// Landscape section // Landscape section
connectCheckBox(ui->showGroundCheckBox, "actionShow_Ground"); connectCheckBox(ui->showGroundCheckBox, "actionShow_Ground");
connectCheckBox(ui->showFogCheckBox, "actionShow_Fog"); connectCheckBox(ui->showFogCheckBox, "actionShow_Fog");
connectCheckBox(ui->atmosphereCheckBox, "actionShow_Atmosphere"); connectCheckBox(ui->atmosphereCheckBox, "actionShow_Atmosphere");
connectCheckBox(ui->landscapeIlluminationCheckBox, "actionShow_Lands capeIllumination"); connectCheckBox(ui->landscapeIlluminationCheckBox, "actionShow_Lands capeIllumination");
skipping to change at line 419 skipping to change at line 420
// Starlore // Starlore
connect(ui->useAsDefaultSkyCultureCheckBox, SIGNAL(clicked()), this, SLOT(setCurrentCultureAsDefault())); connect(ui->useAsDefaultSkyCultureCheckBox, SIGNAL(clicked()), this, SLOT(setCurrentCultureAsDefault()));
connect(&StelApp::getInstance().getSkyCultureMgr(), SIGNAL(defaultSk yCultureChanged(QString)),this,SLOT(updateDefaultSkyCulture())); connect(&StelApp::getInstance().getSkyCultureMgr(), SIGNAL(defaultSk yCultureChanged(QString)),this,SLOT(updateDefaultSkyCulture()));
updateDefaultSkyCulture(); updateDefaultSkyCulture();
// allow to display short names and inhibit translation. // allow to display short names and inhibit translation.
connectIntProperty(ui->skyCultureNamesStyleComboBox,"ConstellationMg r.constellationDisplayStyle"); connectIntProperty(ui->skyCultureNamesStyleComboBox,"ConstellationMg r.constellationDisplayStyle");
connectCheckBox(ui->nativePlanetNamesCheckBox,"actionShow_Skyculture _NativePlanetNames"); 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"); connectIntProperty(ui->constellationLineThicknessSpinBox,"Constellat ionMgr.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");
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()));
connectCheckBox(ui->showAsterismLinesCheckBox, "actionShow_Asterism_ Lines"); connectCheckBox(ui->showAsterismLinesCheckBox, "actionShow_Asterism_ Lines");
connectDoubleProperty(ui->asterismLineThicknessSpinBox, "AsterismMgr .asterismLineThickness"); connectIntProperty(ui->asterismLineThicknessSpinBox, "AsterismMgr.as terismLineThickness");
connectCheckBox(ui->showAsterismLabelsCheckBox, "actionShow_Asterism _Labels"); connectCheckBox(ui->showAsterismLabelsCheckBox, "actionShow_Asterism _Labels");
connectCheckBox(ui->showRayHelpersCheckBox, "actionShow_Ray_Helpers"
);
connectIntProperty(ui->rayHelperThicknessSpinBox, "AsterismMgr.rayHe
lperThickness");
colorButton(ui->colorAsterismLabels, "AsterismMgr.namesColor"); colorButton(ui->colorAsterismLabels, "AsterismMgr.namesColor");
colorButton(ui->colorAsterismLines, "AsterismMgr.linesColor"); colorButton(ui->colorAsterismLines, "AsterismMgr.linesColor");
colorButton(ui->colorRayHelpers, "AsterismMgr.rayHelpersColor ");
connect(ui->colorAsterismLabels, SIGNAL(released()), this, SL OT(askAsterismLabelsColor())); connect(ui->colorAsterismLabels, SIGNAL(released()), this, SL OT(askAsterismLabelsColor()));
connect(ui->colorAsterismLines, SIGNAL(released()), this, SL OT(askAsterismLinesColor())); connect(ui->colorAsterismLines, SIGNAL(released()), this, SL OT(askAsterismLinesColor()));
connect(ui->colorRayHelpers, SIGNAL(released()), this, SL OT(askRayHelpersColor()));
// 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 1017 skipping to change at line 1023
QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorAste rismLines->toolTip())); QColor c = QColorDialog::getColor(color, Q_NULLPTR, q_(ui->colorAste rismLines->toolTip()));
if (c.isValid()) if (c.isValid())
{ {
vColor = Vec3f(c.redF(), c.greenF(), c.blueF()); vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(AsterismMgr)->setLinesColor(vColor); GETSTELMODULE(AsterismMgr)->setLinesColor(vColor);
StelApp::getInstance().getSettings()->setValue("color/asteri sm_lines_color", StelUtils::vec3fToStr(vColor)); StelApp::getInstance().getSettings()->setValue("color/asteri sm_lines_color", StelUtils::vec3fToStr(vColor));
ui->colorAsterismLines->setStyleSheet("QToolButton { backgro und-color:" + c.name() + "; }"); ui->colorAsterismLines->setStyleSheet("QToolButton { backgro und-color:" + c.name() + "; }");
} }
} }
void ViewDialog::askRayHelpersColor()
{
Vec3f vColor = StelApp::getInstance().getStelPropertyManager()->getP
roperty("AsterismMgr.rayHelpersColor")->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->colorRayH
elpers->toolTip()));
if (c.isValid())
{
vColor = Vec3f(c.redF(), c.greenF(), c.blueF());
GETSTELMODULE(AsterismMgr)->setRayHelpersColor(vColor);
StelApp::getInstance().getSettings()->setValue("color/rayhel
per_lines_color", StelUtils::vec3fToStr(vColor));
ui->colorRayHelpers->setStyleSheet("QToolButton { background
-color:" + c.name() + "; }");
}
}
void ViewDialog::updateTabBarListWidgetWidth() void ViewDialog::updateTabBarListWidgetWidth()
{ {
ui->stackListWidget->setWrapping(false); ui->stackListWidget->setWrapping(false);
// Update list item sizes after translation // Update list item sizes after translation
ui->stackListWidget->adjustSize(); ui->stackListWidget->adjustSize();
QAbstractItemModel* model = ui->stackListWidget->model(); QAbstractItemModel* model = ui->stackListWidget->model();
if (!model) if (!model)
{ {
skipping to change at line 1091 skipping to change at line 1112
if (ui->checkBoxPGC->isChecked()) if (ui->checkBoxPGC->isChecked())
flags |= Nebula::CatPGC; flags |= Nebula::CatPGC;
if (ui->checkBoxUGC->isChecked()) if (ui->checkBoxUGC->isChecked())
flags |= Nebula::CatUGC; flags |= Nebula::CatUGC;
if (ui->checkBoxArp->isChecked()) if (ui->checkBoxArp->isChecked())
flags |= Nebula::CatArp; flags |= Nebula::CatArp;
if (ui->checkBoxVV->isChecked()) if (ui->checkBoxVV->isChecked())
flags |= Nebula::CatVV; flags |= Nebula::CatVV;
if (ui->checkBoxPK->isChecked()) if (ui->checkBoxPK->isChecked())
flags |= Nebula::CatPK; flags |= Nebula::CatPK;
if (ui->checkBoxPNG->isChecked())
flags |= Nebula::CatPNG;
if (ui->checkBoxSNRG->isChecked())
flags |= Nebula::CatSNRG;
if (ui->checkBoxACO->isChecked())
flags |= Nebula::CatACO;
GETSTELMODULE(NebulaMgr)->setCatalogFilters(flags); GETSTELMODULE(NebulaMgr)->setCatalogFilters(flags);
} }
void ViewDialog::setSelectedTypesFromCheckBoxes() void ViewDialog::setSelectedTypesFromCheckBoxes()
{ {
Nebula::TypeGroup flags(0); Nebula::TypeGroup flags(0);
if (ui->checkBoxGalaxiesType->isChecked()) if (ui->checkBoxGalaxiesType->isChecked())
flags |= Nebula::TypeGalaxies; flags |= Nebula::TypeGalaxies;
skipping to change at line 1117 skipping to change at line 1144
if (ui->checkBoxBrightNebulaeType->isChecked()) if (ui->checkBoxBrightNebulaeType->isChecked())
flags |= Nebula::TypeBrightNebulae; flags |= Nebula::TypeBrightNebulae;
if (ui->checkBoxDarkNebulaeType->isChecked()) if (ui->checkBoxDarkNebulaeType->isChecked())
flags |= Nebula::TypeDarkNebulae; flags |= Nebula::TypeDarkNebulae;
if (ui->checkBoxPlanetaryNebulaeType->isChecked()) if (ui->checkBoxPlanetaryNebulaeType->isChecked())
flags |= Nebula::TypePlanetaryNebulae; flags |= Nebula::TypePlanetaryNebulae;
if (ui->checkBoxHydrogenRegionsType->isChecked()) if (ui->checkBoxHydrogenRegionsType->isChecked())
flags |= Nebula::TypeHydrogenRegions; flags |= Nebula::TypeHydrogenRegions;
if (ui->checkBoxSupernovaRemnantsType->isChecked()) if (ui->checkBoxSupernovaRemnantsType->isChecked())
flags |= Nebula::TypeSupernovaRemnants; flags |= Nebula::TypeSupernovaRemnants;
if (ui->checkBoxGalaxyClustersType->isChecked())
flags |= Nebula::TypeGalaxyClusters;
if (ui->checkBoxOtherType->isChecked()) if (ui->checkBoxOtherType->isChecked())
flags |= Nebula::TypeOther; flags |= Nebula::TypeOther;
GETSTELMODULE(NebulaMgr)->setTypeFilters(flags); GETSTELMODULE(NebulaMgr)->setTypeFilters(flags);
} }
void ViewDialog::updateSelectedCatalogsCheckBoxes() void ViewDialog::updateSelectedCatalogsCheckBoxes()
{ {
const Nebula::CatalogGroup& flags = GETSTELMODULE(NebulaMgr)->getCat alogFilters(); const Nebula::CatalogGroup& flags = GETSTELMODULE(NebulaMgr)->getCat alogFilters();
skipping to change at line 1145 skipping to change at line 1174
ui->checkBoxLDN->setChecked(flags & Nebula::CatLDN); ui->checkBoxLDN->setChecked(flags & Nebula::CatLDN);
ui->checkBoxLBN->setChecked(flags & Nebula::CatLBN); ui->checkBoxLBN->setChecked(flags & Nebula::CatLBN);
ui->checkBoxCr->setChecked(flags & Nebula::CatCr); ui->checkBoxCr->setChecked(flags & Nebula::CatCr);
ui->checkBoxMel->setChecked(flags & Nebula::CatMel); ui->checkBoxMel->setChecked(flags & Nebula::CatMel);
ui->checkBoxCed->setChecked(flags & Nebula::CatCed); ui->checkBoxCed->setChecked(flags & Nebula::CatCed);
ui->checkBoxPGC->setChecked(flags & Nebula::CatPGC); ui->checkBoxPGC->setChecked(flags & Nebula::CatPGC);
ui->checkBoxUGC->setChecked(flags & Nebula::CatUGC); ui->checkBoxUGC->setChecked(flags & Nebula::CatUGC);
ui->checkBoxArp->setChecked(flags & Nebula::CatArp); ui->checkBoxArp->setChecked(flags & Nebula::CatArp);
ui->checkBoxVV->setChecked(flags & Nebula::CatVV); ui->checkBoxVV->setChecked(flags & Nebula::CatVV);
ui->checkBoxPK->setChecked(flags & Nebula::CatPK); ui->checkBoxPK->setChecked(flags & Nebula::CatPK);
ui->checkBoxPNG->setChecked(flags & Nebula::CatPNG);
ui->checkBoxSNRG->setChecked(flags & Nebula::CatSNRG);
ui->checkBoxACO->setChecked(flags & Nebula::CatACO);
} }
void ViewDialog::updateSelectedTypesCheckBoxes() void ViewDialog::updateSelectedTypesCheckBoxes()
{ {
const Nebula::TypeGroup& flags = GETSTELMODULE(NebulaMgr)->getTypeFi lters(); const Nebula::TypeGroup& flags = GETSTELMODULE(NebulaMgr)->getTypeFi lters();
ui->checkBoxGalaxiesType->setChecked(flags & Nebula::TypeGalaxies); ui->checkBoxGalaxiesType->setChecked(flags & Nebula::TypeGalaxies);
ui->checkBoxActiveGalaxiesType->setChecked(flags & Nebula::TypeActiv eGalaxies); ui->checkBoxActiveGalaxiesType->setChecked(flags & Nebula::TypeActiv eGalaxies);
ui->checkBoxInteractingGalaxiesType->setChecked(flags & Nebula::Type InteractingGalaxies); ui->checkBoxInteractingGalaxiesType->setChecked(flags & Nebula::Type InteractingGalaxies);
ui->checkBoxStarClustersType->setChecked(flags & Nebula::TypeStarClu sters); ui->checkBoxStarClustersType->setChecked(flags & Nebula::TypeStarClu sters);
ui->checkBoxBrightNebulaeType->setChecked(flags & Nebula::TypeBright Nebulae); ui->checkBoxBrightNebulaeType->setChecked(flags & Nebula::TypeBright Nebulae);
ui->checkBoxDarkNebulaeType->setChecked(flags & Nebula::TypeDarkNebu lae); ui->checkBoxDarkNebulaeType->setChecked(flags & Nebula::TypeDarkNebu lae);
ui->checkBoxPlanetaryNebulaeType->setChecked(flags & Nebula::TypePla netaryNebulae); ui->checkBoxPlanetaryNebulaeType->setChecked(flags & Nebula::TypePla netaryNebulae);
ui->checkBoxHydrogenRegionsType->setChecked(flags & Nebula::TypeHydr ogenRegions); ui->checkBoxHydrogenRegionsType->setChecked(flags & Nebula::TypeHydr ogenRegions);
ui->checkBoxSupernovaRemnantsType->setChecked(flags & Nebula::TypeSu pernovaRemnants); ui->checkBoxSupernovaRemnantsType->setChecked(flags & Nebula::TypeSu pernovaRemnants);
ui->checkBoxGalaxyClustersType->setChecked(flags & Nebula::TypeGalax yClusters);
ui->checkBoxOtherType->setChecked(flags & Nebula::TypeOther); ui->checkBoxOtherType->setChecked(flags & Nebula::TypeOther);
} }
void ViewDialog::setFlagCustomGrsSettings(bool b) void ViewDialog::setFlagCustomGrsSettings(bool b)
{ {
GETSTELMODULE(SolarSystem)->setFlagCustomGrsSettings(b); GETSTELMODULE(SolarSystem)->setFlagCustomGrsSettings(b);
ui->pushButtonGrsDetails->setEnabled(b); ui->pushButtonGrsDetails->setEnabled(b);
if (!b && greatRedSpotDialog!=Q_NULLPTR) if (!b && greatRedSpotDialog!=Q_NULLPTR)
greatRedSpotDialog->setVisible(false); greatRedSpotDialog->setVisible(false);
skipping to change at line 1401 skipping to change at line 1434
} }
void ViewDialog::changeLandscape(QListWidgetItem* item) void ViewDialog::changeLandscape(QListWidgetItem* item)
{ {
LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr); LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr);
lmgr->setCurrentLandscapeName(item->data(Qt::UserRole).toString()); lmgr->setCurrentLandscapeName(item->data(Qt::UserRole).toString());
} }
void ViewDialog::landscapeChanged(QString id, QString name) void ViewDialog::landscapeChanged(QString id, QString name)
{ {
Q_UNUSED(id)
LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr); LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr);
for (int i = 0; i < ui->landscapesListWidget->count(); i++) for (int i = 0; i < ui->landscapesListWidget->count(); i++)
{ {
if (ui->landscapesListWidget->item(i)->data(Qt::UserRole).to String() == name) if (ui->landscapesListWidget->item(i)->data(Qt::UserRole).to String() == name)
{ {
ui->landscapesListWidget->setCurrentRow(i, QItemSele ctionModel::SelectCurrent); ui->landscapesListWidget->setCurrentRow(i, QItemSele ctionModel::SelectCurrent);
break; break;
} }
} }
QStringList searchPaths;
searchPaths << StelFileMgr::findFile("landscapes/" + id);
ui->landscapeTextBrowser->setSearchPaths(searchPaths);
ui->landscapeTextBrowser->setHtml(lmgr->getCurrentLandscapeHtmlDescr iption()); ui->landscapeTextBrowser->setHtml(lmgr->getCurrentLandscapeHtmlDescr iption());
updateDefaultLandscape(); updateDefaultLandscape();
// Reset values that might have changed. // Reset values that might have changed.
ui->showFogCheckBox->setChecked(lmgr->getFlagFog()); ui->showFogCheckBox->setChecked(lmgr->getFlagFog());
} }
void ViewDialog::showAddRemoveLandscapesDialog() void ViewDialog::showAddRemoveLandscapesDialog()
{ {
if(addRemoveLandscapesDialog == Q_NULLPTR) if(addRemoveLandscapesDialog == Q_NULLPTR)
addRemoveLandscapesDialog = new AddRemoveLandscapesDialog(); addRemoveLandscapesDialog = new AddRemoveLandscapesDialog();
skipping to change at line 1511 skipping to change at line 1547
// Check that the useAsDefaultSkyCultureCheckBox needs to be updated // Check that the useAsDefaultSkyCultureCheckBox needs to be updated
bool b = StelApp::getInstance().getSkyCultureMgr().getCurrentSkyCult ureID()==StelApp::getInstance().getSkyCultureMgr().getDefaultSkyCultureID() ; bool b = StelApp::getInstance().getSkyCultureMgr().getCurrentSkyCult ureID()==StelApp::getInstance().getSkyCultureMgr().getDefaultSkyCultureID() ;
ui->useAsDefaultSkyCultureCheckBox->setChecked(b); ui->useAsDefaultSkyCultureCheckBox->setChecked(b);
ui->useAsDefaultSkyCultureCheckBox->setEnabled(!b); ui->useAsDefaultSkyCultureCheckBox->setEnabled(!b);
} }
void ViewDialog::updateDefaultLandscape() void ViewDialog::updateDefaultLandscape()
{ {
LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr); LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr);
Q_ASSERT(lmgr); Q_ASSERT(lmgr);
bool b = lmgr->getCurrentLandscapeID()==lmgr->getDefaultLandscapeID( bool isDefault = lmgr->getCurrentLandscapeID()==lmgr->getDefaultLand
); scapeID();
ui->useAsDefaultLandscapeCheckBox->setChecked(b); ui->useAsDefaultLandscapeCheckBox->setChecked(isDefault);
ui->useAsDefaultLandscapeCheckBox->setEnabled(!b); ui->useAsDefaultLandscapeCheckBox->setEnabled(!isDefault);
} }
void ViewDialog::changePage(QListWidgetItem *current, QListWidgetItem *prev ious) void ViewDialog::changePage(QListWidgetItem *current, QListWidgetItem *prev ious)
{ {
if (!current) if (!current)
current = previous; current = previous;
ui->stackedWidget->setCurrentIndex(ui->stackListWidget->row(current) ); ui->stackedWidget->setCurrentIndex(ui->stackListWidget->row(current) );
} }
void ViewDialog::populatePlanetMagnitudeAlgorithmsList() void ViewDialog::populatePlanetMagnitudeAlgorithmsList()
 End of changes. 14 change blocks. 
8 lines changed or deleted 50 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/