ViewDialog.cpp   ViewDialog.cpp 
skipping to change at line 38 skipping to change at line 38
#include "StelFileMgr.hpp" #include "StelFileMgr.hpp"
#include "StelLocaleMgr.hpp" #include "StelLocaleMgr.hpp"
#include "StelProjector.hpp" #include "StelProjector.hpp"
#include "LandscapeMgr.hpp" #include "LandscapeMgr.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StarMgr.hpp" #include "StarMgr.hpp"
#include "StelSkyDrawer.hpp" #include "StelSkyDrawer.hpp"
#include "SolarSystem.hpp" #include "SolarSystem.hpp"
#include "NebulaMgr.hpp" #include "NebulaMgr.hpp"
#include "MeteorMgr.hpp" #include "MeteorMgr.hpp"
#include "MilkyWay.hpp"
#include "GridLinesMgr.hpp" #include "GridLinesMgr.hpp"
#include "ConstellationMgr.hpp" #include "ConstellationMgr.hpp"
#include "StelStyle.hpp" #include "StelStyle.hpp"
#include "StelSkyLayerMgr.hpp" #include "StelSkyLayerMgr.hpp"
#include "StelGuiBase.hpp" #include "StelGuiBase.hpp"
#include "StelGui.hpp" #include "StelGui.hpp"
#include "StelGuiItems.hpp" #include "StelGuiItems.hpp"
#include <QDebug> #include <QDebug>
#include <QFrame> #include <QFrame>
skipping to change at line 146 skipping to change at line 147
ui->starTwinkleCheckBox->setChecked(StelApp::getInstance().getCore() ->getSkyDrawer()->getFlagTwinkle()); ui->starTwinkleCheckBox->setChecked(StelApp::getInstance().getCore() ->getSkyDrawer()->getFlagTwinkle());
connect(ui->starTwinkleCheckBox, SIGNAL(toggled(bool)), StelApp::get Instance().getCore()->getSkyDrawer(), SLOT(setFlagTwinkle(bool))); connect(ui->starTwinkleCheckBox, SIGNAL(toggled(bool)), StelApp::get Instance().getCore()->getSkyDrawer(), SLOT(setFlagTwinkle(bool)));
ui->starScaleRadiusDoubleSpinBox->setValue(StelApp::getInstance().ge tCore()->getSkyDrawer()->getAbsoluteStarScale()); ui->starScaleRadiusDoubleSpinBox->setValue(StelApp::getInstance().ge tCore()->getSkyDrawer()->getAbsoluteStarScale());
connect(ui->starScaleRadiusDoubleSpinBox, SIGNAL(valueChanged(double )), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setAbsoluteStarS cale(double))); connect(ui->starScaleRadiusDoubleSpinBox, SIGNAL(valueChanged(double )), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setAbsoluteStarS cale(double)));
ui->starRelativeScaleDoubleSpinBox->setValue(StelApp::getInstance(). getCore()->getSkyDrawer()->getRelativeStarScale()); ui->starRelativeScaleDoubleSpinBox->setValue(StelApp::getInstance(). getCore()->getSkyDrawer()->getRelativeStarScale());
connect(ui->starRelativeScaleDoubleSpinBox, SIGNAL(valueChanged(doub le)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setRelativeSta rScale(double))); connect(ui->starRelativeScaleDoubleSpinBox, SIGNAL(valueChanged(doub le)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setRelativeSta rScale(double)));
MilkyWay* mw = GETSTELMODULE(MilkyWay);
ui->milkyWayBrightnessDoubleSpinBox->setValue(mw->getIntensity());
connect(ui->milkyWayBrightnessDoubleSpinBox, SIGNAL(valueChanged(dou
ble)), mw, SLOT(setIntensity(double)));
ui->starTwinkleAmountDoubleSpinBox->setValue(StelApp::getInstance(). getCore()->getSkyDrawer()->getTwinkleAmount()); ui->starTwinkleAmountDoubleSpinBox->setValue(StelApp::getInstance(). getCore()->getSkyDrawer()->getTwinkleAmount());
connect(ui->starTwinkleAmountDoubleSpinBox, SIGNAL(valueChanged(doub le)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setTwinkleAmou nt(double))); connect(ui->starTwinkleAmountDoubleSpinBox, SIGNAL(valueChanged(doub le)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setTwinkleAmou nt(double)));
ui->adaptationCheckbox->setChecked(StelApp::getInstance().getCore()- >getSkyDrawer()->getFlagLuminanceAdaptation()); ui->adaptationCheckbox->setChecked(StelApp::getInstance().getCore()- >getSkyDrawer()->getFlagLuminanceAdaptation());
connect(ui->adaptationCheckbox, SIGNAL(toggled(bool)), StelApp::getI nstance().getCore()->getSkyDrawer(), SLOT(setFlagLuminanceAdaptation(bool)) ); connect(ui->adaptationCheckbox, SIGNAL(toggled(bool)), StelApp::getI nstance().getCore()->getSkyDrawer(), SLOT(setFlagLuminanceAdaptation(bool)) );
// Limit Magnitudes
const StelSkyDrawer* drawer = StelApp::getInstance().getCore()->getS
kyDrawer();
ui->starLimitMagnitudeCheckBox->setChecked(drawer->getFlagStarMagnit
udeLimit());
ui->nebulaLimitMagnitudeCheckBox->setChecked(drawer->getFlagNebulaMa
gnitudeLimit());
ui->starLimitMagnitudeDoubleSpinBox->setValue(drawer->getCustomStarM
agnitudeLimit());
ui->nebulaLimitMagnitudeDoubleSpinBox->setValue(drawer->getCustomNeb
ulaMagnitudeLimit());
connect(ui->starLimitMagnitudeCheckBox, SIGNAL(toggled(bool)),
drawer, SLOT(setFlagStarMagnitudeLimit(bool)));
connect(ui->nebulaLimitMagnitudeCheckBox, SIGNAL(toggled(bool)),
drawer, SLOT(setFlagNebulaMagnitudeLimit(bool)));
connect(ui->starLimitMagnitudeDoubleSpinBox, SIGNAL(valueChanged(dou
ble)),
drawer, SLOT(setCustomStarMagnitudeLimit(double)));
connect(ui->nebulaLimitMagnitudeDoubleSpinBox,
SIGNAL(valueChanged(double)),
drawer,
SLOT(setCustomNebulaMagnitudeLimit(double)));
// Planets section // Planets section
SolarSystem* ssmgr = GETSTELMODULE(SolarSystem); SolarSystem* ssmgr = GETSTELMODULE(SolarSystem);
ui->showPlanetCheckBox->setChecked(ssmgr->getFlagPlanets()); ui->showPlanetCheckBox->setChecked(ssmgr->getFlagPlanets());
connect(ui->showPlanetCheckBox, SIGNAL(toggled(bool)), ssmgr, SLOT(s etFlagPlanets(bool))); connect(ui->showPlanetCheckBox, SIGNAL(toggled(bool)), ssmgr, SLOT(s etFlagPlanets(bool)));
ui->planetMarkerCheckBox->setChecked(ssmgr->getFlagHints()); ui->planetMarkerCheckBox->setChecked(ssmgr->getFlagHints());
connect(ui->planetMarkerCheckBox, SIGNAL(toggled(bool)), ssmgr, SLOT (setFlagHints(bool))); connect(ui->planetMarkerCheckBox, SIGNAL(toggled(bool)), ssmgr, SLOT (setFlagHints(bool)));
ui->planetScaleMoonCheckBox->setChecked(ssmgr->getFlagMoonScale()); ui->planetScaleMoonCheckBox->setChecked(ssmgr->getFlagMoonScale());
connect(ui->planetScaleMoonCheckBox, SIGNAL(toggled(bool)), ssmgr, S LOT(setFlagMoonScale(bool))); connect(ui->planetScaleMoonCheckBox, SIGNAL(toggled(bool)), ssmgr, S LOT(setFlagMoonScale(bool)));
skipping to change at line 356 skipping to change at line 379
// Fill the culture list widget from the available list // Fill the culture list widget from the available list
QListWidget* l = ui->culturesListWidget; QListWidget* l = ui->culturesListWidget;
l->blockSignals(true); l->blockSignals(true);
l->clear(); l->clear();
l->addItems(StelApp::getInstance().getSkyCultureMgr().getSkyCultureL istI18()); l->addItems(StelApp::getInstance().getSkyCultureMgr().getSkyCultureL istI18());
l->setCurrentItem(l->findItems(StelApp::getInstance().getSkyCultureM gr().getCurrentSkyCultureNameI18(), Qt::MatchExactly).at(0)); l->setCurrentItem(l->findItems(StelApp::getInstance().getSkyCultureM gr().getCurrentSkyCultureNameI18(), Qt::MatchExactly).at(0));
l->blockSignals(false); l->blockSignals(false);
updateSkyCultureText(); updateSkyCultureText();
const StelCore* core = StelApp::getInstance().getCore(); const StelCore* core = StelApp::getInstance().getCore();
StelGui* gui = dynamic_cast<StelGui*>(StelApp::getInstance().getGui(
));
Q_ASSERT(gui);
// Fill the projection list // Fill the projection list
l = ui->projectionListWidget; l = ui->projectionListWidget;
l->blockSignals(true); l->blockSignals(true);
l->clear(); l->clear();
const QStringList mappings = core->getAllProjectionTypeKeys(); const QStringList mappings = core->getAllProjectionTypeKeys();
foreach (QString s, mappings) foreach (QString s, mappings)
{ {
l->addItem(core->projectionTypeKeyToNameI18n(s)); l->addItem(core->projectionTypeKeyToNameI18n(s));
} }
l->setCurrentItem(l->findItems(core->projectionTypeKeyToNameI18n(cor e->getCurrentProjectionTypeKey()), Qt::MatchExactly).at(0)); l->setCurrentItem(l->findItems(core->projectionTypeKeyToNameI18n(cor e->getCurrentProjectionTypeKey()), Qt::MatchExactly).at(0));
l->blockSignals(false); l->blockSignals(false);
ui->projectionTextBrowser->document()->setDefaultStyleSheet(QString( gui->getStelStyle().htmlStyleSheet));
ui->projectionTextBrowser->setHtml(core->getProjection(StelCore::Fra meJ2000)->getHtmlSummary()); ui->projectionTextBrowser->setHtml(core->getProjection(StelCore::Fra meJ2000)->getHtmlSummary());
// Fill the landscape list // Fill the landscape list
l = ui->landscapesListWidget; l = ui->landscapesListWidget;
l->blockSignals(true); l->blockSignals(true);
l->clear(); l->clear();
LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr); LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr);
QStringList landscapeList = lmgr->getAllLandscapeNames(); QStringList landscapeList = lmgr->getAllLandscapeNames();
foreach (const QString landscapeId, landscapeList) foreach (const QString landscapeId, landscapeList)
{ {
skipping to change at line 393 skipping to change at line 419
QString selectedLandscapeId = lmgr->getCurrentLandscapeName(); QString selectedLandscapeId = lmgr->getCurrentLandscapeName();
for (int i = 0; i < l->count(); i++) for (int i = 0; i < l->count(); i++)
{ {
if (l->item(i)->data(Qt::UserRole).toString() == selectedLan dscapeId) if (l->item(i)->data(Qt::UserRole).toString() == selectedLan dscapeId)
{ {
l->setCurrentRow(i); l->setCurrentRow(i);
break; break;
} }
} }
l->blockSignals(false); l->blockSignals(false);
ui->landscapeTextBrowser->document()->setDefaultStyleSheet(QString(g ui->getStelStyle().htmlStyleSheet));
ui->landscapeTextBrowser->setHtml(lmgr->getCurrentLandscapeHtmlDescr iption()); ui->landscapeTextBrowser->setHtml(lmgr->getCurrentLandscapeHtmlDescr iption());
ui->useAsDefaultLandscapeCheckBox->setChecked(lmgr->getDefaultLandsc apeID()==lmgr->getCurrentLandscapeID()); ui->useAsDefaultLandscapeCheckBox->setChecked(lmgr->getDefaultLandsc apeID()==lmgr->getCurrentLandscapeID());
ui->useAsDefaultLandscapeCheckBox->setEnabled(lmgr->getDefaultLandsc apeID()!=lmgr->getCurrentLandscapeID()); ui->useAsDefaultLandscapeCheckBox->setEnabled(lmgr->getDefaultLandsc apeID()!=lmgr->getCurrentLandscapeID());
} }
void ViewDialog::populateSkyLayersList() void ViewDialog::populateSkyLayersList()
{ {
ui->skyLayerListWidget->clear(); ui->skyLayerListWidget->clear();
StelSkyLayerMgr* skyLayerMgr = GETSTELMODULE(StelSkyLayerMgr); StelSkyLayerMgr* skyLayerMgr = GETSTELMODULE(StelSkyLayerMgr);
ui->skyLayerListWidget->addItems(skyLayerMgr->getAllKeys()); ui->skyLayerListWidget->addItems(skyLayerMgr->getAllKeys());
 End of changes. 6 change blocks. 
0 lines changed or deleted 35 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/