StelGui.cpp   StelGui.cpp 
skipping to change at line 38 skipping to change at line 38
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelMainGraphicsView.hpp" #include "StelMainGraphicsView.hpp"
#include "StelMainWindow.hpp" #include "StelMainWindow.hpp"
#include "StelObjectMgr.hpp" #include "StelObjectMgr.hpp"
#include "LandscapeMgr.hpp" #include "LandscapeMgr.hpp"
#include "StarMgr.hpp" #include "StarMgr.hpp"
#include "ConstellationMgr.hpp" #include "ConstellationMgr.hpp"
#include "GridLinesMgr.hpp" #include "GridLinesMgr.hpp"
#include "NebulaMgr.hpp" #include "NebulaMgr.hpp"
#include "StelLocaleMgr.hpp" #include "StelLocaleMgr.hpp"
#include "StelNavigator.hpp"
#include "StelObjectType.hpp" #include "StelObjectType.hpp"
#include "StelObject.hpp" #include "StelObject.hpp"
#include "StelProjector.hpp" #include "StelProjector.hpp"
#include "SolarSystem.hpp" #include "SolarSystem.hpp"
#include "StelSkyLayerMgr.hpp" #include "StelSkyLayerMgr.hpp"
#include "StelStyle.hpp" #include "StelStyle.hpp"
#include "StelSkyDrawer.hpp" #include "StelSkyDrawer.hpp"
#include "MeteorMgr.hpp" #include "MeteorMgr.hpp"
#ifdef ENABLE_SCRIPT_CONSOLE #ifdef ENABLE_SCRIPT_CONSOLE
#include "ScriptConsole.hpp" #include "ScriptConsole.hpp"
skipping to change at line 111 skipping to change at line 111
addGuiActions("actionShow_Constellation_Labels", N_("Constellation l abels"), "V", group, true, false); addGuiActions("actionShow_Constellation_Labels", N_("Constellation l abels"), "V", group, true, false);
addGuiActions("actionShow_Constellation_Boundaries", N_("Constellati on boundaries"), "B", group, true, false); addGuiActions("actionShow_Constellation_Boundaries", N_("Constellati on boundaries"), "B", group, true, false);
addGuiActions("actionShow_Azimuthal_Grid", N_("Azimuthal grid"), "Z" , group, true, false); addGuiActions("actionShow_Azimuthal_Grid", N_("Azimuthal grid"), "Z" , group, true, false);
addGuiActions("actionShow_Equatorial_Grid", N_("Equatorial grid"), " E", group, true, false); addGuiActions("actionShow_Equatorial_Grid", N_("Equatorial grid"), " E", group, true, false);
addGuiActions("actionShow_Equatorial_J2000_Grid", N_("Equatorial J20 00 grid"), "", group, true, false); addGuiActions("actionShow_Equatorial_J2000_Grid", N_("Equatorial J20 00 grid"), "", group, true, false);
addGuiActions("actionShow_Galactic_Grid", N_("Galactic grid"), "", g roup, true, false); addGuiActions("actionShow_Galactic_Grid", N_("Galactic grid"), "", g roup, true, false);
addGuiActions("actionShow_Ecliptic_Line", N_("Ecliptic line"), ",", group, true, false); addGuiActions("actionShow_Ecliptic_Line", N_("Ecliptic line"), ",", group, true, false);
addGuiActions("actionShow_Equator_Line", N_("Equator line"), ".", gr oup, true, false); addGuiActions("actionShow_Equator_Line", N_("Equator line"), ".", gr oup, true, false);
addGuiActions("actionShow_Meridian_Line", N_("Meridian line"), ";", group, true, false); addGuiActions("actionShow_Meridian_Line", N_("Meridian line"), ";", group, true, false);
addGuiActions("actionShow_Horizon_Line", N_("Horizon line"), "", gro up, true, false);
addGuiActions("actionShow_Cardinal_Points", N_("Cardinal points"), " Q", group, true, false); addGuiActions("actionShow_Cardinal_Points", N_("Cardinal points"), " Q", group, true, false);
addGuiActions("actionShow_Ground", N_("Ground"), "G", group, true, f alse); addGuiActions("actionShow_Ground", N_("Ground"), "G", group, true, f alse);
addGuiActions("actionShow_Atmosphere", N_("Atmosphere"), "A", group, true, false); addGuiActions("actionShow_Atmosphere", N_("Atmosphere"), "A", group, true, false);
addGuiActions("actionShow_Fog", N_("Fog"), "F", group, true, false); addGuiActions("actionShow_Fog", N_("Fog"), "F", group, true, false);
addGuiActions("actionShow_Nebulas", N_("Nebulas"), "N", group, true, false); addGuiActions("actionShow_Nebulas", N_("Nebulas"), "N", group, true, false);
addGuiActions("actionShow_DSS", N_("Nebulas background images"), "", group, true, false); addGuiActions("actionShow_DSS", N_("Nebulas background images"), "", group, true, false);
addGuiActions("actionShow_Stars", N_("Stars"), "S", group, true, fal se); addGuiActions("actionShow_Stars", N_("Stars"), "S", group, true, fal se);
addGuiActions("actionShow_Planets_Labels", N_("Planets labels"), "P" , group, true, false); addGuiActions("actionShow_Planets_Labels", N_("Planets labels"), "P" , group, true, false);
skipping to change at line 207 skipping to change at line 208
connect(getGuiActions("actionShow_Equatorial_Grid"), SIGNAL(toggled( bool)), gmgr, SLOT(setFlagEquatorGrid(bool))); connect(getGuiActions("actionShow_Equatorial_Grid"), SIGNAL(toggled( bool)), gmgr, SLOT(setFlagEquatorGrid(bool)));
getGuiActions("actionShow_Equatorial_Grid")->setChecked(gmgr->getFla gEquatorGrid()); getGuiActions("actionShow_Equatorial_Grid")->setChecked(gmgr->getFla gEquatorGrid());
connect(getGuiActions("actionShow_Azimuthal_Grid"), SIGNAL(toggled(b ool)), gmgr, SLOT(setFlagAzimuthalGrid(bool))); connect(getGuiActions("actionShow_Azimuthal_Grid"), SIGNAL(toggled(b ool)), gmgr, SLOT(setFlagAzimuthalGrid(bool)));
getGuiActions("actionShow_Azimuthal_Grid")->setChecked(gmgr->getFlag AzimuthalGrid()); getGuiActions("actionShow_Azimuthal_Grid")->setChecked(gmgr->getFlag AzimuthalGrid());
connect(getGuiActions("actionShow_Ecliptic_Line"), SIGNAL(toggled(bo ol)), gmgr, SLOT(setFlagEclipticLine(bool))); connect(getGuiActions("actionShow_Ecliptic_Line"), SIGNAL(toggled(bo ol)), gmgr, SLOT(setFlagEclipticLine(bool)));
getGuiActions("actionShow_Ecliptic_Line")->setChecked(gmgr->getFlagE clipticLine()); getGuiActions("actionShow_Ecliptic_Line")->setChecked(gmgr->getFlagE clipticLine());
connect(getGuiActions("actionShow_Equator_Line"), SIGNAL(toggled(boo l)), gmgr, SLOT(setFlagEquatorLine(bool))); connect(getGuiActions("actionShow_Equator_Line"), SIGNAL(toggled(boo l)), gmgr, SLOT(setFlagEquatorLine(bool)));
getGuiActions("actionShow_Equator_Line")->setChecked(gmgr->getFlagEq uatorLine()); getGuiActions("actionShow_Equator_Line")->setChecked(gmgr->getFlagEq uatorLine());
connect(getGuiActions("actionShow_Meridian_Line"), SIGNAL(toggled(bo ol)), gmgr, SLOT(setFlagMeridianLine(bool))); connect(getGuiActions("actionShow_Meridian_Line"), SIGNAL(toggled(bo ol)), gmgr, SLOT(setFlagMeridianLine(bool)));
getGuiActions("actionShow_Meridian_Line")->setChecked(gmgr->getFlagM eridianLine()); getGuiActions("actionShow_Meridian_Line")->setChecked(gmgr->getFlagM eridianLine());
connect(getGuiActions("actionShow_Horizon_Line"), SIGNAL(toggled(boo
l)), gmgr, SLOT(setFlagHorizonLine(bool)));
getGuiActions("actionShow_Horizon_Line")->setChecked(gmgr->getFlagHo
rizonLine());
connect(getGuiActions("actionShow_Equatorial_J2000_Grid"), SIGNAL(to ggled(bool)), gmgr, SLOT(setFlagEquatorJ2000Grid(bool))); connect(getGuiActions("actionShow_Equatorial_J2000_Grid"), SIGNAL(to ggled(bool)), gmgr, SLOT(setFlagEquatorJ2000Grid(bool)));
getGuiActions("actionShow_Equatorial_J2000_Grid")->setChecked(gmgr-> getFlagEquatorJ2000Grid()); getGuiActions("actionShow_Equatorial_J2000_Grid")->setChecked(gmgr-> getFlagEquatorJ2000Grid());
connect(getGuiActions("actionShow_Galactic_Grid"), SIGNAL(toggled(bo ol)), gmgr, SLOT(setFlagGalacticGrid(bool))); connect(getGuiActions("actionShow_Galactic_Grid"), SIGNAL(toggled(bo ol)), gmgr, SLOT(setFlagGalacticGrid(bool)));
getGuiActions("actionShow_Galactic_Grid")->setChecked(gmgr->getFlagG alacticGrid()); getGuiActions("actionShow_Galactic_Grid")->setChecked(gmgr->getFlagG alacticGrid());
LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr); LandscapeMgr* lmgr = GETSTELMODULE(LandscapeMgr);
connect(getGuiActions("actionShow_Ground"), SIGNAL(toggled(bool)), l mgr, SLOT(setFlagLandscape(bool))); connect(getGuiActions("actionShow_Ground"), SIGNAL(toggled(bool)), l mgr, SLOT(setFlagLandscape(bool)));
getGuiActions("actionShow_Ground")->setChecked(lmgr->getFlagLandscap e()); getGuiActions("actionShow_Ground")->setChecked(lmgr->getFlagLandscap e());
connect(getGuiActions("actionShow_Cardinal_Points"), SIGNAL(toggled( bool)), lmgr, SLOT(setFlagCardinalsPoints(bool))); connect(getGuiActions("actionShow_Cardinal_Points"), SIGNAL(toggled( bool)), lmgr, SLOT(setFlagCardinalsPoints(bool)));
getGuiActions("actionShow_Cardinal_Points")->setChecked(lmgr->getFla gCardinalsPoints()); getGuiActions("actionShow_Cardinal_Points")->setChecked(lmgr->getFla gCardinalsPoints());
skipping to change at line 230 skipping to change at line 233
getGuiActions("actionShow_Fog")->setChecked(lmgr->getFlagFog()); getGuiActions("actionShow_Fog")->setChecked(lmgr->getFlagFog());
NebulaMgr* nmgr = GETSTELMODULE(NebulaMgr); NebulaMgr* nmgr = GETSTELMODULE(NebulaMgr);
connect(getGuiActions("actionShow_Nebulas"), SIGNAL(toggled(bool)), nmgr, SLOT(setFlagHints(bool))); connect(getGuiActions("actionShow_Nebulas"), SIGNAL(toggled(bool)), nmgr, SLOT(setFlagHints(bool)));
getGuiActions("actionShow_Nebulas")->setChecked(nmgr->getFlagHints() ); getGuiActions("actionShow_Nebulas")->setChecked(nmgr->getFlagHints() );
StelSkyLayerMgr* imgr = GETSTELMODULE(StelSkyLayerMgr); StelSkyLayerMgr* imgr = GETSTELMODULE(StelSkyLayerMgr);
connect(getGuiActions("actionShow_DSS"), SIGNAL(toggled(bool)), imgr , SLOT(setFlagShow(bool))); connect(getGuiActions("actionShow_DSS"), SIGNAL(toggled(bool)), imgr , SLOT(setFlagShow(bool)));
getGuiActions("actionShow_DSS")->setChecked(imgr->getFlagShow()); getGuiActions("actionShow_DSS")->setChecked(imgr->getFlagShow());
StelCore* core = StelApp::getInstance().getCore();
StelMovementMgr* mmgr = GETSTELMODULE(StelMovementMgr); StelMovementMgr* mmgr = GETSTELMODULE(StelMovementMgr);
StelNavigator* nav = StelApp::getInstance().getCore()->getNavigator( );
connect(getGuiActions("actionIncrease_Script_Speed"), SIGNAL(trigger ed()), this, SLOT(increaseScriptSpeed())); connect(getGuiActions("actionIncrease_Script_Speed"), SIGNAL(trigger ed()), this, SLOT(increaseScriptSpeed()));
connect(getGuiActions("actionDecrease_Script_Speed"), SIGNAL(trigger ed()), this, SLOT(decreaseScriptSpeed())); connect(getGuiActions("actionDecrease_Script_Speed"), SIGNAL(trigger ed()), this, SLOT(decreaseScriptSpeed()));
connect(getGuiActions("actionSet_Real_Script_Speed"), SIGNAL(trigger ed()), this, SLOT(setRealScriptSpeed())); connect(getGuiActions("actionSet_Real_Script_Speed"), SIGNAL(trigger ed()), this, SLOT(setRealScriptSpeed()));
connect(getGuiActions("actionIncrease_Time_Speed"), SIGNAL(triggered connect(getGuiActions("actionIncrease_Time_Speed"), SIGNAL(triggered
()), nav, SLOT(increaseTimeSpeed())); ()), core, SLOT(increaseTimeSpeed()));
connect(getGuiActions("actionDecrease_Time_Speed"), SIGNAL(triggered connect(getGuiActions("actionDecrease_Time_Speed"), SIGNAL(triggered
()), nav, SLOT(decreaseTimeSpeed())); ()), core, SLOT(decreaseTimeSpeed()));
connect(getGuiActions("actionIncrease_Time_Speed_Less"), SIGNAL(trig connect(getGuiActions("actionIncrease_Time_Speed_Less"), SIGNAL(trig
gered()), nav, SLOT(increaseTimeSpeedLess())); gered()), core, SLOT(increaseTimeSpeedLess()));
connect(getGuiActions("actionDecrease_Time_Speed_Less"), SIGNAL(trig connect(getGuiActions("actionDecrease_Time_Speed_Less"), SIGNAL(trig
gered()), nav, SLOT(decreaseTimeSpeedLess())); gered()), core, SLOT(decreaseTimeSpeedLess()));
connect(getGuiActions("actionSet_Real_Time_Speed"), SIGNAL(triggered connect(getGuiActions("actionSet_Real_Time_Speed"), SIGNAL(triggered
()), nav, SLOT(toggleRealTimeSpeed())); ()), core, SLOT(toggleRealTimeSpeed()));
connect(getGuiActions("actionSet_Time_Rate_Zero"), SIGNAL(triggered( connect(getGuiActions("actionSet_Time_Rate_Zero"), SIGNAL(triggered(
)), nav, SLOT(setZeroTimeSpeed())); )), core, SLOT(setZeroTimeSpeed()));
connect(getGuiActions("actionReturn_To_Current_Time"), SIGNAL(trigge connect(getGuiActions("actionReturn_To_Current_Time"), SIGNAL(trigge
red()), nav, SLOT(setTimeNow())); red()), core, SLOT(setTimeNow()));
connect(getGuiActions("actionSwitch_Equatorial_Mount"), SIGNAL(toggl ed(bool)), mmgr, SLOT(setEquatorialMount(bool))); connect(getGuiActions("actionSwitch_Equatorial_Mount"), SIGNAL(toggl ed(bool)), mmgr, SLOT(setEquatorialMount(bool)));
getGuiActions("actionSwitch_Equatorial_Mount")->setChecked(mmgr->get MountMode() != StelMovementMgr::MountAltAzimuthal); getGuiActions("actionSwitch_Equatorial_Mount")->setChecked(mmgr->get MountMode() != StelMovementMgr::MountAltAzimuthal);
connect(getGuiActions("actionAdd_Solar_Hour"), SIGNAL(triggered()), connect(getGuiActions("actionAdd_Solar_Hour"), SIGNAL(triggered()),
nav, SLOT(addHour())); core, SLOT(addHour()));
connect(getGuiActions("actionAdd_Solar_Day"), SIGNAL(triggered()), n connect(getGuiActions("actionAdd_Solar_Day"), SIGNAL(triggered()), c
av, SLOT(addDay())); ore, SLOT(addDay()));
connect(getGuiActions("actionAdd_Solar_Week"), SIGNAL(triggered()), connect(getGuiActions("actionAdd_Solar_Week"), SIGNAL(triggered()),
nav, SLOT(addWeek())); core, SLOT(addWeek()));
connect(getGuiActions("actionSubtract_Solar_Hour"), SIGNAL(triggered connect(getGuiActions("actionSubtract_Solar_Hour"), SIGNAL(triggered
()), nav, SLOT(subtractHour())); ()), core, SLOT(subtractHour()));
connect(getGuiActions("actionSubtract_Solar_Day"), SIGNAL(triggered( connect(getGuiActions("actionSubtract_Solar_Day"), SIGNAL(triggered(
)), nav, SLOT(subtractDay())); )), core, SLOT(subtractDay()));
connect(getGuiActions("actionSubtract_Solar_Week"), SIGNAL(triggered connect(getGuiActions("actionSubtract_Solar_Week"), SIGNAL(triggered
()), nav, SLOT(subtractWeek())); ()), core, SLOT(subtractWeek()));
connect(getGuiActions("actionAdd_Sidereal_Day"), SIGNAL(triggered()) connect(getGuiActions("actionAdd_Sidereal_Day"), SIGNAL(triggered())
, nav, SLOT(addSiderealDay())); , core, SLOT(addSiderealDay()));
connect(getGuiActions("actionAdd_Sidereal_Week"), SIGNAL(triggered() connect(getGuiActions("actionAdd_Sidereal_Week"), SIGNAL(triggered()
), nav, SLOT(addSiderealWeek())); ), core, SLOT(addSiderealWeek()));
connect(getGuiActions("actionSubtract_Sidereal_Day"), SIGNAL(trigger connect(getGuiActions("actionSubtract_Sidereal_Day"), SIGNAL(trigger
ed()), nav, SLOT(subtractSiderealDay())); ed()), core, SLOT(subtractSiderealDay()));
connect(getGuiActions("actionSubtract_Sidereal_Week"), SIGNAL(trigge connect(getGuiActions("actionSubtract_Sidereal_Week"), SIGNAL(trigge
red()), nav, SLOT(subtractSiderealWeek())); red()), core, SLOT(subtractSiderealWeek()));
connect(getGuiActions("actionSet_Home_Planet_To_Selected"), SIGNAL(t connect(getGuiActions("actionSet_Home_Planet_To_Selected"), SIGNAL(t
riggered()), nav, SLOT(moveObserverToSelected())); riggered()), core, SLOT(moveObserverToSelected()));
// connect the actor after setting the nightmode. // connect the actor after setting the nightmode.
// StelApp::init() already set flagNightMode for us, don't do it twi ce! // StelApp::init() already set flagNightMode for us, don't do it twi ce!
getGuiActions("actionShow_Night_Mode")->setChecked(StelApp::getInsta nce().getVisionModeNight()); getGuiActions("actionShow_Night_Mode")->setChecked(StelApp::getInsta nce().getVisionModeNight());
connect(getGuiActions("actionShow_Night_Mode"), SIGNAL(toggled(bool) ), &StelApp::getInstance(), SLOT(setVisionModeNight(bool))); connect(getGuiActions("actionShow_Night_Mode"), SIGNAL(toggled(bool) ), &StelApp::getInstance(), SLOT(setVisionModeNight(bool)));
connect(getGuiActions("actionGoto_Selected_Object"), SIGNAL(triggere d()), mmgr, SLOT(setFlagTracking())); connect(getGuiActions("actionGoto_Selected_Object"), SIGNAL(triggere d()), mmgr, SLOT(setFlagTracking()));
connect(getGuiActions("actionZoom_In_Auto"), SIGNAL(triggered()), mm gr, SLOT(autoZoomIn())); connect(getGuiActions("actionZoom_In_Auto"), SIGNAL(triggered()), mm gr, SLOT(autoZoomIn()));
connect(getGuiActions("actionZoom_Out_Auto"), SIGNAL(triggered()), m mgr, SLOT(autoZoomOut())); connect(getGuiActions("actionZoom_Out_Auto"), SIGNAL(triggered()), m mgr, SLOT(autoZoomOut()));
connect(getGuiActions("actionSet_Tracking"), SIGNAL(toggled(bool)), mmgr, SLOT(setFlagTracking(bool))); connect(getGuiActions("actionSet_Tracking"), SIGNAL(toggled(bool)), mmgr, SLOT(setFlagTracking(bool)));
skipping to change at line 485 skipping to change at line 488
l->setContentsMargins(0,0,0,0); l->setContentsMargins(0,0,0,0);
l->setSpacing(0); l->setSpacing(0);
l->addItem(skyGui, 0, 0); l->addItem(skyGui, 0, 0);
stelAppGraphicsWidget->setLayout(l); stelAppGraphicsWidget->setLayout(l);
setStelStyle(StelApp::getInstance().getCurrentStelStyle()); setStelStyle(StelApp::getInstance().getCurrentStelStyle());
skyGui->setGeometry(stelAppGraphicsWidget->geometry()); skyGui->setGeometry(stelAppGraphicsWidget->geometry());
skyGui->updateBarsPos(); skyGui->updateBarsPos();
StelApp *app = &StelApp::getInstance();
connect(app, SIGNAL(languageChanged()), this, SLOT(updateI18n()));
connect(app, SIGNAL(colorSchemeChanged(const QString&)), this, SLOT(
setStelStyle(const QString&)));
initDone = true; initDone = true;
} }
void StelGui::quit() void StelGui::quit()
{ {
StelMainGraphicsView::getInstance().getScriptMgr().stopScript(); StelMainGraphicsView::getInstance().getScriptMgr().stopScript();
QCoreApplication::exit(); QCoreApplication::exit();
} }
//! Reload the current Qt Style Sheet (Debug only) //! Reload the current Qt Style Sheet (Debug only)
skipping to change at line 533 skipping to change at line 539
QFile styleFile(qtStyleFileName); QFile styleFile(qtStyleFileName);
styleFile.open(QIODevice::ReadOnly); styleFile.open(QIODevice::ReadOnly);
currentStelStyle.qtStyleSheet = styleFile.readAll(); currentStelStyle.qtStyleSheet = styleFile.readAll();
QFile htmlStyleFile(htmlStyleFileName); QFile htmlStyleFile(htmlStyleFileName);
htmlStyleFile.open(QIODevice::ReadOnly); htmlStyleFile.open(QIODevice::ReadOnly);
currentStelStyle.htmlStyleSheet = htmlStyleFile.readAll(); currentStelStyle.htmlStyleSheet = htmlStyleFile.readAll();
} }
qApp->setStyleSheet(currentStelStyle.qtStyleSheet); qApp->setStyleSheet(currentStelStyle.qtStyleSheet);
skyGui->setStelStyle(currentStelStyle);
locationDialog.styleChanged(); locationDialog.styleChanged();
dateTimeDialog.styleChanged(); dateTimeDialog.styleChanged();
configurationDialog->styleChanged(); configurationDialog->styleChanged();
searchDialog.styleChanged(); searchDialog.styleChanged();
viewDialog.styleChanged(); viewDialog.styleChanged();
#ifdef ENABLE_SCRIPT_CONSOLE #ifdef ENABLE_SCRIPT_CONSOLE
scriptConsole.styleChanged(); scriptConsole.styleChanged();
#endif // ENABLE_SCRIPT_CONSOLE #endif // ENABLE_SCRIPT_CONSOLE
} }
void StelGui::updateI18n() void StelGui::updateI18n()
{ {
StelGuiBase::updateI18n(); StelGuiBase::updateI18n();
// Update the dialogs
configurationDialog->languageChanged();
dateTimeDialog.languageChanged();
helpDialog.languageChanged();
locationDialog.languageChanged();
searchDialog.languageChanged();
viewDialog.languageChanged();
} }
void StelGui::update() void StelGui::update()
{ {
StelNavigator* nav = StelApp::getInstance().getCore()->getNavigator( StelCore* core = StelApp::getInstance().getCore();
); if (core->getTimeRate()<-0.99*StelCore::JD_SECOND)
if (nav->getTimeRate()<-0.99*JD_SECOND)
{ {
if (buttonTimeRewind->isChecked()==false) if (buttonTimeRewind->isChecked()==false)
buttonTimeRewind->setChecked(true); buttonTimeRewind->setChecked(true);
} }
else else
{ {
if (buttonTimeRewind->isChecked()==true) if (buttonTimeRewind->isChecked()==true)
buttonTimeRewind->setChecked(false); buttonTimeRewind->setChecked(false);
} }
if (nav->getTimeRate()>1.01*JD_SECOND) if (core->getTimeRate()>1.01*StelCore::JD_SECOND)
{ {
if (buttonTimeForward->isChecked()==false) if (buttonTimeForward->isChecked()==false)
buttonTimeForward->setChecked(true); buttonTimeForward->setChecked(true);
} }
else else
{ {
if (buttonTimeForward->isChecked()==true) if (buttonTimeForward->isChecked()==true)
buttonTimeForward->setChecked(false); buttonTimeForward->setChecked(false);
} }
if (nav->getTimeRate() == 0) { if (core->getTimeRate() == 0) {
if (buttonTimeRealTimeSpeed->isChecked() != StelButton::Butt onStateNoChange) if (buttonTimeRealTimeSpeed->isChecked() != StelButton::Butt onStateNoChange)
buttonTimeRealTimeSpeed->setChecked(StelButton::Butt onStateNoChange); buttonTimeRealTimeSpeed->setChecked(StelButton::Butt onStateNoChange);
} else if (nav->getRealTimeSpeed()) { } else if (core->getRealTimeSpeed()) {
if (buttonTimeRealTimeSpeed->isChecked() != StelButton::Butt onStateOn) if (buttonTimeRealTimeSpeed->isChecked() != StelButton::Butt onStateOn)
buttonTimeRealTimeSpeed->setChecked(StelButton::Butt onStateOn); buttonTimeRealTimeSpeed->setChecked(StelButton::Butt onStateOn);
} else if (buttonTimeRealTimeSpeed->isChecked() != StelButton::Butto nStateOff) { } else if (buttonTimeRealTimeSpeed->isChecked() != StelButton::Butto nStateOff) {
buttonTimeRealTimeSpeed->setChecked(StelButton::ButtonStateO ff); buttonTimeRealTimeSpeed->setChecked(StelButton::ButtonStateO ff);
} }
const bool isTimeNow=nav->getIsTimeNow(); const bool isTimeNow=core->getIsTimeNow();
if (buttonTimeCurrent->isChecked()!=isTimeNow) if (buttonTimeCurrent->isChecked()!=isTimeNow)
buttonTimeCurrent->setChecked(isTimeNow); buttonTimeCurrent->setChecked(isTimeNow);
StelMovementMgr* mmgr = GETSTELMODULE(StelMovementMgr); StelMovementMgr* mmgr = GETSTELMODULE(StelMovementMgr);
const bool b = mmgr->getFlagTracking(); const bool b = mmgr->getFlagTracking();
if (buttonGotoSelectedObject->isChecked()!=b) if (buttonGotoSelectedObject->isChecked()!=b)
buttonGotoSelectedObject->setChecked(b); buttonGotoSelectedObject->setChecked(b);
bool flag = GETSTELMODULE(StarMgr)->getFlagStars(); bool flag = GETSTELMODULE(StarMgr)->getFlagStars();
if (getGuiActions("actionShow_Stars")->isChecked() != flag) if (getGuiActions("actionShow_Stars")->isChecked() != flag)
getGuiActions("actionShow_Stars")->setChecked(flag); getGuiActions("actionShow_Stars")->setChecked(flag);
skipping to change at line 684 skipping to change at line 681
skyGui->infoPanel->setTextFromObjects(GETSTELMODULE(StelObjectMgr)-> getSelectedObject()); skyGui->infoPanel->setTextFromObjects(GETSTELMODULE(StelObjectMgr)-> getSelectedObject());
// Check if the progressbar window changed, if yes update the whole view // Check if the progressbar window changed, if yes update the whole view
if (savedProgressBarSize!=skyGui->progressBarMgr->boundingRect().siz e()) if (savedProgressBarSize!=skyGui->progressBarMgr->boundingRect().siz e())
{ {
savedProgressBarSize=skyGui->progressBarMgr->boundingRect(). size(); savedProgressBarSize=skyGui->progressBarMgr->boundingRect(). size();
skyGui->updateBarsPos(); skyGui->updateBarsPos();
} }
if (dateTimeDialog.visible()) if (dateTimeDialog.visible())
dateTimeDialog.setDateTime(nav->getJDay()); dateTimeDialog.setDateTime(core->getJDay());
} }
// Add a new progress bar in the lower right corner of the screen. // Add a new progress bar in the lower right corner of the screen.
QProgressBar* StelGui::addProgressBar() QProgressBar* StelGui::addProgressBar()
{ {
return skyGui->progressBarMgr->addProgressBar(); return skyGui->progressBarMgr->addProgressBar();
} }
void StelGui::setScriptKeys(bool b) void StelGui::setScriptKeys(bool b)
{ {
 End of changes. 16 change blocks. 
55 lines changed or deleted 54 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/