StelGui.cpp   StelGui.cpp 
skipping to change at line 35 skipping to change at line 35
#include "StelCore.hpp" #include "StelCore.hpp"
#include "StelProjector.hpp" #include "StelProjector.hpp"
#include "StelMovementMgr.hpp" #include "StelMovementMgr.hpp"
#include "StelFileMgr.hpp" #include "StelFileMgr.hpp"
#include "StelModuleMgr.hpp" #include "StelModuleMgr.hpp"
#include "StelIniParser.hpp" #include "StelIniParser.hpp"
#include "StelMainView.hpp" #include "StelMainView.hpp"
#include "StelObjectMgr.hpp" #include "StelObjectMgr.hpp"
#include "LandscapeMgr.hpp" #include "LandscapeMgr.hpp"
#include "StarMgr.hpp" #include "StarMgr.hpp"
#include "ConstellationMgr.hpp"
#include "GridLinesMgr.hpp"
#include "NebulaMgr.hpp" #include "NebulaMgr.hpp"
#include "StelLocaleMgr.hpp" #include "StelLocaleMgr.hpp"
#include "StelActionMgr.hpp" #include "StelActionMgr.hpp"
#include "StelPropertyMgr.hpp"
#include "SporadicMeteorMgr.hpp" #include "SporadicMeteorMgr.hpp"
#include "StelObjectType.hpp" #include "StelObjectType.hpp"
#include "StelObject.hpp" #include "StelObject.hpp"
#include "SolarSystem.hpp" #include "SolarSystem.hpp"
#include "ToastMgr.hpp"
#include "StelSkyLayerMgr.hpp"
#include "StelStyle.hpp" #include "StelStyle.hpp"
#include "StelSkyDrawer.hpp" #include "StelSkyDrawer.hpp"
#ifdef ENABLE_SCRIPT_CONSOLE #ifdef ENABLE_SCRIPT_CONSOLE
#include "ScriptConsole.hpp" #include "ScriptConsole.hpp"
#endif #endif
#ifndef DISABLE_SCRIPTING #ifndef DISABLE_SCRIPTING
#include "StelScriptMgr.hpp" #include "StelScriptMgr.hpp"
#endif #endif
#include "ConfigurationDialog.hpp" #include "ConfigurationDialog.hpp"
skipping to change at line 82 skipping to change at line 79
#include <QTextBrowser> #include <QTextBrowser>
#include <QGraphicsWidget> #include <QGraphicsWidget>
#include <QGraphicsGridLayout> #include <QGraphicsGridLayout>
#include <QClipboard> #include <QClipboard>
#include <QPalette> #include <QPalette>
#include <QColor> #include <QColor>
#include <QAction> #include <QAction>
#include <QKeySequence> #include <QKeySequence>
StelGui::StelGui() StelGui::StelGui()
: topLevelGraphicsWidget(NULL) : topLevelGraphicsWidget(Q_NULLPTR)
, skyGui(NULL) , skyGui(Q_NULLPTR)
, buttonTimeRewind(NULL) , buttonTimeRewind(Q_NULLPTR)
, buttonTimeRealTimeSpeed(NULL) , buttonTimeRealTimeSpeed(Q_NULLPTR)
, buttonTimeCurrent(NULL) , buttonTimeCurrent(Q_NULLPTR)
, buttonTimeForward(NULL) , buttonTimeForward(Q_NULLPTR)
, buttonGotoSelectedObject(NULL) , buttonGotoSelectedObject(Q_NULLPTR)
, locationDialog(0) , locationDialog(Q_NULLPTR)
, helpDialog(0) , helpDialog(Q_NULLPTR)
, dateTimeDialog(0) , dateTimeDialog(Q_NULLPTR)
, searchDialog(0) , searchDialog(Q_NULLPTR)
, viewDialog(0) , viewDialog(Q_NULLPTR)
, shortcutsDialog(0) , shortcutsDialog(Q_NULLPTR)
, configurationDialog(0) , configurationDialog(Q_NULLPTR)
#ifdef ENABLE_SCRIPT_CONSOLE #ifdef ENABLE_SCRIPT_CONSOLE
, scriptConsole(0) , scriptConsole(Q_NULLPTR)
#endif #endif
, astroCalcDialog(0) , astroCalcDialog(Q_NULLPTR)
, bookmarksDialog(0) , bookmarksDialog(Q_NULLPTR)
, flagShowFlipButtons(false) , flagShowFlipButtons(false)
, flipVert(NULL) , flipVert(Q_NULLPTR)
, flipHoriz(NULL) , flipHoriz(Q_NULLPTR)
, flagShowNebulaBackgroundButton(false) , flagShowNebulaBackgroundButton(false)
, btShowNebulaeBackground(NULL) , btShowNebulaeBackground(Q_NULLPTR)
, flagShowToastSurveyButton(false) , flagShowToastSurveyButton(false)
, btShowToastSurvey(NULL) , btShowToastSurvey(Q_NULLPTR)
, flagShowBookmarksButton(false) , flagShowBookmarksButton(false)
, btShowBookmarks(NULL) , btShowBookmarks(Q_NULLPTR)
, flagShowICRSGridButton(false)
, btShowICRSGrid(Q_NULLPTR)
, flagShowGalacticGridButton(false)
, btShowGalacticGrid(Q_NULLPTR)
, flagShowEclipticGridButton(false)
, btShowEclipticGrid(Q_NULLPTR)
, flagShowConstellationBoundariesButton(false)
, btShowConstellationBoundaries(Q_NULLPTR)
, initDone(false) , initDone(false)
#ifndef DISABLE_SCRIPTING #ifndef DISABLE_SCRIPTING
// We use a QStringList to save the user-configured buttons while script is running, and restore them later. // We use a QStringList to save the user-configured buttons while script is running, and restore them later.
, scriptSaveSpeedbuttons() , scriptSaveSpeedbuttons()
#endif #endif
{ {
// QPixmapCache::setCacheLimit(30000); ? // QPixmapCache::setCacheLimit(30000); ?
} }
StelGui::~StelGui() StelGui::~StelGui()
{ {
delete skyGui; delete skyGui;
skyGui = NULL; skyGui = Q_NULLPTR;
if (locationDialog) if (locationDialog)
{ {
delete locationDialog; delete locationDialog;
locationDialog = 0; locationDialog = Q_NULLPTR;
} }
if (helpDialog) if (helpDialog)
{ {
delete helpDialog; delete helpDialog;
helpDialog = 0; helpDialog = Q_NULLPTR;
} }
if (dateTimeDialog) if (dateTimeDialog)
{ {
delete dateTimeDialog; delete dateTimeDialog;
dateTimeDialog = 0; dateTimeDialog = Q_NULLPTR;
} }
if (searchDialog) if (searchDialog)
{ {
delete searchDialog; delete searchDialog;
searchDialog = 0; searchDialog = Q_NULLPTR;
} }
if (viewDialog) if (viewDialog)
{ {
delete viewDialog; delete viewDialog;
viewDialog = 0; viewDialog = Q_NULLPTR;
} }
if (shortcutsDialog) if (shortcutsDialog)
{ {
delete shortcutsDialog; delete shortcutsDialog;
shortcutsDialog = NULL; shortcutsDialog = Q_NULLPTR;
} }
// configurationDialog is automatically deleted with its parent widg et. // configurationDialog is automatically deleted with its parent widg et.
#ifdef ENABLE_SCRIPT_CONSOLE #ifdef ENABLE_SCRIPT_CONSOLE
if (scriptConsole) if (scriptConsole)
{ {
delete scriptConsole; delete scriptConsole;
scriptConsole = 0; scriptConsole = Q_NULLPTR;
} }
#endif #endif
if (astroCalcDialog) if (astroCalcDialog)
{ {
delete astroCalcDialog; delete astroCalcDialog;
astroCalcDialog = NULL; astroCalcDialog = Q_NULLPTR;
} }
if (bookmarksDialog) if (bookmarksDialog)
{ {
delete bookmarksDialog; delete bookmarksDialog;
bookmarksDialog = NULL; bookmarksDialog = Q_NULLPTR;
} }
} }
void StelGui::init(QGraphicsWidget *atopLevelGraphicsWidget) void StelGui::init(QGraphicsWidget *atopLevelGraphicsWidget)
{ {
qDebug() << "Creating GUI ..."; qDebug() << "Creating GUI ...";
StelGuiBase::init(atopLevelGraphicsWidget); StelGuiBase::init(atopLevelGraphicsWidget);
skyGui = new SkyGui(atopLevelGraphicsWidget); skyGui = new SkyGui(atopLevelGraphicsWidget);
locationDialog = new LocationDialog(atopLevelGraphicsWidget); locationDialog = new LocationDialog(atopLevelGraphicsWidget);
skipping to change at line 253 skipping to change at line 258
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
//// QGraphicsView based GUI //// QGraphicsView based GUI
//////////////////////////////////////////////////////////////////// /////// //////////////////////////////////////////////////////////////////// ///////
// Add everything // Add everything
QPixmap pxmapDefault; QPixmap pxmapDefault;
QPixmap pxmapGlow(":/graphicGui/glow.png"); QPixmap pxmapGlow(":/graphicGui/glow.png");
QPixmap pxmapOn(":/graphicGui/2-on-location.png"); QPixmap pxmapOn(":/graphicGui/2-on-location.png");
QPixmap pxmapOff(":/graphicGui/2-off-location.png"); QPixmap pxmapOff(":/graphicGui/2-off-location.png");
StelButton* b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow, "actionShow_Location_Window_Global"); StelButton* b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapG low, "actionShow_Location_Window_Global");
skyGui->winBar->addButton(b); skyGui->winBar->addButton(b);
pxmapOn = QPixmap(":/graphicGui/1-on-time.png"); pxmapOn = QPixmap(":/graphicGui/1-on-time.png");
pxmapOff = QPixmap(":/graphicGui/1-off-time.png"); pxmapOff = QPixmap(":/graphicGui/1-off-time.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow, "actionShow_D ateTime_Window_Global"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow, "actionS how_DateTime_Window_Global");
skyGui->winBar->addButton(b); skyGui->winBar->addButton(b);
pxmapOn = QPixmap(":/graphicGui/5-on-labels.png"); pxmapOn = QPixmap(":/graphicGui/5-on-labels.png");
pxmapOff = QPixmap(":/graphicGui/5-off-labels.png"); pxmapOff = QPixmap(":/graphicGui/5-off-labels.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow, "actionShow_S kyView_Window_Global"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow, "actionS how_SkyView_Window_Global");
skyGui->winBar->addButton(b); skyGui->winBar->addButton(b);
pxmapOn = QPixmap(":/graphicGui/6-on-search.png"); pxmapOn = QPixmap(":/graphicGui/6-on-search.png");
pxmapOff = QPixmap(":/graphicGui/6-off-search.png"); pxmapOff = QPixmap(":/graphicGui/6-off-search.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow, "actionShow_S earch_Window_Global"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow, "actionS how_Search_Window_Global");
skyGui->winBar->addButton(b); skyGui->winBar->addButton(b);
pxmapOn = QPixmap(":/graphicGui/8-on-settings.png"); pxmapOn = QPixmap(":/graphicGui/8-on-settings.png");
pxmapOff = QPixmap(":/graphicGui/8-off-settings.png"); pxmapOff = QPixmap(":/graphicGui/8-off-settings.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow, "actionShow_C onfiguration_Window_Global"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow, "actionS how_Configuration_Window_Global");
skyGui->winBar->addButton(b); skyGui->winBar->addButton(b);
// NOTE: Should be a toggle of visibility for this button? // NOTE: Should be a toggle of visibility for this button?
pxmapOn = QPixmap(":/graphicGui/11-on-AstroCalc.png"); pxmapOn = QPixmap(":/graphicGui/11-on-AstroCalc.png");
pxmapOff = QPixmap(":/graphicGui/11-off-AstroCalc.png"); pxmapOff = QPixmap(":/graphicGui/11-off-AstroCalc.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow, "actionShow_A stroCalc_Window_Global"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow, "actionS how_AstroCalc_Window_Global");
skyGui->winBar->addButton(b); skyGui->winBar->addButton(b);
pxmapOn = QPixmap(":/graphicGui/9-on-help.png"); pxmapOn = QPixmap(":/graphicGui/9-on-help.png");
pxmapOff = QPixmap(":/graphicGui/9-off-help.png"); pxmapOff = QPixmap(":/graphicGui/9-off-help.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow, "actionShow_H elp_Window_Global"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow, "actionS how_Help_Window_Global");
skyGui->winBar->addButton(b); skyGui->winBar->addButton(b);
QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png"); QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png");
pxmapOn = QPixmap(":/graphicGui/btConstellationLines-on.png"); pxmapOn = QPixmap(":/graphicGui/btConstellationLines-on.png");
pxmapOff = QPixmap(":/graphicGui/btConstellationLines-off.png"); pxmapOff = QPixmap(":/graphicGui/btConstellationLines-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS how_Constellation_Lines"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionShow_Constellation_Lines");
skyGui->buttonBar->addButton(b, "010-constellationsGroup"); skyGui->buttonBar->addButton(b, "010-constellationsGroup");
pxmapOn = QPixmap(":/graphicGui/btConstellationLabels-on.png"); pxmapOn = QPixmap(":/graphicGui/btConstellationLabels-on.png");
pxmapOff = QPixmap(":/graphicGui/btConstellationLabels-off.png"); pxmapOff = QPixmap(":/graphicGui/btConstellationLabels-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS how_Constellation_Labels"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionShow_Constellation_Labels");
skyGui->buttonBar->addButton(b, "010-constellationsGroup"); skyGui->buttonBar->addButton(b, "010-constellationsGroup");
pxmapOn = QPixmap(":/graphicGui/btConstellationArt-on.png"); pxmapOn = QPixmap(":/graphicGui/btConstellationArt-on.png");
pxmapOff = QPixmap(":/graphicGui/btConstellationArt-off.png"); pxmapOff = QPixmap(":/graphicGui/btConstellationArt-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS how_Constellation_Art"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionShow_Constellation_Art");
skyGui->buttonBar->addButton(b, "010-constellationsGroup"); skyGui->buttonBar->addButton(b, "010-constellationsGroup");
pxmapOn = QPixmap(":/graphicGui/btEquatorialGrid-on.png"); pxmapOn = QPixmap(":/graphicGui/btEquatorialGrid-on.png");
pxmapOff = QPixmap(":/graphicGui/btEquatorialGrid-off.png"); pxmapOff = QPixmap(":/graphicGui/btEquatorialGrid-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS how_Equatorial_Grid"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionShow_Equatorial_Grid");
skyGui->buttonBar->addButton(b, "020-gridsGroup"); skyGui->buttonBar->addButton(b, "020-gridsGroup");
pxmapOn = QPixmap(":/graphicGui/btAzimuthalGrid-on.png"); pxmapOn = QPixmap(":/graphicGui/btAzimuthalGrid-on.png");
pxmapOff = QPixmap(":/graphicGui/btAzimuthalGrid-off.png"); pxmapOff = QPixmap(":/graphicGui/btAzimuthalGrid-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS how_Azimuthal_Grid"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionShow_Azimuthal_Grid");
skyGui->buttonBar->addButton(b, "020-gridsGroup"); skyGui->buttonBar->addButton(b, "020-gridsGroup");
pxmapOn = QPixmap(":/graphicGui/btGround-on.png"); pxmapOn = QPixmap(":/graphicGui/btGround-on.png");
pxmapOff = QPixmap(":/graphicGui/btGround-off.png"); pxmapOff = QPixmap(":/graphicGui/btGround-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS how_Ground"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionShow_Ground");
skyGui->buttonBar->addButton(b, "030-landscapeGroup"); skyGui->buttonBar->addButton(b, "030-landscapeGroup");
pxmapOn = QPixmap(":/graphicGui/btCardinalPoints-on.png"); pxmapOn = QPixmap(":/graphicGui/btCardinalPoints-on.png");
pxmapOff = QPixmap(":/graphicGui/btCardinalPoints-off.png"); pxmapOff = QPixmap(":/graphicGui/btCardinalPoints-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS how_Cardinal_Points"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionShow_Cardinal_Points");
skyGui->buttonBar->addButton(b, "030-landscapeGroup"); skyGui->buttonBar->addButton(b, "030-landscapeGroup");
pxmapOn = QPixmap(":/graphicGui/btAtmosphere-on.png"); pxmapOn = QPixmap(":/graphicGui/btAtmosphere-on.png");
pxmapOff = QPixmap(":/graphicGui/btAtmosphere-off.png"); pxmapOff = QPixmap(":/graphicGui/btAtmosphere-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS how_Atmosphere"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionShow_Atmosphere");
skyGui->buttonBar->addButton(b, "030-landscapeGroup"); skyGui->buttonBar->addButton(b, "030-landscapeGroup");
pxmapOn = QPixmap(":/graphicGui/btNebula-on.png"); pxmapOn = QPixmap(":/graphicGui/btNebula-on.png");
pxmapOff = QPixmap(":/graphicGui/btNebula-off.png"); pxmapOff = QPixmap(":/graphicGui/btNebula-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS how_Nebulas"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionShow_Nebulas");
skyGui->buttonBar->addButton(b, "040-nebulaeGroup"); skyGui->buttonBar->addButton(b, "040-nebulaeGroup");
pxmapOn = QPixmap(":/graphicGui/btPlanets-on.png"); pxmapOn = QPixmap(":/graphicGui/btPlanets-on.png");
pxmapOff = QPixmap(":/graphicGui/btPlanets-off.png"); pxmapOff = QPixmap(":/graphicGui/btPlanets-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS how_Planets_Labels"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionShow_Planets_Labels");
skyGui->buttonBar->addButton(b, "040-nebulaeGroup"); skyGui->buttonBar->addButton(b, "040-nebulaeGroup");
pxmapOn = QPixmap(":/graphicGui/btEquatorialMount-on.png"); pxmapOn = QPixmap(":/graphicGui/btEquatorialMount-on.png");
pxmapOff = QPixmap(":/graphicGui/btEquatorialMount-off.png"); pxmapOff = QPixmap(":/graphicGui/btEquatorialMount-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS witch_Equatorial_Mount"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionSwitch_Equatorial_Mount");
skyGui->buttonBar->addButton(b, "060-othersGroup"); skyGui->buttonBar->addButton(b, "060-othersGroup");
pxmapOn = QPixmap(":/graphicGui/btGotoSelectedObject-on.png"); pxmapOn = QPixmap(":/graphicGui/btGotoSelectedObject-on.png");
pxmapOff = QPixmap(":/graphicGui/btGotoSelectedObject-off.png"); pxmapOff = QPixmap(":/graphicGui/btGotoSelectedObject-off.png");
buttonGotoSelectedObject = new StelButton(NULL, pxmapOn, pxmapOff, p xmapGlow32x32, "actionGoto_Selected_Object"); buttonGotoSelectedObject = new StelButton(Q_NULLPTR, pxmapOn, pxmapO ff, pxmapGlow32x32, "actionGoto_Selected_Object");
skyGui->buttonBar->addButton(buttonGotoSelectedObject, "060-othersGr oup"); skyGui->buttonBar->addButton(buttonGotoSelectedObject, "060-othersGr oup");
pxmapOn = QPixmap(":/graphicGui/btNightView-on.png"); pxmapOn = QPixmap(":/graphicGui/btNightView-on.png");
pxmapOff = QPixmap(":/graphicGui/btNightView-off.png"); pxmapOff = QPixmap(":/graphicGui/btNightView-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS how_Night_Mode"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionShow_Night_Mode");
skyGui->buttonBar->addButton(b, "060-othersGroup"); skyGui->buttonBar->addButton(b, "060-othersGroup");
pxmapOn = QPixmap(":/graphicGui/btFullScreen-on.png"); pxmapOn = QPixmap(":/graphicGui/btFullScreen-on.png");
pxmapOff = QPixmap(":/graphicGui/btFullScreen-off.png"); pxmapOff = QPixmap(":/graphicGui/btFullScreen-off.png");
b = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionS et_Full_Screen_Global"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "ac tionSet_Full_Screen_Global");
skyGui->buttonBar->addButton(b, "060-othersGroup"); skyGui->buttonBar->addButton(b, "060-othersGroup");
pxmapOn = QPixmap(":/graphicGui/btTimeRewind-on.png"); pxmapOn = QPixmap(":/graphicGui/btTimeRewind-on.png");
pxmapOff = QPixmap(":/graphicGui/btTimeRewind-off.png"); pxmapOff = QPixmap(":/graphicGui/btTimeRewind-off.png");
buttonTimeRewind = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow 32x32, "actionDecrease_Time_Speed"); buttonTimeRewind = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxma pGlow32x32, "actionDecrease_Time_Speed");
skyGui->buttonBar->addButton(buttonTimeRewind, "070-timeGroup"); skyGui->buttonBar->addButton(buttonTimeRewind, "070-timeGroup");
pxmapOn = QPixmap(":/graphicGui/btTimeRealtime-on.png"); pxmapOn = QPixmap(":/graphicGui/btTimeRealtime-on.png");
pxmapOff = QPixmap(":/graphicGui/btTimeRealtime-off.png"); pxmapOff = QPixmap(":/graphicGui/btTimeRealtime-off.png");
pxmapDefault = QPixmap(":/graphicGui/btTimePause-on.png"); pxmapDefault = QPixmap(":/graphicGui/btTimePause-on.png");
buttonTimeRealTimeSpeed = new StelButton(NULL, pxmapOn, pxmapOff, px mapDefault, pxmapGlow32x32, "actionSet_Real_Time_Speed"); buttonTimeRealTimeSpeed = new StelButton(Q_NULLPTR, pxmapOn, pxmapOf f, pxmapDefault, pxmapGlow32x32, "actionSet_Real_Time_Speed");
skyGui->buttonBar->addButton(buttonTimeRealTimeSpeed, "070-timeGroup "); skyGui->buttonBar->addButton(buttonTimeRealTimeSpeed, "070-timeGroup ");
pxmapOn = QPixmap(":/graphicGui/btTimeNow-on.png"); pxmapOn = QPixmap(":/graphicGui/btTimeNow-on.png");
pxmapOff = QPixmap(":/graphicGui/btTimeNow-off.png"); pxmapOff = QPixmap(":/graphicGui/btTimeNow-off.png");
buttonTimeCurrent = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlo w32x32, "actionReturn_To_Current_Time"); buttonTimeCurrent = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxm apGlow32x32, "actionReturn_To_Current_Time");
skyGui->buttonBar->addButton(buttonTimeCurrent, "070-timeGroup"); skyGui->buttonBar->addButton(buttonTimeCurrent, "070-timeGroup");
pxmapOn = QPixmap(":/graphicGui/btTimeForward-on.png"); pxmapOn = QPixmap(":/graphicGui/btTimeForward-on.png");
pxmapOff = QPixmap(":/graphicGui/btTimeForward-off.png"); pxmapOff = QPixmap(":/graphicGui/btTimeForward-off.png");
buttonTimeForward = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlo w32x32, "actionIncrease_Time_Speed"); buttonTimeForward = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxm apGlow32x32, "actionIncrease_Time_Speed");
skyGui->buttonBar->addButton(buttonTimeForward, "070-timeGroup"); skyGui->buttonBar->addButton(buttonTimeForward, "070-timeGroup");
pxmapOn = QPixmap(":/graphicGui/btQuit.png"); pxmapOn = QPixmap(":/graphicGui/btQuit.png");
b = new StelButton(NULL, pxmapOn, pxmapOn, pxmapGlow32x32, "actionQu it_Global"); b = new StelButton(Q_NULLPTR, pxmapOn, pxmapOn, pxmapGlow32x32, "act ionQuit_Global");
skyGui->buttonBar->addButton(b, "080-quitGroup"); skyGui->buttonBar->addButton(b, "080-quitGroup");
// add the flip buttons if requested in the config // add the flip buttons if requested in the config
setFlagShowFlipButtons(conf->value("gui/flag_show_flip_buttons", fal se).toBool()); setFlagShowFlipButtons(conf->value("gui/flag_show_flip_buttons", fal se).toBool());
setFlagShowNebulaBackgroundButton(conf->value("gui/flag_show_nebulae _background_button", false).toBool()); setFlagShowNebulaBackgroundButton(conf->value("gui/flag_show_nebulae _background_button", false).toBool());
setFlagShowToastSurveyButton(conf->value("gui/flag_show_toast_survey _button", false).toBool()); setFlagShowToastSurveyButton(conf->value("gui/flag_show_toast_survey _button", false).toBool());
setFlagShowBookmarksButton(conf->value("gui/flag_show_bookmarks_butt on", false).toBool()); setFlagShowBookmarksButton(conf->value("gui/flag_show_bookmarks_butt on", false).toBool());
setFlagShowICRSGridButton(conf->value("gui/flag_show_icrs_grid_butto
n", false).toBool());
setFlagShowGalacticGridButton(conf->value("gui/flag_show_galactic_gr
id_button", false).toBool());
setFlagShowEclipticGridButton(conf->value("gui/flag_show_ecliptic_gr
id_button", false).toBool());
setFlagShowConstellationBoundariesButton(conf->value("gui/flag_show_
boundaries_button", false).toBool());
//////////////////////////////////////////////////////////////////// /// //////////////////////////////////////////////////////////////////// ///
// Create the main base widget // Create the main base widget
skyGui->init(this); skyGui->init(this);
QGraphicsGridLayout* l = new QGraphicsGridLayout(); QGraphicsGridLayout* l = new QGraphicsGridLayout();
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);
atopLevelGraphicsWidget->setLayout(l); atopLevelGraphicsWidget->setLayout(l);
skipping to change at line 502 skipping to change at line 511
a->setText(q_(englishText)); a->setText(q_(englishText));
} }
} }
} }
} }
void StelGui::update() void StelGui::update()
{ {
StelCore* core = StelApp::getInstance().getCore(); StelCore* core = StelApp::getInstance().getCore();
if (core->getTimeRate()<-0.99*StelCore::JD_SECOND) { if (core->getTimeRate()<-0.99*StelCore::JD_SECOND) {
if (buttonTimeRewind->isChecked()==false) if ( ! buttonTimeRewind->isChecked())
buttonTimeRewind->setChecked(true); buttonTimeRewind->setChecked(true);
} else { } else {
if (buttonTimeRewind->isChecked()==true) if (buttonTimeRewind->isChecked())
buttonTimeRewind->setChecked(false); buttonTimeRewind->setChecked(false);
} }
if (core->getTimeRate()>1.01*StelCore::JD_SECOND) { if (core->getTimeRate()>1.01*StelCore::JD_SECOND) {
if (buttonTimeForward->isChecked()==false) { if ( ! buttonTimeForward->isChecked()) {
buttonTimeForward->setChecked(true); buttonTimeForward->setChecked(true);
} }
} else { } else {
if (buttonTimeForward->isChecked()==true) if (buttonTimeForward->isChecked())
buttonTimeForward->setChecked(false); buttonTimeForward->setChecked(false);
} }
if (core->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 (core->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=core->getIsTimeNow(); const bool isTimeNow=core->getIsTimeNow();
if (buttonTimeCurrent->isChecked()!=isTimeNow) { if (static_cast<bool>(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 (static_cast<bool>(buttonGotoSelectedObject->isChecked())!=b) {
buttonGotoSelectedObject->setChecked(b); buttonGotoSelectedObject->setChecked(b);
} }
StelPropertyMgr* propMgr = StelApp::getInstance().getStelPropertyMan ager();
bool flag; bool flag;
// XXX: this should probably be removed, we can use property NOTIFY flag = propMgr->getProperty("StelSkyLayerMgr.flagShow")->getValue().
instead. toBool();
flag = GETSTELMODULE(StelSkyLayerMgr)->getFlagShow(); if (getAction("actionShow_DSO_Textures")->isChecked() != flag)
if (getAction("actionShow_DSS")->isChecked() != flag) getAction("actionShow_DSO_Textures")->setChecked(flag);
getAction("actionShow_DSS")->setChecked(flag);
flag = GETSTELMODULE(ToastMgr)->getFlagSurveyShow(); flag = propMgr->getProperty("ToastMgr.surveyDisplayed")->getValue(). toBool();
if (getAction("actionShow_Toast_Survey")->isChecked() != flag) if (getAction("actionShow_Toast_Survey")->isChecked() != flag)
getAction("actionShow_Toast_Survey")->setChecked(flag); getAction("actionShow_Toast_Survey")->setChecked(flag);
flag = propMgr->getProperty("GridLinesMgr.equatorJ2000GridDisplayed"
)->getValue().toBool();
if (getAction("actionShow_Equatorial_J2000_Grid")->isChecked() != fl
ag)
getAction("actionShow_Equatorial_J2000_Grid")->setChecked(fl
ag);
flag = propMgr->getProperty("GridLinesMgr.galacticGridDisplayed")->g
etValue().toBool();
if (getAction("actionShow_Galactic_Grid")->isChecked() != flag)
getAction("actionShow_Galactic_Grid")->setChecked(flag);
flag = propMgr->getProperty("GridLinesMgr.eclipticGridDisplayed")->g
etValue().toBool();
if (getAction("actionShow_Ecliptic_Grid")->isChecked() != flag)
getAction("actionShow_Ecliptic_Grid")->setChecked(flag);
flag = propMgr->getProperty("ConstellationMgr.boundariesDisplayed")-
>getValue().toBool();
if (getAction("actionShow_Constellation_Boundaries")->isChecked() !=
flag)
getAction("actionShow_Constellation_Boundaries")->setChecked
(flag);
flag = StelApp::getInstance().getVisionModeNight(); flag = StelApp::getInstance().getVisionModeNight();
if (getAction("actionShow_Night_Mode")->isChecked() != flag) if (getAction("actionShow_Night_Mode")->isChecked() != flag)
getAction("actionShow_Night_Mode")->setChecked(flag); getAction("actionShow_Night_Mode")->setChecked(flag);
flag = StelMainView::getInstance().isFullScreen(); flag = StelMainView::getInstance().isFullScreen();
if (getAction("actionSet_Full_Screen_Global")->isChecked() != flag) if (getAction("actionSet_Full_Screen_Global")->isChecked() != flag)
getAction("actionSet_Full_Screen_Global")->setChecked(flag); getAction("actionSet_Full_Screen_Global")->setChecked(flag);
skyGui->infoPanel->setTextFromObjects(GETSTELMODULE(StelObjectMgr)-> getSelectedObject()); skyGui->infoPanel->setTextFromObjects(GETSTELMODULE(StelObjectMgr)-> getSelectedObject());
skipping to change at line 653 skipping to change at line 678
void StelGui::resumeScript() void StelGui::resumeScript()
{ {
StelApp::getInstance().getScriptMgr().resumeScript(); StelApp::getInstance().getScriptMgr().resumeScript();
} }
#endif #endif
void StelGui::setFlagShowFlipButtons(bool b) void StelGui::setFlagShowFlipButtons(bool b)
{ {
if (b==true) { if (b==true) {
if (flipVert==NULL) { if (flipVert==Q_NULLPTR) {
// Create the vertical flip button // Create the vertical flip button
QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png") ; QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png") ;
QPixmap pxmapOn(":/graphicGui/btFlipVertical-on.png" ); QPixmap pxmapOn(":/graphicGui/btFlipVertical-on.png" );
QPixmap pxmapOff(":/graphicGui/btFlipVertical-off.pn g"); QPixmap pxmapOff(":/graphicGui/btFlipVertical-off.pn g");
flipVert = new StelButton(NULL, pxmapOn, pxmapOff, p xmapGlow32x32, "actionVertical_Flip"); flipVert = new StelButton(Q_NULLPTR, pxmapOn, pxmapO ff, pxmapGlow32x32, "actionVertical_Flip");
} }
if (flipHoriz==NULL) { if (flipHoriz==Q_NULLPTR) {
QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png") ; QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png") ;
QPixmap pxmapOn(":/graphicGui/btFlipHorizontal-on.pn g"); QPixmap pxmapOn(":/graphicGui/btFlipHorizontal-on.pn g");
QPixmap pxmapOff(":/graphicGui/btFlipHorizontal-off. png"); QPixmap pxmapOff(":/graphicGui/btFlipHorizontal-off. png");
flipHoriz = new StelButton(NULL, pxmapOn, pxmapOff, pxmapGlow32x32, "actionHorizontal_Flip"); flipHoriz = new StelButton(Q_NULLPTR, pxmapOn, pxmap Off, pxmapGlow32x32, "actionHorizontal_Flip");
} }
getButtonBar()->addButton(flipVert, "060-othersGroup", "acti onQuit_Global"); getButtonBar()->addButton(flipVert, "060-othersGroup", "acti onQuit_Global");
getButtonBar()->addButton(flipHoriz, "060-othersGroup", "act ionVertical_Flip"); getButtonBar()->addButton(flipHoriz, "060-othersGroup", "act ionVertical_Flip");
} else { } else {
getButtonBar()->hideButton("actionVertical_Flip"); getButtonBar()->hideButton("actionVertical_Flip");
getButtonBar()->hideButton("actionHorizontal_Flip"); getButtonBar()->hideButton("actionHorizontal_Flip");
} }
flagShowFlipButtons = b; flagShowFlipButtons = b;
if (initDone) { if (initDone) {
skyGui->updateBarsPos(); skyGui->updateBarsPos();
} }
} }
// Define whether the button toggling nebulae backround images should be vi sible // Define whether the button toggling nebulae backround images should be vi sible
void StelGui::setFlagShowNebulaBackgroundButton(bool b) void StelGui::setFlagShowNebulaBackgroundButton(bool b)
{ {
if (b==true) { if (b==true) {
if (btShowNebulaeBackground==NULL) { if (btShowNebulaeBackground==Q_NULLPTR) {
// Create the nebulae background button // Create the nebulae background button
QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png") ; QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png") ;
QPixmap pxmapOn(":/graphicGui/btDSS-on.png"); QPixmap pxmapOn(":/graphicGui/btDSS-on.png");
QPixmap pxmapOff(":/graphicGui/btDSS-off.png"); QPixmap pxmapOff(":/graphicGui/btDSS-off.png");
btShowNebulaeBackground = new StelButton(NULL, pxmap On, pxmapOff, pxmapGlow32x32, "actionShow_DSS"); btShowNebulaeBackground = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "actionShow_DSO_Textures");
} }
getButtonBar()->addButton(btShowNebulaeBackground, "040-nebu laeGroup"); getButtonBar()->addButton(btShowNebulaeBackground, "040-nebu laeGroup");
} else { } else {
getButtonBar()->hideButton("actionShow_DSS"); getButtonBar()->hideButton("actionShow_DSO_Textures");
} }
flagShowNebulaBackgroundButton = b; flagShowNebulaBackgroundButton = b;
if (initDone) { if (initDone) {
skyGui->updateBarsPos(); skyGui->updateBarsPos();
} }
} }
// Define whether the button toggling bookmarks should be visible // Define whether the button toggling bookmarks should be visible
void StelGui::setFlagShowBookmarksButton(bool b) void StelGui::setFlagShowBookmarksButton(bool b)
{ {
if (b==true) { if (b==true) {
if (btShowBookmarks==NULL) { if (btShowBookmarks==Q_NULLPTR) {
// Create the nebulae background button // Create the nebulae background button
QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png") ; QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png") ;
QPixmap pxmapOn(":/graphicGui/btBookmarksA-on.png"); QPixmap pxmapOn(":/graphicGui/btBookmarksA-on.png");
QPixmap pxmapOff(":/graphicGui/btBookmarksA-off.png" ); QPixmap pxmapOff(":/graphicGui/btBookmarksA-off.png" );
btShowBookmarks = new StelButton(NULL, pxmapOn, pxma pOff, pxmapGlow32x32, "actionShow_Bookmarks_Window_Global"); btShowBookmarks = new StelButton(Q_NULLPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "actionShow_Bookmarks_Window_Global");
} }
getButtonBar()->addButton(btShowBookmarks, "060-othersGroup" ); getButtonBar()->addButton(btShowBookmarks, "060-othersGroup" );
} else { } else {
getButtonBar()->hideButton("actionShow_Bookmarks_Window_Glob al"); getButtonBar()->hideButton("actionShow_Bookmarks_Window_Glob al");
} }
flagShowBookmarksButton = b; flagShowBookmarksButton = b;
if (initDone) { if (initDone) {
skyGui->updateBarsPos(); skyGui->updateBarsPos();
} }
} }
// Define whether the button toggling ICRS grid should be visible
void StelGui::setFlagShowICRSGridButton(bool b)
{
if (b==true) {
if (btShowICRSGrid==Q_NULLPTR) {
// Create the nebulae background button
QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png")
;
QPixmap pxmapOn(":/graphicGui/btEquatorialJ2000Grid-
on.png");
QPixmap pxmapOff(":/graphicGui/btEquatorialJ2000Grid
-off.png");
btShowICRSGrid = new StelButton(Q_NULLPTR, pxmapOn,
pxmapOff, pxmapGlow32x32, "actionShow_Equatorial_J2000_Grid");
}
getButtonBar()->addButton(btShowICRSGrid, "020-gridsGroup");
} else {
getButtonBar()->hideButton("actionShow_Equatorial_J2000_Grid
");
}
flagShowICRSGridButton = b;
if (initDone) {
skyGui->updateBarsPos();
}
}
// Define whether the button toggling galactic grid should be visible
void StelGui::setFlagShowGalacticGridButton(bool b)
{
if (b==true) {
if (btShowGalacticGrid==Q_NULLPTR) {
// Create the nebulae background button
QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png")
;
QPixmap pxmapOn(":/graphicGui/btGalacticGrid-on.png"
);
QPixmap pxmapOff(":/graphicGui/btGalacticGrid-off.pn
g");
btShowGalacticGrid = new StelButton(Q_NULLPTR, pxmap
On, pxmapOff, pxmapGlow32x32, "actionShow_Galactic_Grid");
}
getButtonBar()->addButton(btShowGalacticGrid, "020-gridsGrou
p");
} else {
getButtonBar()->hideButton("actionShow_Galactic_Grid");
}
flagShowGalacticGridButton = b;
if (initDone) {
skyGui->updateBarsPos();
}
}
// Define whether the button toggling ecliptic grid should be visible
void StelGui::setFlagShowEclipticGridButton(bool b)
{
if (b==true) {
if (btShowEclipticGrid==Q_NULLPTR) {
// Create the nebulae background button
QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png")
;
QPixmap pxmapOn(":/graphicGui/btEclipticGrid-on.png"
);
QPixmap pxmapOff(":/graphicGui/btEclipticGrid-off.pn
g");
btShowEclipticGrid = new StelButton(Q_NULLPTR, pxmap
On, pxmapOff, pxmapGlow32x32, "actionShow_Ecliptic_Grid");
}
getButtonBar()->addButton(btShowEclipticGrid, "020-gridsGrou
p");
} else {
getButtonBar()->hideButton("actionShow_Ecliptic_Grid");
}
flagShowEclipticGridButton = b;
if (initDone) {
skyGui->updateBarsPos();
}
}
// Define whether the button toggling constellation boundaries should be vi
sible
void StelGui::setFlagShowConstellationBoundariesButton(bool b)
{
if (b==true) {
if (btShowConstellationBoundaries==Q_NULLPTR) {
// Create the nebulae background button
QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png")
;
QPixmap pxmapOn(":/graphicGui/btConstellationBoundar
ies-on.png");
QPixmap pxmapOff(":/graphicGui/btConstellationBounda
ries-off.png");
btShowConstellationBoundaries = new StelButton(Q_NUL
LPTR, pxmapOn, pxmapOff, pxmapGlow32x32, "actionShow_Constellation_Boundari
es");
}
getButtonBar()->addButton(btShowConstellationBoundaries, "01
0-constellationsGroup");
} else {
getButtonBar()->hideButton("actionShow_Constellation_Boundar
ies");
}
flagShowConstellationBoundariesButton = b;
if (initDone) {
skyGui->updateBarsPos();
}
}
// Define whether the button toggling TOAST survey images should be visible // Define whether the button toggling TOAST survey images should be visible
void StelGui::setFlagShowToastSurveyButton(bool b) void StelGui::setFlagShowToastSurveyButton(bool b)
{ {
if (b==true) { if (b==true) {
if (btShowToastSurvey==NULL) { if (btShowToastSurvey==Q_NULLPTR) {
// Create the nebulae background button // Create the nebulae background button
QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png") ; QPixmap pxmapGlow32x32(":/graphicGui/glow32x32.png") ;
QPixmap pxmapOn(":/graphicGui/btToastSurvey-on.png") ; QPixmap pxmapOn(":/graphicGui/btToastSurvey-on.png") ;
QPixmap pxmapOff(":/graphicGui/btToastSurvey-off.png "); QPixmap pxmapOff(":/graphicGui/btToastSurvey-off.png ");
btShowToastSurvey = new StelButton(NULL, pxmapOn, px mapOff, pxmapGlow32x32, "actionShow_Toast_Survey"); btShowToastSurvey = new StelButton(Q_NULLPTR, pxmapO n, pxmapOff, pxmapGlow32x32, "actionShow_Toast_Survey");
} }
getButtonBar()->addButton(btShowToastSurvey, "040-nebulaeGro up"); getButtonBar()->addButton(btShowToastSurvey, "040-nebulaeGro up");
} else { } else {
getButtonBar()->hideButton("actionShow_Toast_Survey"); getButtonBar()->hideButton("actionShow_Toast_Survey");
} }
flagShowToastSurveyButton = b; flagShowToastSurveyButton = b;
} }
void StelGui::setFlagShowDecimalDegrees(bool b) void StelGui::setFlagShowDecimalDegrees(bool b)
{ {
skipping to change at line 845 skipping to change at line 954
bool StelGui::getFlagShowToastSurveyButton() const bool StelGui::getFlagShowToastSurveyButton() const
{ {
return flagShowToastSurveyButton; return flagShowToastSurveyButton;
} }
bool StelGui::getFlagShowBookmarksButton() const bool StelGui::getFlagShowBookmarksButton() const
{ {
return flagShowBookmarksButton; return flagShowBookmarksButton;
} }
bool StelGui::getFlagShowICRSGridButton() const
{
return flagShowICRSGridButton;
}
bool StelGui::getFlagShowGalacticGridButton() const
{
return flagShowGalacticGridButton;
}
bool StelGui::getFlagShowEclipticGridButton() const
{
return flagShowEclipticGridButton;
}
bool StelGui::getFlagShowConstellationBoundariesButton() const
{
return flagShowConstellationBoundariesButton;
}
bool StelGui::initComplete(void) const bool StelGui::initComplete(void) const
{ {
return initDone; return initDone;
} }
void StelGui::forceRefreshGui() void StelGui::forceRefreshGui()
{ {
skyGui->updateBarsPos(); skyGui->updateBarsPos();
} }
 End of changes. 70 change blocks. 
85 lines changed or deleted 249 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/