Add fixed equator (working) and a preliminary new equatorial grid.add_HA-grid

5 files changed, 906 insertions, 671 deletions

diff --git a/src/core/modules/GridLinesMgr.cpp b/src/core/modules/GridLinesMgr.cpp
index 16b5699a63..38a0ee0781 100644
--- a/src/core/modules/GridLinesMgr.cpp
+++ b/src/core/modules/GridLinesMgr.cpp
@@ -124,6 +124,7 @@ public:
 	{
 		EQUATOR_J2000,
 		EQUATOR_OF_DATE,
+		FIXED_EQUATOR,
 		ECLIPTIC_J2000,
 		ECLIPTIC_OF_DATE,
 		PRECESSIONCIRCLE_N,
@@ -698,6 +699,10 @@ void SkyLine::updateLabel()
 			frameType = StelCore::FrameEquinoxEqu;
 			label = q_("Equator");
 			break;
+		case FIXED_EQUATOR:
+			frameType = StelCore::FrameAltAz; // Apparent Hour Angle is a non-refraction frame. We just have to rotate it by geographic latitude.
+			label = q_("Hour Angle");
+			break;
 		case PRECESSIONCIRCLE_N:
 		case PRECESSIONCIRCLE_S:
 			frameType = StelCore::FrameObservercentricEclipticOfDate;
@@ -1014,7 +1019,13 @@ void SkyLine::draw(StelCore *core) const
 	SphericalCap sphericalCap(Vec3d(0,0,1), 0);
 	Vec3d fpt(1,0,0); // First Point
 
-	if ((line_type==MERIDIAN) || (line_type==COLURE_1))
+	if ((line_type==FIXED_EQUATOR))
+	{
+		Mat4d mat=Mat4d::yrotation(static_cast<double>(core->getCurrentLocation().latitude)*M_PI_180 - M_PI_2);
+		sphericalCap.n=mat*sphericalCap.n;
+		fpt=mat*fpt;
+	}
+	else if ((line_type==MERIDIAN) || (line_type==COLURE_1))
 	{
 		sphericalCap.n.set(0,1,0);
 	}
@@ -1128,6 +1139,8 @@ void SkyLine::draw(StelCore *core) const
 						switch (line_type) {
 							case EQUATOR_J2000:
 							case EQUATOR_OF_DATE:
+							case FIXED_EQUATOR:
+								if (line_type==FIXED_EQUATOR) value=(360-i) % 360;
 								if (!StelApp::getInstance().getFlagShowDecimalDegrees())
 								{
 									value /= 15;
@@ -1236,7 +1249,7 @@ void SkyLine::draw(StelCore *core) const
 	Vec3d p1, p2;
 	if (line_type==CURRENT_VERTICAL)
 	{
-		// The usual handling should always projects this circle into a straight line. However, with some projections we see ugly artifacts. Better handle this line specially.
+		// The usual handling should always project this circle into a straight line. However, with some projections we see ugly artifacts. Better handle this line specially.
 		p1.set(0.,0.,1.);
 		p2.set(0.,0.,-1.);
 		Vec3d pHori;
@@ -1604,6 +1617,7 @@ GridLinesMgr::GridLinesMgr()
 	SkyLine::init();
 
 	equGrid = new SkyGrid(StelCore::FrameEquinoxEqu);
+	fixedEquatorialGrid = new SkyGrid(StelCore::FrameEquinoxEqu);
 	equJ2000Grid = new SkyGrid(StelCore::FrameJ2000);
 	eclJ2000Grid = new SkyGrid(StelCore::FrameObservercentricEclipticJ2000);
 	eclGrid = new SkyGrid(StelCore::FrameObservercentricEclipticOfDate);
@@ -1612,6 +1626,7 @@ GridLinesMgr::GridLinesMgr()
 	aziGrid = new SkyGrid(StelCore::FrameAltAz);
 	equatorLine = new SkyLine(SkyLine::EQUATOR_OF_DATE);
 	equatorJ2000Line = new SkyLine(SkyLine::EQUATOR_J2000);
+	fixedEquatorLine = new SkyLine(SkyLine::FIXED_EQUATOR);
 	eclipticJ2000Line = new SkyLine(SkyLine::ECLIPTIC_J2000);
 	eclipticLine = new SkyLine(SkyLine::ECLIPTIC_OF_DATE);
 	invariablePlaneLine = new SkyLine(SkyLine::INVARIABLEPLANE);
@@ -1654,6 +1669,7 @@ GridLinesMgr::GridLinesMgr()
 GridLinesMgr::~GridLinesMgr()
 {
 	delete equGrid;
+	delete fixedEquatorialGrid;
 	delete equJ2000Grid;
 	delete eclJ2000Grid;
 	delete eclGrid;
@@ -1662,6 +1678,7 @@ GridLinesMgr::~GridLinesMgr()
 	delete aziGrid;
 	delete equatorLine;
 	delete equatorJ2000Line;
+	delete fixedEquatorLine;
 	delete eclipticLine;
 	delete eclipticJ2000Line;
 	delete invariablePlaneLine;
@@ -1724,6 +1741,7 @@ void GridLinesMgr::init()
 	setFlagGridlines(conf->value("viewing/flag_gridlines", true).toBool());
 	setFlagAzimuthalGrid(conf->value("viewing/flag_azimuthal_grid").toBool());
 	setFlagEquatorGrid(conf->value("viewing/flag_equatorial_grid").toBool());
+	setFlagFixedEquatorGrid(conf->value("viewing/flag_fixed_equatorial_grid").toBool());
 	setFlagEquatorJ2000Grid(conf->value("viewing/flag_equatorial_J2000_grid").toBool());
 	setFlagEclipticJ2000Grid(conf->value("viewing/flag_ecliptic_J2000_grid").toBool());
 	setFlagEclipticGrid(conf->value("viewing/flag_ecliptic_grid").toBool());
@@ -1735,6 +1753,9 @@ void GridLinesMgr::init()
 	setFlagEquatorJ2000Line(conf->value("viewing/flag_equator_J2000_line").toBool());
 	setFlagEquatorJ2000Parts(conf->value("viewing/flag_equator_J2000_parts").toBool());
 	setFlagEquatorJ2000Labeled(conf->value("viewing/flag_equator_J2000_labels").toBool());
+	setFlagFixedEquatorLine(conf->value("viewing/flag_fixed_equator_line").toBool());
+	setFlagFixedEquatorParts(conf->value("viewing/flag_fixed_equator_parts").toBool());
+	setFlagFixedEquatorLabeled(conf->value("viewing/flag_fixed_equator_labels").toBool());
 	setFlagEclipticLine(conf->value("viewing/flag_ecliptic_line").toBool());
 	setFlagEclipticParts(conf->value("viewing/flag_ecliptic_parts").toBool());
 	setFlagEclipticLabeled(conf->value("viewing/flag_ecliptic_labels").toBool());
@@ -1798,6 +1819,7 @@ void GridLinesMgr::init()
 	// Load colors from config file
 	QString defaultColor = conf->value("color/default_color", "0.5,0.5,0.7").toString();
 	setColorEquatorGrid(			Vec3f(conf->value("color/equatorial_color", defaultColor).toString()));
+	setColorFixedEquatorGrid(		Vec3f(conf->value("color/fixed_equatorial_color", defaultColor).toString()));
 	setColorEquatorJ2000Grid(		Vec3f(conf->value("color/equatorial_J2000_color", defaultColor).toString()));
 	setColorEclipticJ2000Grid(		Vec3f(conf->value("color/ecliptical_J2000_color", defaultColor).toString()));
 	setColorEclipticGrid(			Vec3f(conf->value("color/ecliptical_color", defaultColor).toString()));
@@ -1806,6 +1828,7 @@ void GridLinesMgr::init()
 	setColorAzimuthalGrid(			Vec3f(conf->value("color/azimuthal_color", defaultColor).toString()));
 	setColorEquatorLine(			Vec3f(conf->value("color/equator_color", defaultColor).toString()));
 	setColorEquatorJ2000Line(		Vec3f(conf->value("color/equator_J2000_color", defaultColor).toString()));
+	setColorFixedEquatorLine(		Vec3f(conf->value("color/fixed_equator_color", defaultColor).toString()));
 	setColorEclipticLine(			Vec3f(conf->value("color/ecliptic_color", defaultColor).toString()));
 	setColorEclipticJ2000Line(		Vec3f(conf->value("color/ecliptic_J2000_color", defaultColor).toString()));
 	setColorInvariablePlaneLine(		Vec3f(conf->value("color/invariable_plane_color", defaultColor).toString()));
@@ -1844,6 +1867,7 @@ void GridLinesMgr::init()
 	QString displayGroup = N_("Display Options");
 	addAction("actionShow_Gridlines",			displayGroup, N_("Grids and lines"), "gridlinesDisplayed");
 	addAction("actionShow_Equatorial_Grid",		displayGroup, N_("Equatorial grid"), "equatorGridDisplayed", "E");
+	addAction("actionShow_Fixed_Equatorial_Grid",	displayGroup, N_("Fixed Equatorial grid"), "fixedEquatorGridDisplayed");
 	addAction("actionShow_Azimuthal_Grid",		displayGroup, N_("Azimuthal grid"), "azimuthalGridDisplayed", "Z");
 	addAction("actionShow_Ecliptic_Line",			displayGroup, N_("Ecliptic line"), "eclipticLineDisplayed", ",");
 	addAction("actionShow_Ecliptic_J2000_Line",	displayGroup, N_("Ecliptic J2000 line"), "eclipticJ2000LineDisplayed");
@@ -1851,6 +1875,7 @@ void GridLinesMgr::init()
 	addAction("actionShow_Solar_Equator_Line",	displayGroup, N_("Solar Equator Plane line"), "solarEquatorLineDisplayed");
 	addAction("actionShow_Equator_Line",			displayGroup, N_("Equator line"), "equatorLineDisplayed", ".");
 	addAction("actionShow_Equator_J2000_Line",	displayGroup, N_("Equator J2000 line"), "equatorJ2000LineDisplayed"); // or with Hotkey??
+	addAction("actionShow_Fixed_Equator_Line",	displayGroup, N_("Fixed Equator line"), "fixedEquatorLineDisplayed");
 	addAction("actionShow_Meridian_Line",			displayGroup, N_("Meridian line"), "meridianLineDisplayed", ";");
 	addAction("actionShow_Horizon_Line",			displayGroup, N_("Horizon line"), "horizonLineDisplayed", "H");
 	addAction("actionShow_Equatorial_J2000_Grid",	displayGroup, N_("Equatorial J2000 grid"), "equatorJ2000GridDisplayed");
@@ -1896,6 +1921,7 @@ void GridLinesMgr::update(double deltaTime)
 {
 	// Update faders
 	equGrid->update(deltaTime);
+	fixedEquatorialGrid->update(deltaTime);
 	equJ2000Grid->update(deltaTime);
 	eclJ2000Grid->update(deltaTime);
 	eclGrid->update(deltaTime);
@@ -1904,6 +1930,7 @@ void GridLinesMgr::update(double deltaTime)
 	aziGrid->update(deltaTime);
 	equatorLine->update(deltaTime);
 	equatorJ2000Line->update(deltaTime);
+	fixedEquatorLine->update(deltaTime);
 	eclipticLine->update(deltaTime);
 	eclipticJ2000Line->update(deltaTime);
 	invariablePlaneLine->update(deltaTime);
@@ -1950,6 +1977,7 @@ void GridLinesMgr::draw(StelCore* core)
 	supergalacticGrid->draw(core);
 	equJ2000Grid->draw(core);
 	equGrid->draw(core);
+	fixedEquatorialGrid->draw(core);
 	aziGrid->draw(core);
 	eclJ2000Grid->draw(core);
 	// While ecliptic of J2000 may be helpful to get a feeling of the Z=0 plane of VSOP87,
@@ -1978,6 +2006,7 @@ void GridLinesMgr::draw(StelCore* core)
 	eclipticJ2000Line->draw(core);	
 	equatorJ2000Line->draw(core);
 	equatorLine->draw(core);
+	fixedEquatorLine->draw(core);
 	invariablePlaneLine->draw(core);
 	solarEquatorLine->draw(core);
 	meridianLine->draw(core);
@@ -2003,6 +2032,7 @@ void GridLinesMgr::updateLabels()
 {
 	equatorJ2000Line->updateLabel();
 	equatorLine->updateLabel();
+	fixedEquatorLine->updateLabel();
 	eclipticLine->updateLabel();
 	eclipticJ2000Line->updateLabel();
 	invariablePlaneLine->updateLabel();
@@ -2058,6 +2088,7 @@ bool GridLinesMgr::getFlagGridlines() const
 void GridLinesMgr::setFlagAllGrids(const bool displayed)
 {
 	setFlagEquatorGrid(displayed);
+	setFlagFixedEquatorGrid(displayed);
 	setFlagEclipticGrid(displayed);
 	setFlagGalacticGrid(displayed);
 	setFlagAzimuthalGrid(displayed);
@@ -2163,6 +2194,33 @@ void GridLinesMgr::setColorEquatorGrid(const Vec3f& newColor)
 	}
 }
 
+//! Set flag for displaying Fixed Equatorial Grid (Hour Angle/Declination)
+void GridLinesMgr::setFlagFixedEquatorGrid(const bool displayed)
+{
+	if(displayed != fixedEquatorialGrid->isDisplayed())
+	{
+		fixedEquatorialGrid->setDisplayed(displayed);
+		emit fixedEquatorGridDisplayedChanged(displayed);
+	}
+}
+//! Get flag for displaying Fixed Equatorial Grid (Hour Angle/Declination)
+bool GridLinesMgr::getFlagFixedEquatorGrid() const
+{
+	return fixedEquatorialGrid->isDisplayed();
+}
+Vec3f GridLinesMgr::getColorFixedEquatorGrid() const
+{
+	return fixedEquatorialGrid->getColor();
+}
+void GridLinesMgr::setColorFixedEquatorGrid(const Vec3f& newColor)
+{
+	if(newColor != fixedEquatorialGrid->getColor())
+	{
+		fixedEquatorialGrid->setColor(newColor);
+		emit fixedEquatorGridColorChanged(newColor);
+	}
+}
+
 //! Set flag for displaying Equatorial J2000 Grid
 void GridLinesMgr::setFlagEquatorJ2000Grid(const bool displayed)
 {
@@ -2404,6 +2462,59 @@ void GridLinesMgr::setColorEquatorJ2000Line(const Vec3f& newColor)
 	}
 }
 
+//! Set flag for displaying Fixed Equator Line
+void GridLinesMgr::setFlagFixedEquatorLine(const bool displayed)
+{
+	if(displayed != fixedEquatorLine->isDisplayed())
+	{
+		fixedEquatorLine->setDisplayed(displayed);
+		emit fixedEquatorLineDisplayedChanged(displayed);
+	}
+}
+//! Get flag for displaying Fixed Equator Line
+bool GridLinesMgr::getFlagFixedEquatorLine() const
+{
+	return fixedEquatorLine->isDisplayed();
+}
+//! Set flag for displaying Fixed Equator Line partitions
+void GridLinesMgr::setFlagFixedEquatorParts(const bool displayed)
+{
+	if(displayed != fixedEquatorLine->showsPartitions())
+	{
+		fixedEquatorLine->setPartitions(displayed);
+		emit fixedEquatorPartsDisplayedChanged(displayed);
+	}
+}
+//! Get flag for displaying Fixed Equator Line partitions
+bool GridLinesMgr::getFlagFixedEquatorParts() const
+{
+	return fixedEquatorLine->showsPartitions();
+}
+void GridLinesMgr::setFlagFixedEquatorLabeled(const bool displayed)
+{
+	if(displayed != fixedEquatorLine->isLabeled())
+	{
+		fixedEquatorLine->setLabeled(displayed);
+		emit fixedEquatorPartsLabeledChanged(displayed);
+	}
+}
+bool GridLinesMgr::getFlagFixedEquatorLabeled() const
+{
+	return fixedEquatorLine->isLabeled();
+}
+Vec3f GridLinesMgr::getColorFixedEquatorLine() const
+{
+	return fixedEquatorLine->getColor();
+}
+void GridLinesMgr::setColorFixedEquatorLine(const Vec3f& newColor)
+{
+	if(newColor != fixedEquatorLine->getColor())
+	{
+		fixedEquatorLine->setColor(newColor);
+		emit fixedEquatorLineColorChanged(newColor);
+	}
+}
+
 //! Set flag for displaying Ecliptic Line
 void GridLinesMgr::setFlagEclipticLine(const bool displayed)
 {
@@ -3585,6 +3696,7 @@ void GridLinesMgr::setLineThickness(const float thickness)
 		// Grids
 		equGrid->setLineThickness(lineThickness);
 		equJ2000Grid->setLineThickness(lineThickness);
+		fixedEquatorialGrid->setLineThickness(lineThickness);
 		galacticGrid->setLineThickness(lineThickness);
 		supergalacticGrid->setLineThickness(lineThickness);
 		eclGrid->setLineThickness(lineThickness);
@@ -3593,6 +3705,7 @@ void GridLinesMgr::setLineThickness(const float thickness)
 		// Lines
 		equatorLine->setLineThickness(lineThickness);
 		equatorJ2000Line->setLineThickness(lineThickness);
+		fixedEquatorLine->setLineThickness(lineThickness);
 		eclipticLine->setLineThickness(lineThickness);
 		eclipticJ2000Line->setLineThickness(lineThickness);
 		invariablePlaneLine->setLineThickness(lineThickness);
@@ -3631,6 +3744,7 @@ void GridLinesMgr::setPartThickness(const float thickness)
 		// Lines
 		equatorLine->setPartThickness(partThickness);
 		equatorJ2000Line->setPartThickness(partThickness);
+		fixedEquatorLine->setPartThickness(partThickness);
 		eclipticLine->setPartThickness(partThickness);
 		eclipticJ2000Line->setPartThickness(partThickness);
 		//invariablePlaneLine->setPartThickness(partThickness);
@@ -3666,6 +3780,7 @@ void GridLinesMgr::setFontSizeFromApp(int size)
 
 	equGrid->setFontSize(gridFontSize);
 	equJ2000Grid->setFontSize(gridFontSize);
+	fixedEquatorialGrid->setFontSize(gridFontSize);
 	galacticGrid->setFontSize(gridFontSize);
 	supergalacticGrid->setFontSize(gridFontSize);
 	eclGrid->setFontSize(gridFontSize);
@@ -3673,6 +3788,7 @@ void GridLinesMgr::setFontSizeFromApp(int size)
 	aziGrid->setFontSize(gridFontSize);
 	equatorLine->setFontSize(lineFontSize);
 	equatorJ2000Line->setFontSize(lineFontSize);
+	fixedEquatorLine->setFontSize(lineFontSize);
 	eclipticLine->setFontSize(lineFontSize);
 	eclipticJ2000Line->setFontSize(lineFontSize);
 	invariablePlaneLine->setFontSize(lineFontSize);
diff --git a/src/core/modules/GridLinesMgr.hpp b/src/core/modules/GridLinesMgr.hpp
index 5e64a061df..5e1fe57801 100644
--- a/src/core/modules/GridLinesMgr.hpp
+++ b/src/core/modules/GridLinesMgr.hpp
@@ -45,6 +45,9 @@ class GridLinesMgr : public StelModule
 	Q_PROPERTY(bool equatorGridDisplayed		READ getFlagEquatorGrid		WRITE setFlagEquatorGrid		NOTIFY equatorGridDisplayedChanged)
 	Q_PROPERTY(Vec3f equatorGridColor		READ getColorEquatorGrid	WRITE setColorEquatorGrid		NOTIFY equatorGridColorChanged)
 
+	Q_PROPERTY(bool fixedEquatorGridDisplayed	READ getFlagFixedEquatorGrid	WRITE setFlagFixedEquatorGrid		NOTIFY fixedEquatorGridDisplayedChanged)
+	Q_PROPERTY(Vec3f fixedEquatorGridColor		READ getColorFixedEquatorGrid	WRITE setColorFixedEquatorGrid		NOTIFY fixedEquatorGridColorChanged)
+
 	Q_PROPERTY(bool equatorJ2000GridDisplayed	READ getFlagEquatorJ2000Grid	WRITE setFlagEquatorJ2000Grid		NOTIFY equatorJ2000GridDisplayedChanged)
 	Q_PROPERTY(Vec3f equatorJ2000GridColor		READ getColorEquatorJ2000Grid	WRITE setColorEquatorJ2000Grid		NOTIFY equatorJ2000GridColorChanged)
 
@@ -70,6 +73,11 @@ class GridLinesMgr : public StelModule
 	Q_PROPERTY(bool equatorJ2000PartsLabeled	READ getFlagEquatorJ2000Labeled	WRITE setFlagEquatorJ2000Labeled	NOTIFY equatorJ2000PartsLabeledChanged)
 	Q_PROPERTY(Vec3f equatorJ2000LineColor		READ getColorEquatorJ2000Line	WRITE setColorEquatorJ2000Line		NOTIFY equatorJ2000LineColorChanged)
 
+	Q_PROPERTY(bool fixedEquatorLineDisplayed	READ getFlagFixedEquatorLine	WRITE setFlagFixedEquatorLine		NOTIFY fixedEquatorLineDisplayedChanged)
+	Q_PROPERTY(bool fixedEquatorPartsDisplayed	READ getFlagFixedEquatorParts	WRITE setFlagFixedEquatorParts		NOTIFY fixedEquatorPartsDisplayedChanged)
+	Q_PROPERTY(bool fixedEquatorPartsLabeled	READ getFlagFixedEquatorLabeled	WRITE setFlagFixedEquatorLabeled	NOTIFY fixedEquatorPartsLabeledChanged)
+	Q_PROPERTY(Vec3f fixedEquatorLineColor		READ getColorFixedEquatorLine	WRITE setColorFixedEquatorLine		NOTIFY fixedEquatorLineColorChanged)
+
 	Q_PROPERTY(bool eclipticLineDisplayed		READ getFlagEclipticLine	WRITE setFlagEclipticLine		NOTIFY eclipticLineDisplayedChanged)
 	Q_PROPERTY(bool eclipticPartsDisplayed		READ getFlagEclipticParts	WRITE setFlagEclipticParts		NOTIFY eclipticPartsDisplayedChanged)
 	Q_PROPERTY(bool eclipticPartsLabeled		READ getFlagEclipticLabeled	WRITE setFlagEclipticLabeled		NOTIFY eclipticPartsLabeledChanged)
@@ -258,6 +266,20 @@ public slots:
 	//! @endcode
 	void setColorEquatorGrid(const Vec3f& newColor);
 
+	//! Setter for displaying the Fixed Equatorial Grid (Hour angle/declination).
+	void setFlagFixedEquatorGrid(const bool displayed);
+	//! Accessor for displaying Fixed Equatorial Grid.
+	bool getFlagFixedEquatorGrid() const;
+	//! Get the current color of the Fixed Equatorial Grid.
+	Vec3f getColorFixedEquatorGrid() const;
+	//! Set the color of the FixedEquatorial Grid.
+	//! @param newColor The color of fixed equatorial grid
+	//! @code
+	//! // example of usage in scripts
+	//! GridLinesMgr.setColorFixedEquatorGrid(Vec3f(1.0,0.0,0.0));
+	//! @endcode
+	void setColorFixedEquatorGrid(const Vec3f& newColor);
+
 	//! Setter for displaying Equatorial J2000 Grid.
 	void setFlagEquatorJ2000Grid(const bool displayed);
 	//! Accessor for displaying Equatorial J2000 Grid.
@@ -372,6 +394,28 @@ public slots:
 	//! @endcode
 	void setColorEquatorJ2000Line(const Vec3f& newColor);
 
+	//! Setter for displaying Fixed Equator Line.
+	void setFlagFixedEquatorLine(const bool displayed);
+	//! Accessor for displaying Fixed Equator Line.
+	bool getFlagFixedEquatorLine() const;
+	//! Setter for displaying Fixed Equator line partitions (hour angles).
+	void setFlagFixedEquatorParts(const bool displayed);
+	//! Accessor for displaying Fixed Equator (hour angles) line partitions.
+	bool getFlagFixedEquatorParts() const;
+	//! Setter for displaying Fixed Equator line partition labels.
+	void setFlagFixedEquatorLabeled(const bool displayed);
+	//! Accessor for displaying Fixed Equator line partition labels.
+	bool getFlagFixedEquatorLabeled() const;
+	//! Get the current color of the Fixed Equator Line.
+	Vec3f getColorFixedEquatorLine() const;
+	//! Set the color of the Fixed Equator Line (hour angles).
+	//! @param newColor The color of fixed equator line
+	//! @code
+	//! // example of usage in scripts
+	//! GridLinesMgr.setColorFixedEquatorLine(Vec3f(1.0,0.0,0.0));
+	//! @endcode
+	void setColorFixedEquatorLine(const Vec3f& newColor);
+
 	//! Setter for displaying Ecliptic of J2000 Line.
 	void setFlagEclipticJ2000Line(const bool displayed);
 	//! Accessor for displaying Ecliptic of J2000 Line.
@@ -913,6 +957,8 @@ signals:
 	void azimuthalGridColorChanged(const Vec3f & newColor);
 	void equatorGridDisplayedChanged(const bool displayed);
 	void equatorGridColorChanged(const Vec3f & newColor);
+	void fixedEquatorGridDisplayedChanged(const bool displayed);
+	void fixedEquatorGridColorChanged(const Vec3f & newColor);
 	void equatorJ2000GridDisplayedChanged(const bool displayed);
 	void equatorJ2000GridColorChanged(const Vec3f & newColor);
 	void eclipticGridDisplayedChanged(const bool displayed);
@@ -931,6 +977,10 @@ signals:
 	void equatorJ2000PartsDisplayedChanged(const bool displayed);
 	void equatorJ2000PartsLabeledChanged(const bool displayed);
 	void equatorJ2000LineColorChanged(const Vec3f & newColor);
+	void fixedEquatorLineDisplayedChanged(const bool displayed);
+	void fixedEquatorPartsDisplayedChanged(const bool displayed);
+	void fixedEquatorPartsLabeledChanged(const bool displayed);
+	void fixedEquatorLineColorChanged(const Vec3f & newColor);
 	void eclipticLineDisplayedChanged(const bool displayed);
 	void eclipticPartsDisplayedChanged(const bool displayed);
 	void eclipticPartsLabeledChanged(const bool displayed);
@@ -1031,27 +1081,29 @@ private slots:
 	void setFontSizeFromApp(int size);
 
 private:
-	QSharedPointer<Planet> earth;	// shortcut Earth pointer. Must be reconnected whenever solar system has been reloaded.
-	bool gridlinesDisplayed;			// master switch to switch off all grids/lines. (useful for oculars plugin)
-	SkyGrid * equGrid;				// Equatorial grid
+	QSharedPointer<Planet> earth;		// shortcut Earth pointer. Must be reconnected whenever solar system has been reloaded.
+	bool gridlinesDisplayed;		// master switch to switch off all grids/lines. (useful for oculars plugin)
+	SkyGrid * equGrid;			// Equatorial grid
 	SkyGrid * equJ2000Grid;			// Equatorial J2000 grid
+	SkyGrid * fixedEquatorialGrid;		// Fixed Equatorial grid (hour angle/declination)
 	SkyGrid * galacticGrid;			// Galactic grid
 	SkyGrid * supergalacticGrid;		// Supergalactic grid
-	SkyGrid * eclGrid;				// Ecliptic of Date grid
+	SkyGrid * eclGrid;			// Ecliptic of Date grid
 	SkyGrid * eclJ2000Grid;			// Ecliptic J2000 grid
-	SkyGrid * aziGrid;				// Azimuthal grid
+	SkyGrid * aziGrid;			// Azimuthal grid
 	SkyLine * equatorLine;			// Celestial Equator line
 	SkyLine * equatorJ2000Line;		// Celestial Equator line of J2000
+	SkyLine * fixedEquatorLine;		// Fixed Celestial Equator line (hour angles)
 	SkyLine * eclipticLine;			// Ecliptic line
 	SkyLine * eclipticJ2000Line;		// Ecliptic line of J2000
-	SkyLine * invariablePlaneLine;	// Invariable Plane of the Solar System (WGCCRE2015 report)
+	SkyLine * invariablePlaneLine;		// Invariable Plane of the Solar System (WGCCRE2015 report)
 	SkyLine * solarEquatorLine;		// Projected Solar equator (WGCCRE2015 report)
 	SkyLine * precessionCircleN;		// Northern precession circle
 	SkyLine * precessionCircleS;		// Southern precession circle
 	SkyLine * meridianLine;			// Meridian line
-	SkyLine * longitudeLine;			// Opposition/conjunction longitude line
+	SkyLine * longitudeLine;		// Opposition/conjunction longitude line
 	SkyLine * horizonLine;			// Horizon line
-	SkyLine * galacticEquatorLine;	// line depicting the Galactic equator as defined by the IAU definition of Galactic coordinates (System II, 1958)
+	SkyLine * galacticEquatorLine;		// line depicting the Galactic equator as defined by the IAU definition of Galactic coordinates (System II, 1958)
 	SkyLine * supergalacticEquatorLine;	// line depicting the Supergalactic equator
 	SkyLine * primeVerticalLine;		// Prime Vertical line
 	SkyLine * currentVerticalLine;		// Vertical line for azimuth of display center. Most useful if altitudes labeled.
@@ -1061,17 +1113,17 @@ private:
 	SkyLine * circumpolarCircleS;		// Southern circumpolar circle
 	SkyLine * umbraCircle;			// Umbra circle (Earth shadow in Lunar distance)
 	SkyLine * penumbraCircle;		// Penumbra circle (Earth partial shadow in Lunar distance)
-	SkyPoint * celestialJ2000Poles;	// Celestial poles of J2000
+	SkyPoint * celestialJ2000Poles;		// Celestial poles of J2000
 	SkyPoint * celestialPoles;		// Celestial poles
 	SkyPoint * zenithNadir;			// Zenith and nadir
 	SkyPoint * eclipticJ2000Poles;		// Ecliptic poles of J2000
-	SkyPoint * eclipticPoles;			// Ecliptic poles
-	SkyPoint * galacticPoles;			// Galactic poles
+	SkyPoint * eclipticPoles;		// Ecliptic poles
+	SkyPoint * galacticPoles;		// Galactic poles
 	SkyPoint * galacticCenter;		// Galactic center and anticenter
-	SkyPoint * supergalacticPoles;	// Supergalactic poles
-	SkyPoint * equinoxJ2000Points;	// Equinox points of J2000
+	SkyPoint * supergalacticPoles;		// Supergalactic poles
+	SkyPoint * equinoxJ2000Points;		// Equinox points of J2000
 	SkyPoint * equinoxPoints;		// Equinox points
-	SkyPoint * solsticeJ2000Points;	// Solstice points of J2000
+	SkyPoint * solsticeJ2000Points;		// Solstice points of J2000
 	SkyPoint * solsticePoints;		// Solstice points
 	SkyPoint * antisolarPoint;		// Antisolar point
 	SkyPoint * umbraCenterPoint;		// The point of the center of umbra
diff --git a/src/gui/ConfigurationDialog.cpp b/src/gui/ConfigurationDialog.cpp
index 4c1c475ce6..81a59d425a 100644
--- a/src/gui/ConfigurationDialog.cpp
+++ b/src/gui/ConfigurationDialog.cpp
@@ -891,12 +891,16 @@ void ConfigurationDialog::saveAllSettings()
 	conf->setValue("viewing/flag_azimuthal_grid",			propMgr->getStelPropertyValue("GridLinesMgr.azimuthalGridDisplayed").toBool());
 	conf->setValue("viewing/flag_equatorial_grid",			propMgr->getStelPropertyValue("GridLinesMgr.equatorGridDisplayed").toBool());
 	conf->setValue("viewing/flag_equatorial_J2000_grid",		propMgr->getStelPropertyValue("GridLinesMgr.equatorJ2000GridDisplayed").toBool());
+	conf->setValue("viewing/flag_fixed_equatorial_grid",		propMgr->getStelPropertyValue("GridLinesMgr.fixedEquatorGridDisplayed").toBool());
 	conf->setValue("viewing/flag_equator_line",				propMgr->getStelPropertyValue("GridLinesMgr.equatorLineDisplayed").toBool());
 	conf->setValue("viewing/flag_equator_parts",			propMgr->getStelPropertyValue("GridLinesMgr.equatorPartsDisplayed").toBool());
 	conf->setValue("viewing/flag_equator_labels",			propMgr->getStelPropertyValue("GridLinesMgr.equatorPartsLabeled").toBool());
 	conf->setValue("viewing/flag_equator_J2000_line",		propMgr->getStelPropertyValue("GridLinesMgr.equatorJ2000LineDisplayed").toBool());
 	conf->setValue("viewing/flag_equator_J2000_parts",		propMgr->getStelPropertyValue("GridLinesMgr.equatorJ2000PartsDisplayed").toBool());
 	conf->setValue("viewing/flag_equator_J2000_labels",		propMgr->getStelPropertyValue("GridLinesMgr.equatorJ2000PartsLabeled").toBool());
+	conf->setValue("viewing/flag_fixed_equator_line",		propMgr->getStelPropertyValue("GridLinesMgr.fixedEquatorLineDisplayed").toBool());
+	conf->setValue("viewing/flag_fixed_equator_parts",		propMgr->getStelPropertyValue("GridLinesMgr.fixedEquatorPartsDisplayed").toBool());
+	conf->setValue("viewing/flag_fixed_equator_labels",		propMgr->getStelPropertyValue("GridLinesMgr.fixedEquatorPartsLabeled").toBool());
 	conf->setValue("viewing/flag_ecliptic_line",				propMgr->getStelPropertyValue("GridLinesMgr.eclipticLineDisplayed").toBool());
 	conf->setValue("viewing/flag_ecliptic_parts",			propMgr->getStelPropertyValue("GridLinesMgr.eclipticPartsDisplayed").toBool());
 	conf->setValue("viewing/flag_ecliptic_labels",			propMgr->getStelPropertyValue("GridLinesMgr.eclipticPartsLabeled").toBool());
diff --git a/src/gui/ViewDialog.cpp b/src/gui/ViewDialog.cpp
index e1a8a1499a..a0a900b899 100644
--- a/src/gui/ViewDialog.cpp
+++ b/src/gui/ViewDialog.cpp
@@ -346,6 +346,7 @@ void ViewDialog::createDialogContent()
 	connectGroupBox(ui->celestialSphereGroupBox,				"actionShow_Gridlines");
 	connectCheckBox(ui->showEquatorLineCheckBox,			"actionShow_Equator_Line");
 	connectCheckBox(ui->showEquatorJ2000LineCheckBox,		"actionShow_Equator_J2000_Line");
+	connectCheckBox(ui->showFixedEquatorLineCheckBox,		"actionShow_Fixed_Equator_Line");
 	connectCheckBox(ui->showEclipticLineJ2000CheckBox,		"actionShow_Ecliptic_J2000_Line");
 	connectCheckBox(ui->showEclipticLineOfDateCheckBox,		"actionShow_Ecliptic_Line");
 	connectCheckBox(ui->showInvariablePlaneCheckBox,			"actionShow_Invariable_Plane_Line");
@@ -354,6 +355,7 @@ void ViewDialog::createDialogContent()
 	connectCheckBox(ui->showLongitudeLineCheckBox,			"actionShow_Longitude_Line");
 	connectCheckBox(ui->showHorizonLineCheckBox,			"actionShow_Horizon_Line");
 	connectCheckBox(ui->showEquatorialGridCheckBox,			"actionShow_Equatorial_Grid");
+	connectCheckBox(ui->showFixedEquatorialGridCheckBox,		"actionShow_Fixed_Equatorial_Grid");
 	connectCheckBox(ui->showGalacticGridCheckBox,			"actionShow_Galactic_Grid");
 	connectCheckBox(ui->showGalacticEquatorLineCheckBox,		"actionShow_Galactic_Equator_Line");
 	connectCheckBox(ui->showSupergalacticGridCheckBox,		"actionShow_Supergalactic_Grid");
@@ -400,6 +402,7 @@ void ViewDialog::createDialogContent()
 	connectIntProperty(ui->partThicknessSpinBox,			"GridLinesMgr.partThickness");
 	connectBoolProperty(ui->equatorPartsCheckBox,			"GridLinesMgr.equatorPartsDisplayed");
 	connectBoolProperty(ui->equatorJ2000PartsCheckBox,	"GridLinesMgr.equatorJ2000PartsDisplayed");
+	connectBoolProperty(ui->fixedEquatorPartsCheckBox,		"GridLinesMgr.fixedEquatorPartsDisplayed");
 	connectBoolProperty(ui->eclipticPartsCheckBox,			"GridLinesMgr.eclipticPartsDisplayed");
 	connectBoolProperty(ui->eclipticJ2000PartsCheckBox,		"GridLinesMgr.eclipticJ2000PartsDisplayed");
 	connectBoolProperty(ui->solarEquatorPartsCheckBox,		"GridLinesMgr.solarEquatorPartsDisplayed");
@@ -414,6 +417,7 @@ void ViewDialog::createDialogContent()
 	connectBoolProperty(ui->supergalacticEquatorPartsCheckBox,	"GridLinesMgr.supergalacticEquatorPartsDisplayed");
 	connectBoolProperty(ui->equatorLabelsCheckBox,		"GridLinesMgr.equatorPartsLabeled");
 	connectBoolProperty(ui->equatorJ2000LabelsCheckBox,	"GridLinesMgr.equatorJ2000PartsLabeled");
+	connectBoolProperty(ui->fixedEquatorLabelsCheckBox,	"GridLinesMgr.fixedEquatorPartsLabeled");
 	connectBoolProperty(ui->eclipticLabelsCheckBox,		"GridLinesMgr.eclipticPartsLabeled");
 	connectBoolProperty(ui->eclipticJ2000LabelsCheckBox,	"GridLinesMgr.eclipticJ2000PartsLabeled");
 	connectBoolProperty(ui->solarEquatorLabelsCheckBox,	"GridLinesMgr.solarEquatorPartsLabeled");
@@ -431,6 +435,7 @@ void ViewDialog::createDialogContent()
 	connectColorButton(ui->colorEclipticGridOfDate,		"GridLinesMgr.eclipticGridColor",		"color/ecliptical_color");
 	connectColorButton(ui->colorEquatorialJ2000Grid,	"GridLinesMgr.equatorJ2000GridColor",		"color/equatorial_J2000_color");
 	connectColorButton(ui->colorEquatorialGrid,		"GridLinesMgr.equatorGridColor",		"color/equatorial_color");
+	connectColorButton(ui->colorFixedEquatorialGrid,	"GridLinesMgr.fixedEquatorGridColor",		"color/fixed_equatorial_color");
 	connectColorButton(ui->colorGalacticGrid,		"GridLinesMgr.galacticGridColor",		"color/galactic_color");
 	connectColorButton(ui->colorSupergalacticGrid,		"GridLinesMgr.supergalacticGridColor",		"color/supergalactic_color");
 	connectColorButton(ui->colorAzimuthalGrid,		"GridLinesMgr.azimuthalGridColor",		"color/azimuthal_color");
@@ -440,6 +445,7 @@ void ViewDialog::createDialogContent()
 	connectColorButton(ui->colorSolarEquatorLine,		"GridLinesMgr.solarEquatorLineColor",		"color/solar_equator_color");
 	connectColorButton(ui->colorEquatorJ2000Line,		"GridLinesMgr.equatorJ2000LineColor",		"color/equator_J2000_color");
 	connectColorButton(ui->colorEquatorLine,		"GridLinesMgr.equatorLineColor",		"color/equator_color");
+	connectColorButton(ui->colorFixedEquatorLine,		"GridLinesMgr.fixedEquatorLineColor",		"color/fixed_equator_color");
 	connectColorButton(ui->colorGalacticEquatorLine,	"GridLinesMgr.galacticEquatorLineColor",	"color/galactic_equator_color");
 	connectColorButton(ui->colorSupergalacticEquatorLine,	"GridLinesMgr.supergalacticEquatorLineColor",	"color/supergalactic_equator_color");
 	connectColorButton(ui->colorHorizonLine,		"GridLinesMgr.horizonLineColor",		"color/horizon_color");
diff --git a/src/gui/viewDialog.ui b/src/gui/viewDialog.ui
index 6ce13bc645..d28473b33b 100644
--- a/src/gui/viewDialog.ui
+++ b/src/gui/viewDialog.ui
@@ -2843,105 +2843,67 @@
              </property>
              <item>
               <layout class="QGridLayout" name="markingsGridLayout">
-               <item row="13" column="6">
-                <widget class="QToolButton" name="colorFOVCircularMarker">
+               <item row="10" column="7">
+                <widget class="QCheckBox" name="showPenumbraCheckBox">
                  <property name="toolTip">
-                  <string>Color of circular marker of FOV</string>
+                  <string>This circle represents the outermost rim of Earth's shadow in the distance of the Moon.</string>
+                 </property>
+                 <property name="text">
+                  <string>Earth penumbra</string>
                  </property>
                 </widget>
                </item>
-               <item row="3" column="6">
-                <widget class="QToolButton" name="colorEclipticPoles">
+               <item row="6" column="6">
+                <widget class="QToolButton" name="colorGalacticPoles">
                  <property name="toolTip">
-                  <string>Color of ecliptic poles (of date)</string>
+                  <string>Color of galactic poles</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="11" column="3">
-                <widget class="QCheckBox" name="showColuresLineCheckBox">
+               <item row="8" column="6">
+                <widget class="QToolButton" name="colorAntisolarPoint">
                  <property name="toolTip">
-                  <string>Show colures (great circles through poles and solstices/equinoxes).</string>
+                  <string>Color of antisolar point</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="13" column="1">
-                <layout class="QHBoxLayout" name="horizontalLayout_26">
-                 <item>
-                  <widget class="QCheckBox" name="showCardinalPointsCheckBox">
-                   <property name="toolTip">
-                    <string>Labels for the cardinal directions (4-wind compass rose).</string>
-                   </property>
-                   <property name="text">
-                    <string>Cardinal points</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <spacer name="horizontalSpacer_7">
-                   <property name="orientation">
-                    <enum>Qt::Horizontal</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>40</width>
-                     <height>20</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item>
-                  <widget class="QCheckBox" name="showOrdinal8WRPointsCheckBox">
-                   <property name="toolTip">
-                    <string>Labels for the intercardinal (or ordinal) directions (8-wind compass rose).</string>
-                   </property>
-                   <property name="text">
-                    <string/>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QCheckBox" name="showOrdinal16WRPointsCheckBox">
-                   <property name="toolTip">
-                    <string>Labels for the secondary intercardinal directions (16-wind compass rose).</string>
-                   </property>
-                   <property name="text">
-                    <string/>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
-               </item>
-               <item row="4" column="7">
-                <widget class="QCheckBox" name="showZenithNadirCheckBox">
+               <item row="1" column="7">
+                <widget class="QCheckBox" name="showCelestialPolesCheckBox">
+                 <property name="toolTip">
+                  <string>Show celestial poles of current planet and date.</string>
+                 </property>
                  <property name="text">
-                  <string>Zenith and Nadir</string>
+                  <string>Celestial poles (of date)</string>
                  </property>
                 </widget>
                </item>
-               <item row="8" column="4">
-                <widget class="QCheckBox" name="solarEquatorPartsCheckBox">
+               <item row="10" column="3">
+                <widget class="QCheckBox" name="showMeridianLineCheckBox">
                  <property name="toolTip">
-                  <string>Show partitions</string>
+                  <string>Show meridian line.</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="14" column="6">
-                <widget class="QToolButton" name="colorFOVRectangularMarker">
+               <item row="4" column="2">
+                <widget class="QToolButton" name="colorEclipticLineOfDate">
                  <property name="toolTip">
-                  <string>Color of rectangular marker of FOV</string>
+                  <string>Color of ecliptic (of date)</string>
+                 </property>
+                 <property name="text">
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="12" column="5">
+               <item row="13" column="5">
                 <widget class="QCheckBox" name="precessionLabelsCheckBox">
                  <property name="toolTip">
                   <string>Label partitions</string>
@@ -2951,483 +2913,379 @@
                  </property>
                 </widget>
                </item>
-               <item row="13" column="2">
-                <widget class="QToolButton" name="colorPrimeVerticalLine">
+               <item row="4" column="4">
+                <widget class="QCheckBox" name="eclipticPartsCheckBox">
                  <property name="toolTip">
-                  <string>Color of Prime Vertical</string>
+                  <string>Show partitions</string>
                  </property>
                  <property name="text">
-                  <string notr="true"/>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="14" column="7">
-                <layout class="QHBoxLayout" name="horizontalLayout_24">
-                 <item>
-                  <widget class="QCheckBox" name="showFOVRectangularMarkerCheckBox">
-                   <property name="toolTip">
-                    <string>Show rectangular marker of field of view (FOV)</string>
-                   </property>
-                   <property name="text">
-                    <string>Rectangular FOV</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QDoubleSpinBox" name="fovRectangularMarkerWidthDoubleSpinBox">
-                   <property name="maximumSize">
-                    <size>
-                     <width>75</width>
-                     <height>16777215</height>
-                    </size>
-                   </property>
-                   <property name="toolTip">
-                    <string>Width of rectangle, in degrees</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                   <property name="minimum">
-                    <double>0.100000000000000</double>
-                   </property>
-                   <property name="maximum">
-                    <double>180.000000000000000</double>
-                   </property>
-                   <property name="singleStep">
-                    <double>0.100000000000000</double>
-                   </property>
-                   <property name="value">
-                    <double>4.000000000000000</double>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QDoubleSpinBox" name="fovRectangularMarkerHeightDoubleSpinBox">
-                   <property name="maximumSize">
-                    <size>
-                     <width>75</width>
-                     <height>16777215</height>
-                    </size>
-                   </property>
-                   <property name="toolTip">
-                    <string>Height of rectangle, in degrees</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                   <property name="minimum">
-                    <double>0.100000000000000</double>
-                   </property>
-                   <property name="maximum">
-                    <double>180.000000000000000</double>
-                   </property>
-                   <property name="singleStep">
-                    <double>0.100000000000000</double>
-                   </property>
-                   <property name="value">
-                    <double>3.000000000000000</double>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QDoubleSpinBox" name="fovRectangularMarkerRotationAngleDoubleSpinBox">
-                   <property name="maximumSize">
-                    <size>
-                     <width>75</width>
-                     <height>16777215</height>
-                    </size>
-                   </property>
-                   <property name="toolTip">
-                    <string>Rotation angle of rectangle, in degrees</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                   <property name="decimals">
-                    <number>1</number>
-                   </property>
-                   <property name="minimum">
-                    <double>-90.000000000000000</double>
-                   </property>
-                   <property name="maximum">
-                    <double>90.000000000000000</double>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
+               <item row="13" column="6">
+                <widget class="QToolButton" name="colorFOVCenterMarker">
+                 <property name="toolTip">
+                  <string>Color of marker of center of FOV</string>
+                 </property>
+                </widget>
                </item>
-               <item row="5" column="3">
-                <widget class="QCheckBox" name="showGalacticEquatorLineCheckBox">
+               <item row="3" column="5">
+                <widget class="QCheckBox" name="eclipticJ2000LabelsCheckBox">
                  <property name="toolTip">
-                  <string>Show Galactic equator line.</string>
+                  <string>Label partitions</string>
                  </property>
                  <property name="text">
-                  <string/>
+                  <string>Ecliptic (J2000)</string>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="7">
-                <widget class="QCheckBox" name="showCircumpolarCirclesCheckBox">
+               <item row="13" column="2">
+                <widget class="QToolButton" name="colorPrecessionCircles">
                  <property name="toolTip">
-                  <string>These circles delimit stars which stay always above (respectively below) the mathematical horizon.</string>
+                  <string>Color of precession circles</string>
                  </property>
                  <property name="text">
-                  <string>Circumpolar circles</string>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="6">
-                <widget class="QToolButton" name="colorAntisolarPoint">
+               <item row="14" column="4">
+                <widget class="QCheckBox" name="primeVerticalPartsCheckBox">
                  <property name="toolTip">
-                  <string>Color of antisolar point</string>
+                  <string>Show partitions</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="1">
-                <widget class="QCheckBox" name="showEquatorialJ2000GridCheckBox">
+               <item row="13" column="0">
+                <widget class="QToolButton" name="colorGalacticCenter">
                  <property name="toolTip">
-                  <string>Equatorial coordinates of J2000.0.</string>
-                 </property>
-                 <property name="text">
-                  <string>Equatorial grid (J2000)</string>
+                  <string>Color of galactic center and anticenter</string>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="7">
-                <widget class="QCheckBox" name="showSupergalacticPolesCheckBox">
+               <item row="1" column="5">
+                <widget class="QCheckBox" name="equatorLabelsCheckBox">
+                 <property name="toolTip">
+                  <string>Label partitions</string>
+                 </property>
                  <property name="text">
-                  <string>Supergalactic poles</string>
+                  <string>Equator (of date)</string>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="3">
-                <widget class="QCheckBox" name="showLongitudeLineCheckBox">
+               <item row="11" column="2">
+                <widget class="QToolButton" name="colorCurrentVerticalLine">
                  <property name="toolTip">
-                  <string>Opposition/conjunction longitude line - the line of ecliptic longitude which passes through both ecliptic poles, the Sun and opposition point.</string>
+                  <string>Color of altitude line</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="5">
-                <widget class="QCheckBox" name="longitudeLabelsCheckBox">
+               <item row="7" column="1">
+                <widget class="QCheckBox" name="showSupergalacticGridCheckBox">
                  <property name="toolTip">
-                  <string>Label partitions</string>
+                  <string>Show de Vaucouleurs' Supergalactic coordinates (1976), defined by the distribution of nearby galaxies.</string>
                  </property>
                  <property name="text">
-                  <string>O./C. longitude</string>
+                  <string>Supergalactic grid</string>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="0">
-                <widget class="QToolButton" name="colorSupergalacticGrid">
+               <item row="4" column="7">
+                <widget class="QCheckBox" name="showEclipticPolesCheckBox">
                  <property name="toolTip">
-                  <string>Color of the supergalactic grid</string>
+                  <string>Show ecliptic poles of current date.</string>
                  </property>
                  <property name="text">
-                  <string notr="true"/>
+                  <string>Ecliptic poles (of date)</string>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="1">
-                <widget class="QCheckBox" name="showEquinoxJ2000PointsCheckBox">
+               <item row="14" column="2">
+                <widget class="QToolButton" name="colorPrimeVerticalLine">
+                 <property name="toolTip">
+                  <string>Color of Prime Vertical</string>
+                 </property>
                  <property name="text">
-                  <string>Equinoxes (J2000)</string>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="3" column="4">
-                <widget class="QCheckBox" name="eclipticPartsCheckBox">
+               <item row="5" column="3">
+                <widget class="QCheckBox" name="showHorizonLineCheckBox">
                  <property name="toolTip">
-                  <string>Show partitions</string>
+                  <string>Show mathematical horizon line.</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="4">
-                <widget class="QCheckBox" name="equatorPartsCheckBox">
+               <item row="9" column="5">
+                <widget class="QCheckBox" name="solarEquatorLabelsCheckBox">
                  <property name="toolTip">
-                  <string>Show partitions</string>
+                  <string>Label partitions</string>
                  </property>
                  <property name="text">
-                  <string/>
+                  <string>Projected Solar Equator</string>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="7">
-                <widget class="QCheckBox" name="showEclipticJ2000PolesCheckBox">
+               <item row="11" column="5">
+                <widget class="QCheckBox" name="currentVerticalLabelsCheckBox">
                  <property name="toolTip">
-                  <string>Show ecliptic poles of J2000.0</string>
+                  <string>Label partitions</string>
                  </property>
                  <property name="text">
-                  <string>Ecliptic poles (J2000)</string>
+                  <string>Altitude</string>
                  </property>
                 </widget>
                </item>
-               <item row="3" column="3">
-                <widget class="QCheckBox" name="showEclipticLineOfDateCheckBox">
+               <item row="5" column="1">
+                <widget class="QCheckBox" name="showAzimuthalGridCheckBox">
                  <property name="toolTip">
-                  <string>Show ecliptic line of current date.</string>
+                  <string>Altitudes and azimuth (counted from North towards East).</string>
                  </property>
                  <property name="text">
-                  <string/>
+                  <string>Azimuthal grid</string>
                  </property>
                 </widget>
                </item>
-               <item row="11" column="5">
-                <widget class="QCheckBox" name="colureLabelsCheckBox">
+               <item row="5" column="5">
+                <widget class="QCheckBox" name="horizonLabelsCheckBox">
                  <property name="toolTip">
                   <string>Label partitions</string>
                  </property>
                  <property name="text">
-                  <string>Colures</string>
+                  <string>Horizon</string>
                  </property>
                 </widget>
                </item>
-               <item row="13" column="3">
-                <widget class="QCheckBox" name="showPrimeVerticalLineCheckBox">
+               <item row="14" column="5">
+                <widget class="QCheckBox" name="primeVerticalLabelsCheckBox">
                  <property name="toolTip">
-                  <string>Show Prime (East-West) Vertical.</string>
+                  <string>Label partitions</string>
                  </property>
                  <property name="text">
-                  <string/>
+                  <string>Prime Vertical</string>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="5">
-                <widget class="QCheckBox" name="currentVerticalLabelsCheckBox">
+               <item row="0" column="3">
+                <widget class="QCheckBox" name="showEquatorJ2000LineCheckBox">
                  <property name="toolTip">
-                  <string>Label partitions</string>
+                  <string>Show celestial equator of J2000.0.</string>
                  </property>
                  <property name="text">
-                  <string>Altitude</string>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="8" column="7">
-                <layout class="QHBoxLayout" name="horizontalLayout_27">
-                 <property name="topMargin">
-                  <number>0</number>
+               <item row="13" column="1">
+                <widget class="QCheckBox" name="showGalacticCenterCheckBox">
+                 <property name="text">
+                  <string>Galactic center and anticenter</string>
                  </property>
-                 <item>
-                  <widget class="QCheckBox" name="showUmbraCheckBox">
-                   <property name="toolTip">
-                    <string>This circle represents the size of Earth's central, deep shadow in the distance of the Moon.</string>
-                   </property>
-                   <property name="text">
-                    <string>Earth umbra</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <spacer name="horizontalSpacer_14">
-                   <property name="orientation">
-                    <enum>Qt::Horizontal</enum>
-                   </property>
-                   <property name="sizeHint" stdset="0">
-                    <size>
-                     <width>40</width>
-                     <height>20</height>
-                    </size>
-                   </property>
-                  </spacer>
-                 </item>
-                 <item>
-                  <widget class="QCheckBox" name="showUmbraCenterCheckBox">
-                   <property name="toolTip">
-                    <string>Show point of Earth's center of deep shadow in the distance of the Moon.</string>
-                   </property>
-                   <property name="text">
-                    <string/>
-                   </property>
-                  </widget>
-                 </item>
-                </layout>
+                </widget>
                </item>
-               <item row="1" column="5">
-                <widget class="QCheckBox" name="equatorLabelsCheckBox">
-                 <property name="toolTip">
-                  <string>Label partitions</string>
-                 </property>
+               <item row="15" column="1">
+                <widget class="QCheckBox" name="showCompassMarksCheckBox">
                  <property name="text">
-                  <string>Equator (of date)</string>
+                  <string>Compass marks</string>
                  </property>
                 </widget>
                </item>
-               <item row="9" column="3">
-                <widget class="QCheckBox" name="showMeridianLineCheckBox">
+               <item row="10" column="6">
+                <widget class="QToolButton" name="colorPenumbraCircle">
                  <property name="toolTip">
-                  <string>Show meridian line.</string>
+                  <string>Color of penumbra circle</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="12" column="3">
-                <widget class="QCheckBox" name="showPrecessionCirclesCheckBox">
-                 <property name="sizePolicy">
-                  <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
-                   <horstretch>0</horstretch>
-                   <verstretch>0</verstretch>
-                  </sizepolicy>
-                 </property>
+               <item row="10" column="5">
+                <widget class="QCheckBox" name="meridianLabelsCheckBox">
                  <property name="toolTip">
-                  <string>Instantaneous circles of earth's axis on its motion around ecliptical poles. Displayed on Earth only.</string>
+                  <string>Label partitions</string>
                  </property>
                  <property name="text">
-                  <string/>
+                  <string>Meridian</string>
                  </property>
                 </widget>
                </item>
-               <item row="9" column="0">
-                <widget class="QToolButton" name="colorSolsticeJ2000Points">
+               <item row="3" column="3">
+                <widget class="QCheckBox" name="showEclipticLineJ2000CheckBox">
                  <property name="toolTip">
-                  <string>Color of the solstice points (J2000.0)</string>
+                  <string>Show ecliptic line of J2000.0 (VSOP87A fundamental plane).</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="9" column="5">
-                <widget class="QCheckBox" name="meridianLabelsCheckBox">
+               <item row="7" column="0">
+                <widget class="QToolButton" name="colorSupergalacticGrid">
                  <property name="toolTip">
-                  <string>Label partitions</string>
+                  <string>Color of the supergalactic grid</string>
                  </property>
                  <property name="text">
-                  <string>Meridian</string>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
                <item row="5" column="2">
-                <widget class="QToolButton" name="colorGalacticEquatorLine">
+                <widget class="QToolButton" name="colorHorizonLine">
                  <property name="toolTip">
-                  <string>Color of galactic equator</string>
+                  <string>Color of horizon</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="3" column="7">
-                <widget class="QCheckBox" name="showEclipticPolesCheckBox">
-                 <property name="toolTip">
-                  <string>Show ecliptic poles of current date.</string>
-                 </property>
+               <item row="11" column="1">
+                <widget class="QCheckBox" name="showSolsticePointsCheckBox">
                  <property name="text">
-                  <string>Ecliptic poles (of date)</string>
+                  <string>Solstices (of date)</string>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="0">
-                <widget class="QToolButton" name="colorSolsticePoints">
+               <item row="0" column="2">
+                <widget class="QToolButton" name="colorEquatorJ2000Line">
                  <property name="toolTip">
-                  <string>Color of the solstice points (of date)</string>
+                  <string>Color of equator (J2000.0)</string>
                  </property>
                  <property name="text">
-                  <string/>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="3" column="2">
-                <widget class="QToolButton" name="colorEclipticLineOfDate">
+               <item row="9" column="0">
+                <widget class="QToolButton" name="colorEquinoxPoints">
                  <property name="toolTip">
-                  <string>Color of ecliptic (of date)</string>
+                  <string>Color of the equinox points (of date)</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="2">
-                <widget class="QToolButton" name="colorLongitudeLine">
+               <item row="9" column="1">
+                <widget class="QCheckBox" name="showEquinoxPointsCheckBox">
+                 <property name="text">
+                  <string>Equinoxes (of date)</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="0">
+                <widget class="QToolButton" name="colorEquatorialJ2000Grid">
                  <property name="toolTip">
-                  <string>Color of the opposition/conjunction longitude line</string>
+                  <string>Color of the equatorial grid (J2000.0)</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="5" column="0">
-                <widget class="QToolButton" name="colorGalacticGrid">
+               <item row="14" column="0">
+                <widget class="QToolButton" name="colorCardinalPoints">
                  <property name="toolTip">
-                  <string>Color of the galactic grid</string>
+                  <string>Color of cardinal points</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="14" column="0">
-                <widget class="QToolButton" name="colorCompassMarks">
+               <item row="9" column="3">
+                <widget class="QCheckBox" name="showSolarEquatorCheckBox">
                  <property name="toolTip">
-                  <string>Color of compass marks</string>
+                  <string>Solar equator projected into space.</string>
+                 </property>
+                 <property name="text">
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="3">
-                <widget class="QCheckBox" name="showEclipticLineJ2000CheckBox">
+               <item row="12" column="4">
+                <widget class="QCheckBox" name="colurePartsCheckBox">
                  <property name="toolTip">
-                  <string>Show ecliptic line of J2000.0 (VSOP87A fundamental plane).</string>
+                  <string>Show partitions</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="12" column="1">
-                <widget class="QCheckBox" name="showGalacticCenterCheckBox">
+               <item row="3" column="2">
+                <widget class="QToolButton" name="colorEclipticLineJ2000">
+                 <property name="toolTip">
+                  <string>Color of ecliptic (J2000.0)</string>
+                 </property>
                  <property name="text">
-                  <string>Galactic center and anticenter</string>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="5" column="7">
-                <widget class="QCheckBox" name="showGalacticPolesCheckBox">
+               <item row="11" column="3">
+                <widget class="QCheckBox" name="showCurrentVerticalLineCheckBox">
+                 <property name="toolTip">
+                  <string>Show a vertical line (with optional altitude marks) in the screen center.</string>
+                 </property>
                  <property name="text">
-                  <string>Galactic poles</string>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="5" column="6">
-                <widget class="QToolButton" name="colorGalacticPoles">
+               <item row="13" column="7">
+                <widget class="QCheckBox" name="showFOVCenterMarkerCheckBox">
                  <property name="toolTip">
-                  <string>Color of galactic poles</string>
+                  <string>Show marker of center for field of view (FOV)</string>
+                 </property>
+                 <property name="text">
+                  <string>Center of FOV</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="0" column="6">
+                <widget class="QToolButton" name="colorCelestialJ2000Poles">
+                 <property name="toolTip">
+                  <string>Color of the celestial poles (J2000.0)</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="4" column="3">
-                <widget class="QCheckBox" name="showHorizonLineCheckBox">
+               <item row="12" column="1">
+                <widget class="QCheckBox" name="showApexPointsCheckBox">
                  <property name="toolTip">
-                  <string>Show mathematical horizon line.</string>
+                  <string>Apex and Antapex indicate where the observer's planet is heading to or receding from, respectively.</string>
                  </property>
                  <property name="text">
-                  <string/>
+                  <string>Apex points</string>
                  </property>
                 </widget>
                </item>
-               <item row="12" column="7">
-                <widget class="QCheckBox" name="showFOVCenterMarkerCheckBox">
+               <item row="7" column="4">
+                <widget class="QCheckBox" name="supergalacticEquatorPartsCheckBox">
                  <property name="toolTip">
-                  <string>Show marker of center for field of view (FOV)</string>
+                  <string>Show partitions</string>
                  </property>
                  <property name="text">
-                  <string>Center of FOV</string>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="13" column="7">
+               <item row="14" column="7">
                 <layout class="QHBoxLayout" name="horizontalLayout_22">
                  <item>
                   <widget class="QCheckBox" name="showFOVCircularMarkerCheckBox">
@@ -3472,112 +3330,202 @@
                  </item>
                 </layout>
                </item>
-               <item row="3" column="5">
-                <widget class="QCheckBox" name="eclipticLabelsCheckBox">
+               <item row="7" column="6">
+                <widget class="QToolButton" name="colorSupergalacticPoles">
                  <property name="toolTip">
-                  <string>Label partitions</string>
+                  <string>Color of supergalactic poles</string>
                  </property>
                  <property name="text">
-                  <string>Ecliptic (of date)</string>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="6">
-                <widget class="QToolButton" name="colorCelestialJ2000Poles">
+               <item row="8" column="5">
+                <widget class="QCheckBox" name="longitudeLabelsCheckBox">
                  <property name="toolTip">
-                  <string>Color of the celestial poles (J2000.0)</string>
+                  <string>Label partitions</string>
                  </property>
                  <property name="text">
-                  <string notr="true"/>
+                  <string>O./C. longitude</string>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="4">
-                <widget class="QCheckBox" name="supergalacticEquatorPartsCheckBox">
+               <item row="12" column="3">
+                <widget class="QCheckBox" name="showColuresLineCheckBox">
                  <property name="toolTip">
-                  <string>Show partitions</string>
+                  <string>Show colures (great circles through poles and solstices/equinoxes).</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="5">
-                <widget class="QCheckBox" name="eclipticJ2000LabelsCheckBox">
+               <item row="7" column="2">
+                <widget class="QToolButton" name="colorSupergalacticEquatorLine">
                  <property name="toolTip">
-                  <string>Label partitions</string>
+                  <string>Color of supergalactic equator</string>
                  </property>
                  <property name="text">
-                  <string>Ecliptic (J2000)</string>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="12" column="0">
-                <widget class="QToolButton" name="colorGalacticCenter">
+               <item row="0" column="4">
+                <widget class="QCheckBox" name="equatorJ2000PartsCheckBox">
                  <property name="toolTip">
-                  <string>Color of galactic center and anticenter</string>
+                  <string>Show partitions</string>
+                 </property>
+                 <property name="text">
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="1">
-                <widget class="QCheckBox" name="showSupergalacticGridCheckBox">
+               <item row="10" column="0">
+                <widget class="QToolButton" name="colorSolsticeJ2000Points">
                  <property name="toolTip">
-                  <string>Show de Vaucouleurs' Supergalactic coordinates (1976), defined by the distribution of nearby galaxies.</string>
+                  <string>Color of the solstice points (J2000.0)</string>
                  </property>
                  <property name="text">
-                  <string>Supergalactic grid</string>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="5">
-                <widget class="QCheckBox" name="supergalacticEquatorLabelsCheckBox">
+               <item row="8" column="2">
+                <widget class="QToolButton" name="colorLongitudeLine">
                  <property name="toolTip">
-                  <string>Label partitions</string>
+                  <string>Color of the opposition/conjunction longitude line</string>
                  </property>
                  <property name="text">
-                  <string>Supergalactic equator</string>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="3">
-                <widget class="QCheckBox" name="showCurrentVerticalLineCheckBox">
+               <item row="1" column="3">
+                <widget class="QCheckBox" name="showEquatorLineCheckBox">
                  <property name="toolTip">
-                  <string>Show a vertical line (with optional altitude marks) in the screen center.</string>
+                  <string>Show celestial equator of current planet and date.</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="6">
-                <widget class="QToolButton" name="colorEclipticJ2000Poles">
+               <item row="4" column="0">
+                <widget class="QToolButton" name="colorEclipticGridOfDate">
                  <property name="toolTip">
-                  <string>Color of the ecliptic poles (J2000.0)</string>
+                  <string>Color of the ecliptical grid (of date)</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="14" column="1">
-                <widget class="QCheckBox" name="showCompassMarksCheckBox">
+               <item row="0" column="1">
+                <widget class="QCheckBox" name="showEquatorialJ2000GridCheckBox">
+                 <property name="toolTip">
+                  <string>Equatorial coordinates of J2000.0.</string>
+                 </property>
                  <property name="text">
-                  <string>Compass marks</string>
+                  <string>Equatorial grid (J2000)</string>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="1">
-                <widget class="QCheckBox" name="showEclipticGridJ2000CheckBox">
+               <item row="0" column="5">
+                <widget class="QCheckBox" name="equatorJ2000LabelsCheckBox">
                  <property name="toolTip">
-                  <string>Ecliptical coordinates for J2000.0.</string>
+                  <string>Label partitions</string>
                  </property>
                  <property name="text">
-                  <string>Ecliptic grid (J2000)</string>
+                  <string>Equator (J2000)</string>
                  </property>
                 </widget>
                </item>
-               <item row="4" column="4">
-                <widget class="QCheckBox" name="horizonPartsCheckBox">
+               <item row="14" column="3">
+                <widget class="QCheckBox" name="showPrimeVerticalLineCheckBox">
+                 <property name="toolTip">
+                  <string>Show Prime (East-West) Vertical.</string>
+                 </property>
+                 <property name="text">
+                  <string/>
+                 </property>
+                </widget>
+               </item>
+               <item row="15" column="5">
+                <layout class="QHBoxLayout" name="horizontalLayout_23">
+                 <item>
+                  <widget class="QLabel" name="lineThicknessLabel">
+                   <property name="toolTip">
+                    <string>The line thickness for grids and lines</string>
+                   </property>
+                   <property name="text">
+                    <string>Thickness: lines</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSpinBox" name="lineThicknessSpinBox">
+                   <property name="maximumSize">
+                    <size>
+                     <width>50</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="toolTip">
+                    <string>Thickness of line in pixels</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="minimum">
+                    <number>1</number>
+                   </property>
+                   <property name="maximum">
+                    <number>5</number>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QLabel" name="partThicknessLabel">
+                   <property name="toolTip">
+                    <string>The line thickness for circle partitions</string>
+                   </property>
+                   <property name="text">
+                    <string>partitions</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QSpinBox" name="partThicknessSpinBox">
+                   <property name="sizePolicy">
+                    <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                     <horstretch>0</horstretch>
+                     <verstretch>0</verstretch>
+                    </sizepolicy>
+                   </property>
+                   <property name="maximumSize">
+                    <size>
+                     <width>50</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="toolTip">
+                    <string>Thickness of partitions in pixels</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="minimum">
+                    <number>1</number>
+                   </property>
+                   <property name="maximum">
+                    <number>5</number>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item row="8" column="4">
+                <widget class="QCheckBox" name="longitudePartsCheckBox">
                  <property name="toolTip">
                   <string>Show partitions</string>
                  </property>
@@ -3586,45 +3534,150 @@
                  </property>
                 </widget>
                </item>
-               <item row="9" column="1">
-                <widget class="QCheckBox" name="showSolsticeJ2000PointsCheckBox">
+               <item row="3" column="7">
+                <widget class="QCheckBox" name="showEclipticJ2000PolesCheckBox">
+                 <property name="toolTip">
+                  <string>Show ecliptic poles of J2000.0</string>
+                 </property>
                  <property name="text">
-                  <string>Solstices (J2000)</string>
+                  <string>Ecliptic poles (J2000)</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="6">
-                <widget class="QToolButton" name="colorCelestialPoles">
+               <item row="6" column="0">
+                <widget class="QToolButton" name="colorGalacticGrid">
                  <property name="toolTip">
-                  <string>Color of celestial poles (of date)</string>
+                  <string>Color of the galactic grid</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="12" column="2">
-                <widget class="QToolButton" name="colorPrecessionCircles">
+               <item row="15" column="6">
+                <widget class="QToolButton" name="colorFOVRectangularMarker">
                  <property name="toolTip">
-                  <string>Color of precession circles</string>
+                  <string>Color of rectangular marker of FOV</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="11" column="4">
+                <widget class="QCheckBox" name="currentVerticalPartsCheckBox">
+                 <property name="toolTip">
+                  <string>Show partitions</string>
                  </property>
                  <property name="text">
-                  <string notr="true"/>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="2">
-                <widget class="QToolButton" name="colorEquatorLine">
+               <item row="10" column="4">
+                <widget class="QCheckBox" name="meridianPartsCheckBox">
                  <property name="toolTip">
-                  <string>Color of equator (of date)</string>
+                  <string>Show partitions</string>
                  </property>
                  <property name="text">
-                  <string notr="true"/>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="4">
-                <widget class="QCheckBox" name="equatorJ2000PartsCheckBox">
+               <item row="15" column="7">
+                <layout class="QHBoxLayout" name="horizontalLayout_24">
+                 <item>
+                  <widget class="QCheckBox" name="showFOVRectangularMarkerCheckBox">
+                   <property name="toolTip">
+                    <string>Show rectangular marker of field of view (FOV)</string>
+                   </property>
+                   <property name="text">
+                    <string>Rectangular FOV</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QDoubleSpinBox" name="fovRectangularMarkerWidthDoubleSpinBox">
+                   <property name="maximumSize">
+                    <size>
+                     <width>75</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="toolTip">
+                    <string>Width of rectangle, in degrees</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="minimum">
+                    <double>0.100000000000000</double>
+                   </property>
+                   <property name="maximum">
+                    <double>180.000000000000000</double>
+                   </property>
+                   <property name="singleStep">
+                    <double>0.100000000000000</double>
+                   </property>
+                   <property name="value">
+                    <double>4.000000000000000</double>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QDoubleSpinBox" name="fovRectangularMarkerHeightDoubleSpinBox">
+                   <property name="maximumSize">
+                    <size>
+                     <width>75</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="toolTip">
+                    <string>Height of rectangle, in degrees</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="minimum">
+                    <double>0.100000000000000</double>
+                   </property>
+                   <property name="maximum">
+                    <double>180.000000000000000</double>
+                   </property>
+                   <property name="singleStep">
+                    <double>0.100000000000000</double>
+                   </property>
+                   <property name="value">
+                    <double>3.000000000000000</double>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QDoubleSpinBox" name="fovRectangularMarkerRotationAngleDoubleSpinBox">
+                   <property name="maximumSize">
+                    <size>
+                     <width>75</width>
+                     <height>16777215</height>
+                    </size>
+                   </property>
+                   <property name="toolTip">
+                    <string>Rotation angle of rectangle, in degrees</string>
+                   </property>
+                   <property name="alignment">
+                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                   </property>
+                   <property name="decimals">
+                    <number>1</number>
+                   </property>
+                   <property name="minimum">
+                    <double>-90.000000000000000</double>
+                   </property>
+                   <property name="maximum">
+                    <double>90.000000000000000</double>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item row="6" column="4">
+                <widget class="QCheckBox" name="galacticEquatorPartsCheckBox">
                  <property name="toolTip">
                   <string>Show partitions</string>
                  </property>
@@ -3633,65 +3686,119 @@
                  </property>
                 </widget>
                </item>
-               <item row="11" column="1">
-                <widget class="QCheckBox" name="showApexPointsCheckBox">
+               <item row="1" column="6">
+                <widget class="QToolButton" name="colorCelestialPoles">
                  <property name="toolTip">
-                  <string>Apex and Antapex indicate where the observer's planet is heading to or receding from, respectively.</string>
+                  <string>Color of celestial poles (of date)</string>
                  </property>
                  <property name="text">
-                  <string>Apex points</string>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="13" column="4">
-                <widget class="QCheckBox" name="primeVerticalPartsCheckBox">
+               <item row="7" column="5">
+                <widget class="QCheckBox" name="supergalacticEquatorLabelsCheckBox">
                  <property name="toolTip">
-                  <string>Show partitions</string>
+                  <string>Label partitions</string>
                  </property>
                  <property name="text">
-                  <string/>
+                  <string>Supergalactic equator</string>
                  </property>
                 </widget>
                </item>
-               <item row="5" column="4">
-                <widget class="QCheckBox" name="galacticEquatorPartsCheckBox">
+               <item row="9" column="6">
+                <widget class="QToolButton" name="colorUmbraCircle">
                  <property name="toolTip">
-                  <string>Show partitions</string>
+                  <string>Color of umbra circle</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="7">
-                <widget class="QCheckBox" name="showAntisolarPointCheckBox">
+               <item row="10" column="1">
+                <widget class="QCheckBox" name="showSolsticeJ2000PointsCheckBox">
                  <property name="text">
-                  <string>Antisolar point</string>
+                  <string>Solstices (J2000)</string>
                  </property>
                 </widget>
                </item>
-               <item row="5" column="1">
-                <widget class="QCheckBox" name="showGalacticGridCheckBox">
+               <item row="10" column="2">
+                <widget class="QToolButton" name="colorMeridianLine">
                  <property name="toolTip">
-                  <string>Galactic Coordinates, System II (IAU 1958).</string>
+                  <string>Color of meridian</string>
                  </property>
                  <property name="text">
-                  <string>Galactic grid</string>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="5">
-                <widget class="QCheckBox" name="equatorJ2000LabelsCheckBox">
+               <item row="14" column="6">
+                <widget class="QToolButton" name="colorFOVCircularMarker">
                  <property name="toolTip">
-                  <string>Label partitions</string>
+                  <string>Color of circular marker of FOV</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="14" column="1">
+                <layout class="QHBoxLayout" name="horizontalLayout_26">
+                 <item>
+                  <widget class="QCheckBox" name="showCardinalPointsCheckBox">
+                   <property name="toolTip">
+                    <string>Labels for the cardinal directions (4-wind compass rose).</string>
+                   </property>
+                   <property name="text">
+                    <string>Cardinal points</string>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <spacer name="horizontalSpacer_7">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
+                    <size>
+                     <width>40</width>
+                     <height>20</height>
+                    </size>
+                   </property>
+                  </spacer>
+                 </item>
+                 <item>
+                  <widget class="QCheckBox" name="showOrdinal8WRPointsCheckBox">
+                   <property name="toolTip">
+                    <string>Labels for the intercardinal (or ordinal) directions (8-wind compass rose).</string>
+                   </property>
+                   <property name="text">
+                    <string/>
+                   </property>
+                  </widget>
+                 </item>
+                 <item>
+                  <widget class="QCheckBox" name="showOrdinal16WRPointsCheckBox">
+                   <property name="toolTip">
+                    <string>Labels for the secondary intercardinal directions (16-wind compass rose).</string>
+                   </property>
+                   <property name="text">
+                    <string/>
+                   </property>
+                  </widget>
+                 </item>
+                </layout>
+               </item>
+               <item row="0" column="7">
+                <widget class="QCheckBox" name="showCelestialJ2000PolesCheckBox">
+                 <property name="toolTip">
+                  <string>Show celestial poles of J2000.0.</string>
                  </property>
                  <property name="text">
-                  <string>Equator (J2000)</string>
+                  <string>Celestial poles (J2000)</string>
                  </property>
                 </widget>
                </item>
-               <item row="9" column="4">
-                <widget class="QCheckBox" name="meridianPartsCheckBox">
+               <item row="5" column="4">
+                <widget class="QCheckBox" name="horizonPartsCheckBox">
                  <property name="toolTip">
                   <string>Show partitions</string>
                  </property>
@@ -3700,87 +3807,111 @@
                  </property>
                 </widget>
                </item>
-               <item row="13" column="0">
-                <widget class="QToolButton" name="colorCardinalPoints">
+               <item row="4" column="1">
+                <widget class="QCheckBox" name="showEclipticGridOfDateCheckBox">
                  <property name="toolTip">
-                  <string>Color of cardinal points</string>
+                  <string>Ecliptical coordinates for current date. Displayed on Earth only.</string>
                  </property>
                  <property name="text">
-                  <string notr="true"/>
+                  <string>Ecliptic grid (of date)</string>
                  </property>
                 </widget>
                </item>
-               <item row="3" column="1">
-                <widget class="QCheckBox" name="showEclipticGridOfDateCheckBox">
+               <item row="12" column="5">
+                <widget class="QCheckBox" name="colureLabelsCheckBox">
                  <property name="toolTip">
-                  <string>Ecliptical coordinates for current date. Displayed on Earth only.</string>
+                  <string>Label partitions</string>
                  </property>
                  <property name="text">
-                  <string>Ecliptic grid (of date)</string>
+                  <string>Colures</string>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="2">
-                <widget class="QToolButton" name="colorEquatorJ2000Line">
+               <item row="12" column="2">
+                <widget class="QToolButton" name="colorColuresLine">
                  <property name="toolTip">
-                  <string>Color of equator (J2000.0)</string>
+                  <string>Color of colures</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="4" column="0">
-                <widget class="QToolButton" name="colorAzimuthalGrid">
+               <item row="6" column="3">
+                <widget class="QCheckBox" name="showGalacticEquatorLineCheckBox">
                  <property name="toolTip">
-                  <string>Color of the azimuthal grid</string>
+                  <string>Show Galactic equator line.</string>
                  </property>
                  <property name="text">
-                  <string notr="true"/>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="2">
-                <widget class="QToolButton" name="colorEclipticLineJ2000">
+               <item row="4" column="5">
+                <widget class="QCheckBox" name="eclipticLabelsCheckBox">
                  <property name="toolTip">
-                  <string>Color of ecliptic (J2000.0)</string>
+                  <string>Label partitions</string>
                  </property>
                  <property name="text">
-                  <string notr="true"/>
+                  <string>Ecliptic (of date)</string>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="2">
-                <widget class="QToolButton" name="colorSupergalacticEquatorLine">
+               <item row="3" column="1">
+                <widget class="QCheckBox" name="showEclipticGridJ2000CheckBox">
                  <property name="toolTip">
-                  <string>Color of supergalactic equator</string>
+                  <string>Ecliptical coordinates for J2000.0.</string>
                  </property>
                  <property name="text">
-                  <string notr="true"/>
+                  <string>Ecliptic grid (J2000)</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="3">
-                <widget class="QCheckBox" name="showEquatorLineCheckBox">
+               <item row="3" column="4">
+                <widget class="QCheckBox" name="eclipticJ2000PartsCheckBox">
                  <property name="toolTip">
-                  <string>Show celestial equator of current planet and date.</string>
+                  <string>Show partitions</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="2">
-                <widget class="QToolButton" name="colorCurrentVerticalLine">
+               <item row="12" column="0">
+                <widget class="QToolButton" name="colorApexPoints">
                  <property name="toolTip">
-                  <string>Color of altitude line</string>
+                  <string>Color of Apex and Antapex points</string>
+                 </property>
+                 <property name="text">
+                  <string notr="true"/>
+                 </property>
+                </widget>
+               </item>
+               <item row="11" column="0">
+                <widget class="QToolButton" name="colorSolsticePoints">
+                 <property name="toolTip">
+                  <string>Color of the solstice points (of date)</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="12" column="4">
+               <item row="6" column="7">
+                <widget class="QCheckBox" name="showGalacticPolesCheckBox">
+                 <property name="text">
+                  <string>Galactic poles</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="15" column="0">
+                <widget class="QToolButton" name="colorCompassMarks">
+                 <property name="toolTip">
+                  <string>Color of compass marks</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="13" column="4">
                 <widget class="QCheckBox" name="precessionPartsCheckBox">
                  <property name="sizePolicy">
                   <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
@@ -3796,208 +3927,184 @@
                  </property>
                 </widget>
                </item>
-               <item row="1" column="0">
-                <widget class="QToolButton" name="colorEquatorialGrid">
-                 <property name="toolTip">
-                  <string>Color of the equatorial grid (of date)</string>
-                 </property>
+               <item row="8" column="1">
+                <widget class="QCheckBox" name="showEquinoxJ2000PointsCheckBox">
                  <property name="text">
-                  <string notr="true"/>
+                  <string>Equinoxes (J2000)</string>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="1">
-                <widget class="QCheckBox" name="showSolsticePointsCheckBox">
-                 <property name="text">
-                  <string>Solstices (of date)</string>
+               <item row="13" column="3">
+                <widget class="QCheckBox" name="showPrecessionCirclesCheckBox">
+                 <property name="sizePolicy">
+                  <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+                   <horstretch>0</horstretch>
+                   <verstretch>0</verstretch>
+                  </sizepolicy>
                  </property>
-                </widget>
-               </item>
-               <item row="4" column="5">
-                <widget class="QCheckBox" name="horizonLabelsCheckBox">
                  <property name="toolTip">
-                  <string>Label partitions</string>
+                  <string>Instantaneous circles of earth's axis on its motion around ecliptical poles. Displayed on Earth only.</string>
                  </property>
                  <property name="text">
-                  <string>Horizon</string>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="9" column="2">
-                <widget class="QToolButton" name="colorMeridianLine">
+               <item row="6" column="2">
+                <widget class="QToolButton" name="colorGalacticEquatorLine">
                  <property name="toolTip">
-                  <string>Color of meridian</string>
+                  <string>Color of galactic equator</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="13" column="5">
-                <widget class="QCheckBox" name="primeVerticalLabelsCheckBox">
+               <item row="8" column="7">
+                <widget class="QCheckBox" name="showAntisolarPointCheckBox">
+                 <property name="text">
+                  <string>Antisolar point</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="9" column="2">
+                <widget class="QToolButton" name="colorSolarEquatorLine">
                  <property name="toolTip">
-                  <string>Label partitions</string>
+                  <string>Color of the projected Solar equator line</string>
                  </property>
                  <property name="text">
-                  <string>Prime Vertical</string>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="14" column="5">
-                <layout class="QHBoxLayout" name="horizontalLayout_23">
+               <item row="9" column="7">
+                <layout class="QHBoxLayout" name="horizontalLayout_27">
+                 <property name="topMargin">
+                  <number>0</number>
+                 </property>
                  <item>
-                  <widget class="QLabel" name="lineThicknessLabel">
+                  <widget class="QCheckBox" name="showUmbraCheckBox">
                    <property name="toolTip">
-                    <string>The line thickness for grids and lines</string>
+                    <string>This circle represents the size of Earth's central, deep shadow in the distance of the Moon.</string>
                    </property>
                    <property name="text">
-                    <string>Thickness: lines</string>
+                    <string>Earth umbra</string>
                    </property>
                   </widget>
                  </item>
                  <item>
-                  <widget class="QSpinBox" name="lineThicknessSpinBox">
-                   <property name="maximumSize">
+                  <spacer name="horizontalSpacer_14">
+                   <property name="orientation">
+                    <enum>Qt::Horizontal</enum>
+                   </property>
+                   <property name="sizeHint" stdset="0">
                     <size>
-                     <width>50</width>
-                     <height>16777215</height>
+                     <width>40</width>
+                     <height>20</height>
                     </size>
                    </property>
-                   <property name="toolTip">
-                    <string>Thickness of line in pixels</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                   <property name="minimum">
-                    <number>1</number>
-                   </property>
-                   <property name="maximum">
-                    <number>5</number>
-                   </property>
-                  </widget>
+                  </spacer>
                  </item>
                  <item>
-                  <widget class="QLabel" name="partThicknessLabel">
+                  <widget class="QCheckBox" name="showUmbraCenterCheckBox">
                    <property name="toolTip">
-                    <string>The line thickness for circle partitions</string>
+                    <string>Show point of Earth's center of deep shadow in the distance of the Moon.</string>
                    </property>
                    <property name="text">
-                    <string>partitions</string>
-                   </property>
-                  </widget>
-                 </item>
-                 <item>
-                  <widget class="QSpinBox" name="partThicknessSpinBox">
-                   <property name="sizePolicy">
-                    <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                     <horstretch>0</horstretch>
-                     <verstretch>0</verstretch>
-                    </sizepolicy>
-                   </property>
-                   <property name="maximumSize">
-                    <size>
-                     <width>50</width>
-                     <height>16777215</height>
-                    </size>
-                   </property>
-                   <property name="toolTip">
-                    <string>Thickness of partitions in pixels</string>
-                   </property>
-                   <property name="alignment">
-                    <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                   </property>
-                   <property name="minimum">
-                    <number>1</number>
-                   </property>
-                   <property name="maximum">
-                    <number>5</number>
+                    <string/>
                    </property>
                   </widget>
                  </item>
                 </layout>
                </item>
-               <item row="4" column="6">
-                <widget class="QToolButton" name="colorZenithNadir">
+               <item row="8" column="0">
+                <widget class="QToolButton" name="colorEquinoxJ2000Points">
                  <property name="toolTip">
-                  <string>Color of Zenith and Nadir</string>
+                  <string>Color of the equinox points (J2000.0)</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="4" column="1">
-                <widget class="QCheckBox" name="showAzimuthalGridCheckBox">
+               <item row="3" column="6">
+                <widget class="QToolButton" name="colorEclipticJ2000Poles">
                  <property name="toolTip">
-                  <string>Altitudes and azimuth (counted from North towards East).</string>
+                  <string>Color of the ecliptic poles (J2000.0)</string>
                  </property>
                  <property name="text">
-                  <string>Azimuthal grid</string>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="9" column="7">
-                <widget class="QCheckBox" name="showPenumbraCheckBox">
+               <item row="6" column="1">
+                <widget class="QCheckBox" name="showGalacticGridCheckBox">
                  <property name="toolTip">
-                  <string>This circle represents the outermost rim of Earth's shadow in the distance of the Moon.</string>
+                  <string>Galactic Coordinates, System II (IAU 1958).</string>
                  </property>
                  <property name="text">
-                  <string>Earth penumbra</string>
+                  <string>Galactic grid</string>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="7">
-                <widget class="QCheckBox" name="showCelestialJ2000PolesCheckBox">
+               <item row="9" column="4">
+                <widget class="QCheckBox" name="solarEquatorPartsCheckBox">
                  <property name="toolTip">
-                  <string>Show celestial poles of J2000.0.</string>
+                  <string>Show partitions</string>
                  </property>
                  <property name="text">
-                  <string>Celestial poles (J2000)</string>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="3">
-                <widget class="QCheckBox" name="showEquatorJ2000LineCheckBox">
+               <item row="7" column="7">
+                <widget class="QCheckBox" name="showSupergalacticPolesCheckBox">
+                 <property name="text">
+                  <string>Supergalactic poles</string>
+                 </property>
+                </widget>
+               </item>
+               <item row="4" column="6">
+                <widget class="QToolButton" name="colorEclipticPoles">
                  <property name="toolTip">
-                  <string>Show celestial equator of J2000.0.</string>
+                  <string>Color of ecliptic poles (of date)</string>
                  </property>
                  <property name="text">
-                  <string/>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="11" column="2">
-                <widget class="QToolButton" name="colorColuresLine">
+               <item row="5" column="6">
+                <widget class="QToolButton" name="colorZenithNadir">
                  <property name="toolTip">
-                  <string>Color of colures</string>
+                  <string>Color of Zenith and Nadir</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="8" column="6">
-                <widget class="QToolButton" name="colorUmbraCircle">
+               <item row="8" column="3">
+                <widget class="QCheckBox" name="showLongitudeLineCheckBox">
                  <property name="toolTip">
-                  <string>Color of umbra circle</string>
+                  <string>Opposition/conjunction longitude line - the line of ecliptic longitude which passes through both ecliptic poles, the Sun and opposition point.</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="0">
-                <widget class="QToolButton" name="colorEclipticGridJ2000">
+               <item row="5" column="0">
+                <widget class="QToolButton" name="colorAzimuthalGrid">
                  <property name="toolTip">
-                  <string>Color of the ecliptical grid (J2000.0)</string>
+                  <string>Color of the azimuthal grid</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="3">
+               <item row="7" column="3">
                 <widget class="QCheckBox" name="showSupergalacticEquatorLineCheckBox">
                  <property name="toolTip">
                   <string>Show equator of de Vaucouleurs' Supergalactic coordinates (1976).</string>
@@ -4007,74 +4114,64 @@
                  </property>
                 </widget>
                </item>
-               <item row="9" column="6">
-                <widget class="QToolButton" name="colorPenumbraCircle">
+               <item row="1" column="0">
+                <widget class="QToolButton" name="colorEquatorialGrid">
                  <property name="toolTip">
-                  <string>Color of penumbra circle</string>
+                  <string>Color of the equatorial grid (of date)</string>
                  </property>
                  <property name="text">
-                  <string/>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="0" column="0">
-                <widget class="QToolButton" name="colorEquatorialJ2000Grid">
+               <item row="1" column="1">
+                <widget class="QCheckBox" name="showEquatorialGridCheckBox">
                  <property name="toolTip">
-                  <string>Color of the equatorial grid (J2000.0)</string>
-                 </property>
-                 <property name="text">
-                  <string notr="true"/>
+                  <string>Equatorial coordinates of current date and planet.</string>
                  </property>
-                </widget>
-               </item>
-               <item row="8" column="1">
-                <widget class="QCheckBox" name="showEquinoxPointsCheckBox">
                  <property name="text">
-                  <string>Equinoxes (of date)</string>
+                  <string>Equatorial grid (of date)</string>
                  </property>
                 </widget>
                </item>
-               <item row="11" column="0">
-                <widget class="QToolButton" name="colorApexPoints">
+               <item row="1" column="4">
+                <widget class="QCheckBox" name="equatorPartsCheckBox">
                  <property name="toolTip">
-                  <string>Color of Apex and Antapex points</string>
+                  <string>Show partitions</string>
                  </property>
                  <property name="text">
-                  <string notr="true"/>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="3" column="0">
-                <widget class="QToolButton" name="colorEclipticGridOfDate">
-                 <property name="toolTip">
-                  <string>Color of the ecliptical grid (of date)</string>
-                 </property>
+               <item row="5" column="7">
+                <widget class="QCheckBox" name="showZenithNadirCheckBox">
                  <property name="text">
-                  <string notr="true"/>
+                  <string>Zenith and Nadir</string>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="6">
-                <widget class="QToolButton" name="colorCircumpolarCircles">
+               <item row="3" column="0">
+                <widget class="QToolButton" name="colorEclipticGridJ2000">
                  <property name="toolTip">
-                  <string>Color of circumpolar circles</string>
+                  <string>Color of the ecliptical grid (J2000.0)</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="8" column="0">
-                <widget class="QToolButton" name="colorEquinoxPoints">
+               <item row="4" column="3">
+                <widget class="QCheckBox" name="showEclipticLineOfDateCheckBox">
                  <property name="toolTip">
-                  <string>Color of the equinox points (of date)</string>
+                  <string>Show ecliptic line of current date.</string>
                  </property>
                  <property name="text">
-                  <string notr="true"/>
+                  <string/>
                  </property>
                 </widget>
                </item>
-               <item row="5" column="5">
+               <item row="6" column="5">
                 <widget class="QCheckBox" name="galacticEquatorLabelsCheckBox">
                  <property name="toolTip">
                   <string>Label partitions</string>
@@ -4084,115 +4181,85 @@
                  </property>
                 </widget>
                </item>
-               <item row="8" column="3">
-                <widget class="QCheckBox" name="showSolarEquatorCheckBox">
-                 <property name="toolTip">
-                  <string>Solar equator projected into space.</string>
-                 </property>
-                 <property name="text">
-                  <string/>
-                 </property>
-                </widget>
-               </item>
-               <item row="12" column="6">
-                <widget class="QToolButton" name="colorFOVCenterMarker">
-                 <property name="toolTip">
-                  <string>Color of marker of center of FOV</string>
-                 </property>
-                </widget>
-               </item>
-               <item row="4" column="2">
-                <widget class="QToolButton" name="colorHorizonLine">
+               <item row="1" column="2">
+                <widget class="QToolButton" name="colorEquatorLine">
                  <property name="toolTip">
-                  <string>Color of horizon</string>
+                  <string>Color of equator (of date)</string>
                  </property>
                  <property name="text">
                   <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="2" column="4">
-                <widget class="QCheckBox" name="eclipticJ2000PartsCheckBox">
+               <item row="2" column="1">
+                <widget class="QCheckBox" name="showFixedEquatorialGridCheckBox">
                  <property name="toolTip">
-                  <string>Show partitions</string>
+                  <string>Fixed equatorial coordinates (hour angle/declination) of current planet.</string>
                  </property>
                  <property name="text">
-                  <string/>
+                  <string>Fixed Equatorial grid</string>
                  </property>
                 </widget>
                </item>
-               <item row="8" column="2">
-                <widget class="QToolButton" name="colorSolarEquatorLine">
-                 <property name="toolTip">
-                  <string>Color of the projected Solar equator line</string>
-                 </property>
+               <item row="2" column="0">
+                <widget class="QToolButton" name="colorFixedEquatorialGrid">
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="11" column="6">
-                <widget class="QToolButton" name="colorInvariablePlane">
+               <item row="2" column="7">
+                <widget class="QCheckBox" name="showCircumpolarCirclesCheckBox">
                  <property name="toolTip">
-                  <string>Color of the invariable plane of the Solar system</string>
+                  <string>These circles delimit stars which stay always above (respectively below) the mathematical horizon.</string>
                  </property>
                  <property name="text">
-                  <string/>
+                  <string>Circumpolar circles</string>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="1">
-                <widget class="QCheckBox" name="showEquatorialGridCheckBox">
+               <item row="2" column="6">
+                <widget class="QToolButton" name="colorCircumpolarCircles">
                  <property name="toolTip">
-                  <string>Equatorial coordinates of current date and planet.</string>
+                  <string>Color of circumpolar circles</string>
                  </property>
                  <property name="text">
-                  <string>Equatorial grid (of date)</string>
+                  <string notr="true"/>
                  </property>
                 </widget>
                </item>
-               <item row="10" column="4">
-                <widget class="QCheckBox" name="currentVerticalPartsCheckBox">
+               <item row="2" column="2">
+                <widget class="QToolButton" name="colorFixedEquatorLine">
                  <property name="toolTip">
-                  <string>Show partitions</string>
+                  <string>Color of fixed equator</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="1" column="7">
-                <widget class="QCheckBox" name="showCelestialPolesCheckBox">
+               <item row="2" column="5">
+                <widget class="QCheckBox" name="fixedEquatorLabelsCheckBox">
                  <property name="toolTip">
-                  <string>Show celestial poles of current planet and date.</string>
+                  <string>Label partitions</string>
                  </property>
                  <property name="text">
-                  <string>Celestial poles (of date)</string>
+                  <string>Fixed Equator</string>
                  </property>
                 </widget>
                </item>
-               <item row="7" column="4">
-                <widget class="QCheckBox" name="longitudePartsCheckBox">
+               <item row="2" column="3">
+                <widget class="QCheckBox" name="showFixedEquatorLineCheckBox">
                  <property name="toolTip">
-                  <string>Show partitions</string>
+                  <string>Show fixed celestial equator (hour angles) of current planet.</string>
                  </property>
                  <property name="text">
                   <string/>
                  </property>
                 </widget>
                </item>
-               <item row="6" column="6">
-                <widget class="QToolButton" name="colorSupergalacticPoles">
-                 <property name="toolTip">
-                  <string>Color of supergalactic poles</string>
-                 </property>
-                 <property name="text">
-                  <string notr="true"/>
-                 </property>
-                </widget>
-               </item>
-               <item row="11" column="4">
-                <widget class="QCheckBox" name="colurePartsCheckBox">
+               <item row="2" column="4">
+                <widget class="QCheckBox" name="fixedEquatorPartsCheckBox">
                  <property name="toolTip">
                   <string>Show partitions</string>
                  </property>
@@ -4201,16 +4268,6 @@
                  </property>
                 </widget>
                </item>
-               <item row="7" column="0">
-                <widget class="QToolButton" name="colorEquinoxJ2000Points">
-                 <property name="toolTip">
-                  <string>Color of the equinox points (J2000.0)</string>
-                 </property>
-                 <property name="text">
-                  <string notr="true"/>
-                 </property>
-                </widget>
-               </item>
                <item row="11" column="7">
                 <widget class="QCheckBox" name="showInvariablePlaneCheckBox">
                  <property name="toolTip">
@@ -4221,13 +4278,13 @@
                  </property>
                 </widget>
                </item>
-               <item row="8" column="5">
-                <widget class="QCheckBox" name="solarEquatorLabelsCheckBox">
+               <item row="11" column="6">
+                <widget class="QToolButton" name="colorInvariablePlane">
                  <property name="toolTip">
-                  <string>Label partitions</string>
+                  <string>Color of the invariable plane of the Solar system</string>
                  </property>
                  <property name="text">
-                  <string>Projected Solar Equator</string>
+                  <string/>
                  </property>
                 </widget>
                </item>