Index: qtappwin.cpp =================================================================== --- qtappwin.cpp (revision 4449) +++ qtappwin.cpp (working copy) @@ -312,6 +312,8 @@ guidesToolBar->addAction(actions->equatorialGridAction); guidesToolBar->addAction(actions->galacticGridAction); guidesToolBar->addAction(actions->eclipticGridAction); + guidesToolBar->addAction(actions->horizonGridAction); + guidesToolBar->addAction(actions->eclipticAction); guidesToolBar->addAction(actions->markersAction); guidesToolBar->addAction(actions->constellationsAction); guidesToolBar->addAction(actions->boundariesAction); @@ -1145,6 +1147,8 @@ QMenu* deepSkyMenu = displayMenu->addMenu(tr("Dee&p Sky Objects")); deepSkyMenu->addAction(actions->galaxiesAction); + deepSkyMenu->addAction(actions->globularsAction); + deepSkyMenu->addAction(actions->openClustersAction); deepSkyMenu->addAction(actions->nebulaeAction); QMenu* shadowMenu = displayMenu->addMenu(tr("&Shadows")); Index: qtcelestiaactions.cpp =================================================================== --- qtcelestiaactions.cpp (revision 4449) +++ qtcelestiaactions.cpp (working copy) @@ -24,12 +24,21 @@ galacticGridAction(NULL), eclipticGridAction(NULL), horizonGridAction(NULL), + eclipticAction(NULL), markersAction(NULL), constellationsAction(NULL), boundariesAction(NULL), orbitsAction(NULL), + galaxiesAction(NULL), + globularsAction(NULL), + openClustersAction(NULL), + nebulaeAction(NULL), + labelGalaxiesAction(NULL), + labelGlobularsAction(NULL), + labelOpenClustersAction(NULL), + labelNebulaeAction(NULL), labelStarsAction(NULL), labelPlanetsAction(NULL), labelDwarfPlanetsAction(NULL), @@ -74,6 +83,11 @@ horizonGridAction->setCheckable(true); horizonGridAction->setData(Renderer::ShowHorizonGrid); + eclipticAction = new QAction(QString("Ecl"), this); + eclipticAction->setToolTip(tr("Ecliptic line")); + eclipticAction->setCheckable(true); + eclipticAction->setData(Renderer::ShowEcliptic); + markersAction = new QAction(QString("M"), this); markersAction->setToolTip(tr("Markers")); markersAction->setCheckable(true); @@ -98,6 +112,7 @@ connect(galacticGridAction, SIGNAL(triggered()), this, SLOT(slotToggleRenderFlag())); connect(eclipticGridAction, SIGNAL(triggered()), this, SLOT(slotToggleRenderFlag())); connect(horizonGridAction, SIGNAL(triggered()), this, SLOT(slotToggleRenderFlag())); + connect(eclipticAction, SIGNAL(triggered()), this, SLOT(slotToggleRenderFlag())); connect(markersAction, SIGNAL(triggered()), this, SLOT(slotToggleRenderFlag())); connect(constellationsAction, SIGNAL(triggered()), this, SLOT(slotToggleRenderFlag())); connect(boundariesAction, SIGNAL(triggered()), this, SLOT(slotToggleRenderFlag())); @@ -141,14 +156,16 @@ labelCometsAction = createCheckableAction(tr("Comets"), labelsMenu, Renderer::CometLabels); labelSpacecraftAction = createCheckableAction(tr("Spacecraft"), labelsMenu, Renderer::SpacecraftLabels); labelGalaxiesAction = createCheckableAction(tr("Galaxies"), labelsMenu, Renderer::GalaxyLabels); + labelGlobularsAction = createCheckableAction(tr("Globulars"), labelsMenu, Renderer::GlobularLabels); + labelOpenClustersAction = createCheckableAction(tr("Open clusters"), labelsMenu, Renderer::OpenClusterLabels); labelNebulaeAction = createCheckableAction(tr("Nebulae"), labelsMenu, Renderer::NebulaLabels); - labelOpenClustersAction = createCheckableAction(tr("Open clusters"), labelsMenu, Renderer::OpenClusterLabels); labelLocationsAction = createCheckableAction(tr("Locations"), labelsMenu, Renderer::LocationLabels); labelConstellationsAction = createCheckableAction(tr("Constellations"), labelsMenu, Renderer::ConstellationLabels); connect(labelGalaxiesAction, SIGNAL(triggered()), this, SLOT(slotToggleLabel())); + connect(labelGlobularsAction, SIGNAL(triggered()), this, SLOT(slotToggleLabel())); + connect(labelOpenClustersAction, SIGNAL(triggered()), this, SLOT(slotToggleLabel())); connect(labelNebulaeAction, SIGNAL(triggered()), this, SLOT(slotToggleLabel())); - connect(labelOpenClustersAction, SIGNAL(triggered()), this, SLOT(slotToggleLabel())); connect(labelStarsAction, SIGNAL(triggered()), this, SLOT(slotToggleLabel())); connect(labelPlanetsAction, SIGNAL(triggered()), this, SLOT(slotToggleLabel())); connect(labelDwarfPlanetsAction, SIGNAL(triggered()), this, SLOT(slotToggleLabel())); @@ -164,12 +181,14 @@ galaxiesAction = createCheckableAction(tr("Galaxies"), Renderer::ShowGalaxies); //galaxiesAction->setShortcut(QString("U")); + globularsAction = createCheckableAction(tr("Globulars"), Renderer::ShowGlobulars); + openClustersAction = createCheckableAction(tr("Open Clusters"), Renderer::ShowOpenClusters); nebulaeAction = createCheckableAction(tr("Nebulae"), Renderer::ShowNebulae); nebulaeAction->setShortcut(QString("^")); - openClustersAction = createCheckableAction(tr("Open Clusters"), Renderer::ShowOpenClusters); connect(galaxiesAction, SIGNAL(triggered()), this, SLOT(slotToggleRenderFlag())); + connect(globularsAction, SIGNAL(triggered()), this, SLOT(slotToggleRenderFlag())); + connect(openClustersAction, SIGNAL(triggered()), this, SLOT(slotToggleRenderFlag())); connect(nebulaeAction, SIGNAL(triggered()), this, SLOT(slotToggleRenderFlag())); - connect(openClustersAction, SIGNAL(triggered()), this, SLOT(slotToggleRenderFlag())); cloudsAction = createCheckableAction(tr("Clouds"), Renderer::ShowCloudMaps); //cloudsAction->setShortcut(QString("I")); @@ -248,14 +267,16 @@ galacticGridAction->setChecked(renderFlags & Renderer::ShowGalacticGrid); eclipticGridAction->setChecked(renderFlags & Renderer::ShowEclipticGrid); horizonGridAction->setChecked(renderFlags & Renderer::ShowHorizonGrid); + eclipticAction->setChecked(renderFlags & Renderer::ShowEcliptic); markersAction->setChecked(renderFlags & Renderer::ShowMarkers); constellationsAction->setChecked(renderFlags & Renderer::ShowDiagrams); boundariesAction->setChecked(renderFlags & Renderer::ShowBoundaries); orbitsAction->setChecked(renderFlags & Renderer::ShowOrbits); labelGalaxiesAction->setChecked(labelMode & Renderer::GalaxyLabels); + labelGlobularsAction->setChecked(labelMode & Renderer::GlobularLabels); + labelOpenClustersAction->setChecked(labelMode & Renderer::OpenClusterLabels); labelNebulaeAction->setChecked(labelMode & Renderer::NebulaLabels); - labelOpenClustersAction->setChecked(labelMode & Renderer::OpenClusterLabels); labelStarsAction->setChecked(labelMode & Renderer::StarLabels); labelPlanetsAction->setChecked(labelMode & Renderer::PlanetLabels); labelDwarfPlanetsAction->setChecked(labelMode & Renderer::DwarfPlanetLabels); @@ -294,8 +315,9 @@ // Deep sky object visibility galaxiesAction->setChecked(renderFlags & Renderer::ShowGalaxies); + globularsAction->setChecked(renderFlags & Renderer::ShowGlobulars); + openClustersAction->setChecked(renderFlags & Renderer::ShowOpenClusters); nebulaeAction->setChecked(renderFlags & Renderer::ShowNebulae); - openClustersAction->setChecked(renderFlags & Renderer::ShowOpenClusters); // Shadows ringShadowsAction->setChecked(renderFlags & Renderer::ShowRingShadows); Index: qtcelestiaactions.h =================================================================== --- qtcelestiaactions.h (revision 4449) +++ qtcelestiaactions.h (working copy) @@ -51,6 +51,7 @@ QAction* galacticGridAction; QAction* eclipticGridAction; QAction* horizonGridAction; + QAction* eclipticAction; QAction* markersAction; QAction* constellationsAction; QAction* boundariesAction; @@ -58,12 +59,14 @@ QAction* starsAction; QAction* planetsAction; QAction* galaxiesAction; + QAction* globularsAction; + QAction* openClustersAction; QAction* nebulaeAction; - QAction* openClustersAction; QAction* labelGalaxiesAction; + QAction* labelGlobularsAction; + QAction* labelOpenClustersAction; QAction* labelNebulaeAction; - QAction* labelOpenClustersAction; QAction* labelStarsAction; QAction* labelPlanetsAction; QAction* labelDwarfPlanetsAction;