Merge lp:~georg-zotti/stellarium/stellarium-limitmag into lp:stellarium

[gzotti]

New user-defineable limits for stellar and Deep-Sky object brightness, so that no dim objects are displayed on zoom-in. Useful for naked-eye or binocular observers or historical questions.
Values settable on View options GUI.
Also includes some new symbols for deep-sky objects to better discern the object types.

[Alexander Wolf (alexwolf)]

review: Approve

=== modified file 'data/default_config.ini'
--- data/default_config.ini	2013-01-31 13:54:25 +0000
+++ data/default_config.ini	2013-03-02 19:13:21 +0000
@@ -262,6 +262,10 @@
 flag_telescope_name                 = false
 labels_amount                       = 3.0
 nebula_hints_amount                 = 3.0
+flag_clamp_stellar_mag              = false
+clamp_stellar_mag                   = 6.5
+flag_clamp_dso_mag                  = false
+clamp_dso_mag                       = 8.5
 
 [init_location]
 location                            = Paris, France
 
=== modified file 'skycultures/western/star_names.fab'
--- skycultures/western/star_names.fab	2011-11-01 16:01:17 +0000
+++ skycultures/western/star_names.fab	2013-03-02 19:13:21 +0000
@@ -139,7 +139,7 @@
  71683|_("Rigil Kent")
  72105|_("Izar")
  72487|_("Merga")
- 72607|_("Kocab")
+ 72607|_("Kochab")
  72622|_("Zubenelgenubi")
  73555|_("Nekkar")
  74785|_("Zubeneschamali")
 
=== modified file 'src/core/StelSkyDrawer.cpp'
--- src/core/StelSkyDrawer.cpp	2012-09-06 01:28:07 +0000
+++ src/core/StelSkyDrawer.cpp	2013-03-02 19:13:21 +0000
@@ -79,6 +79,11 @@
 	setMaxAdaptFov(conf->value("stars/mag_converter_max_fov",70.0).toFloat());
 	setMinAdaptFov(conf->value("stars/mag_converter_min_fov",0.1).toFloat());
 	setFlagLuminanceAdaptation(conf->value("viewing/use_luminance_adaptation",true).toBool());
+	setFlagClampStellarMagnitude((conf->value("astro/flag_clamp_stellar_mag", false).toBool()));
+	setClampStellarMagnitude(conf->value("astro/clamp_stellar_mag", 6.5).toFloat());
+	setFlagClampDSOMagnitude((conf->value("astro/flag_clamp_dso_mag", false).toBool()));
+	setClampDSOMagnitude(conf->value("astro/clamp_dso_mag", 8.5).toFloat());
+	// qDebug() << "drawer: clampStellarMag: " << clampStellarMagnitude << " , clampDSOmagnitude: " << clampDSOMagnitude;
 
 	bool ok=true;
 
@@ -470,6 +475,9 @@
 	(StelProjectorP projector, const Vec3d& v, float illuminatedArea, 
 	 float mag, const Vec3f& color)
 {
+	// GZ: Only draw if we did not clamp this object away.
+	if (flagClampStellarMagnitude && (mag > clampStellarMagnitude)) return;
+
 	const float pixPerRad = projector->getPixelPerRadAtCenter();
 	// Assume a disk shape
 	float pixRadius = std::sqrt(illuminatedArea/(60.*60.)*M_PI/180.*M_PI/180.*(pixPerRad*pixPerRad))/M_PI;
 
=== modified file 'src/core/StelSkyDrawer.hpp'
--- src/core/StelSkyDrawer.hpp	2012-09-06 01:28:07 +0000
+++ src/core/StelSkyDrawer.hpp	2013-03-02 19:13:21 +0000
@@ -35,7 +35,7 @@
 
 //! @class StelSkyDrawer
 //! Provide a set of methods used to draw sky objects taking into account
-//! eyes adaptation, zoom level and instrument model
+//! eyes adaptation, zoom level, instrument model and artificially set magnitude limits
 class StelSkyDrawer : public QObject
 {
 	Q_OBJECT
@@ -193,6 +193,24 @@
 	//! @return the limit V mag at which a point source will be displayed
 	float getLimitMagnitude() const {return limitMagnitude;}
 
+	//! set true to draw stars only downto clampStellarMagnitude
+	void setFlagClampStellarMagnitude(bool flagClamp) {flagClampStellarMagnitude = flagClamp;}
+	//! set true to draw deep-sky objects only downto clampDSOMagnitude
+	void setFlagClampDSOMagnitude(bool flagClamp)     {flagClampDSOMagnitude = flagClamp;}
+	//! @return true if user wants to draw only upto clampStellarMagnitude
+	bool getFlagClampStellarMagnitude() const {return flagClampStellarMagnitude;}
+	//! @return true if user wants to draw only upto clampDSOMagnitude
+	bool getFlagClampDSOMagnitude()     const {return flagClampDSOMagnitude;}
+
+	//! Get the artificially set limit for point sources, to limit drawing e.g. for naked-eye display
+	float getClampStellarMagnitude() const {return clampStellarMagnitude;}
+	//! Set the artificially set limit for point sources, to limit drawing e.g. for naked-eye display
+	void setClampStellarMagnitude(double clampMag) {clampStellarMagnitude=clampMag;}
+	//! Get the artificially set limit for deep-sky sources, to limit drawing e.g. for naked-eye display
+	float getClampDSOMagnitude() const {return clampDSOMagnitude;}
+	//! Set the artificially set limit for deep-sky sources, to limit drawing e.g. for naked-eye display
+	void setClampDSOMagnitude(double clampMag) {clampDSOMagnitude=clampMag;}
+
 	//! Get the luminance of the faintest visible object (e.g. RGB<0.05)
 	//! It depends on the zoom level, on the eye adapation and on the point source rendering parameters
 	//! @return the limit V luminance at which an object will be visible
@@ -300,6 +318,10 @@
 	//! This is used to avoid twinkling/simulate extinction/refraction.
 	bool flagHasAtmosphere;
 
+	//! if true, only draw stars downto clampStellarMagnitude
+	bool flagClampStellarMagnitude;
+	//! if true, only draw Deep-sky objects downto clampDSOMagnitude
+	bool flagClampDSOMagnitude;
 
 	float starRelativeScale;
 	float starAbsoluteScaleF;
@@ -312,6 +334,11 @@
 	//! Current magnitude luminance
 	float limitLuminance;
 
+	//! Magnitude limit, e.g. to display naked-eye stars only
+	float clampStellarMagnitude;
+	//! Magnitude limit, e.g. to display naked-eye or binocular deep-sky objects only
+	float clampDSOMagnitude;
+
 	//! Little halo texture
 	class StelTextureNew* texHalo;
 
 
=== modified file 'src/core/modules/Nebula.cpp'
--- src/core/modules/Nebula.cpp	2012-08-12 14:34:36 +0000
+++ src/core/modules/Nebula.cpp	2013-03-02 19:13:21 +0000
@@ -44,9 +44,12 @@
 	if(!initialized){return;}
 
 	delete texCircle; 
+	delete texGalaxy;
 	delete texOpenCluster;    
 	delete texGlobularCluster;
 	delete texPlanetaryNebula;   
+	delete texDiffuseNebula;
+	delete texOpenClusterWithNebulosity;
 	
 	initialized = false;
 }
@@ -55,10 +58,13 @@
 {
 	if(initialized){return;}
 
-	texCircle          = renderer->createTexture("textures/neb.png");   // Load circle texture
-	texOpenCluster     = renderer->createTexture("textures/ocl.png");   // Load open cluster marker texture
-	texGlobularCluster = renderer->createTexture("textures/gcl.png");   // Load globular cluster marker texture
-	texPlanetaryNebula = renderer->createTexture("textures/pnb.png");   // Load planetary nebula marker texture
+	texCircle          = renderer->createTexture("textures/neb.png");      // Load circle texture
+	texGalaxy          = renderer->createTexture("textures/neb_gal.png");  // Load ellipse texture
+	texOpenCluster     = renderer->createTexture("textures/neb_ocl.png");  // Load open cluster marker texture
+	texGlobularCluster = renderer->createTexture("textures/neb_gcl.png");  // Load globular cluster marker texture
+	texPlanetaryNebula = renderer->createTexture("textures/neb_pnb.png");  // Load planetary nebula marker texture
+	texDiffuseNebula   = renderer->createTexture("textures/neb_dif.png");  // Load diffuse nebula marker texture
+	texOpenClusterWithNebulosity = renderer->createTexture("textures/neb_ocln.png");  // Load Ocl/Nebula marker texture
 
 	initialized = true;
 }
@@ -184,22 +190,37 @@
 		col = StelUtils::getNightColor(col);
 
 	renderer->setGlobalColor(col[0], col[1], col[2], 1);
-	if (nType == 1)
-	{
-		hintTextures.texOpenCluster->bind();
-	}
-	else if (nType == 2)
-	{
-		hintTextures.texGlobularCluster->bind();
-	}
-	else if (nType == 4)
-	{
-		hintTextures.texPlanetaryNebula->bind();
-	}
-	else
-	{
-		hintTextures.texCircle->bind();
-	}
+/*
+	if (nType == NebGx)		 hintTextures.texGalaxy->bind();
+	else if (nType == NebOc) hintTextures.texOpenCluster->bind();
+	else if (nType == NebGc) hintTextures.texGlobularCluster->bind();
+	else if (nType == NebN)  hintTextures.texDiffuseNebula->bind();
+	else if (nType == NebPn) hintTextures.texPlanetaryNebula->bind();
+	else if (nType == NebCn) hintTextures.texOpenClusterWithNebulosity->bind();
+	else hintTextures.texCircle->bind();
+*/
+	switch (nType) {
+		case NebGx:
+				hintTextures.texGalaxy->bind();
+				break;
+		case NebOc:
+				hintTextures.texOpenCluster->bind();
+				break;
+		case NebGc:
+				hintTextures.texGlobularCluster->bind();
+				break;
+		case NebN:
+				hintTextures.texDiffuseNebula->bind();
+				break;
+		case NebPn:
+				hintTextures.texPlanetaryNebula->bind();
+				break;
+		case NebCn:
+				hintTextures.texOpenClusterWithNebulosity->bind();
+				break;
+		default:
+				hintTextures.texCircle->bind();
+}
 
 	renderer->drawTexturedRect(XY[0] - 6, XY[1] - 6, 12, 12);
 }
@@ -255,6 +276,13 @@
 	StelUtils::spheToRect(ra,dec,XYZ);
 	Q_ASSERT(fabs(XYZ.lengthSquared()-1.)<0.000000001);
 	nType = (Nebula::NebulaType)type;
+	// GZ: Trace the undefined entries...
+	//if (type >= 5) {
+	//	qDebug()<< (isIc?"IC" : "NGC") << nb << " type " << type ;
+	//}
+	if (type == 5) {
+		qDebug()<< (isIc?"IC" : "NGC") << nb << " type " << type ;
+	}
 	pointRegion = SphericalRegionP(new SphericalPoint(getJ2000EquatorialPos(NULL)));
 }
 
@@ -353,6 +381,9 @@
 		case NebPn:
 			wsType = q_("Planetary nebula");
 			break;
+		case NebDn:
+			wsType = q_("Dark Nebula (?)"); // Find out if this is true!
+			break;
 		case NebCn:
 			wsType = q_("Cluster associated with nebulosity");
 			break;
 
=== modified file 'src/core/modules/Nebula.hpp'
--- src/core/modules/Nebula.hpp	2012-08-10 11:43:14 +0000
+++ src/core/modules/Nebula.hpp	2013-03-02 19:13:21 +0000
@@ -74,14 +74,20 @@
 	//! Textures used to draw nebula hints.
 	struct NebulaHintTextures
 	{
-		//! The symbolic circle texture.
+		//! The symbolic circle texture. (default)
 		class StelTextureNew* texCircle;  
-		//! The open cluster marker texture.
+		//! The symbolic galaxy texture. (Type 0)
+		class StelTextureNew* texGalaxy;
+		//! The open cluster marker texture. (Type 1)
 		class StelTextureNew* texOpenCluster;
-		//! The globular cluster marker texture.
+		//! The globular cluster marker texture. (Type 2)
 		class StelTextureNew* texGlobularCluster;
-		//! The planetary nebula marker texture.
+		//! The diffuse nebula marker texture. (Type 3)
+		class StelTextureNew* texDiffuseNebula;
+		//! The planetary nebula marker texture. (type 4)
 		class StelTextureNew* texPlanetaryNebula;
+		//! The "Open cluster with Nebulosity" nebula marker texture. (Type 7)
+		class StelTextureNew* texOpenClusterWithNebulosity;
 		//! Are we initialized yet?
 		bool initialized;
 
@@ -101,10 +107,10 @@
 		NebGc=2,     //!< Globular star cluster, usually in the Milky Way Galaxy
 		NebN=3,      //!< Bright emission or reflection nebula
 		NebPn=4,     //!< Planetary nebula
-		NebDn=5,     //!< ??? 
-		NebIg=6,     //!< ??? 
+		NebDn=5,     //!< ??? Dark Nebula?      Does not exist in current catalog
+		NebIg=6,     //!< ??? Irregular Galaxy? Does not exist in current catalog
 		NebCn=7,     //!< Cluster associated with nebulosity
-		NebUnknown=8 //!< Unknown type
+		NebUnknown=8 //!< Unknown type, catalog errors, "Unidentified Southern Objects" etc.
 	};
 
 	//! Translate nebula name using the passed translator
 
=== modified file 'src/core/modules/NebulaMgr.cpp'
--- src/core/modules/NebulaMgr.cpp	2013-02-22 11:43:47 +0000
+++ src/core/modules/NebulaMgr.cpp	2013-03-02 19:13:21 +0000
@@ -129,6 +129,10 @@
 	void operator()(StelRegionObject* obj)
 	{
 		Nebula* n = static_cast<Nebula*>(obj);
+		StelSkyDrawer *drawer = core->getSkyDrawer();
+		// filter out DSOs which are too dim to be seen (e.g. for bino observers)
+		if ((drawer->getFlagClampDSOMagnitude()) && (n->mag > drawer->getClampDSOMagnitude())) return;
+
 		if (n->angularSize>angularSizeLimit || (checkMaxMagHints && n->mag <= maxMagHints))
 		{
 			float refmag_add=0; // value to adjust hints visibility threshold.
@@ -161,8 +165,8 @@
 	const SphericalRegionP& p = prj->getViewportConvexPolygon(margin, margin);
 
 	// Print all the nebulae of all the selected zones
-	float maxMagHints = skyDrawer->getLimitMagnitude()*1.2f-2.f+(hintsAmount*1.2f)-2.f;
-	float maxMagLabels = skyDrawer->getLimitMagnitude()-2.f+(labelsAmount*1.2f)-2.f;
+	float maxMagHints  = skyDrawer->getLimitMagnitude()*1.2f-2.f+(hintsAmount *1.2f)-2.f;
+	float maxMagLabels = skyDrawer->getLimitMagnitude()     -2.f+(labelsAmount*1.2f)-2.f;
 	
 	renderer->setFont(nebulaFont);
 	nebulaHintTextures.lazyInit(renderer);
@@ -176,6 +180,7 @@
 	}
 }
 
+// Draw the pointer around the object if selected
 void NebulaMgr::drawPointer(const StelCore* core, StelRenderer* renderer)
 {
 	const StelProjectorP prj = core->getProjection(StelCore::FrameJ2000);
 
=== modified file 'src/core/modules/NebulaMgr.hpp'
--- src/core/modules/NebulaMgr.hpp	2013-02-22 11:43:47 +0000
+++ src/core/modules/NebulaMgr.hpp	2013-03-02 19:13:21 +0000
@@ -40,6 +40,8 @@
 //! @class NebulaMgr
 //! Manage a collection of nebulae. This class is used
 //! to display the NGC catalog with information, and textures for some of them.
+// GZ: This doc seems outdated/misleading - photo textures are not mamaged here but in StelSkyImageTile
+
 class NebulaMgr : public StelObjectModule
 {
 	Q_OBJECT
@@ -103,7 +105,7 @@
 	///////////////////////////////////////////////////////////////////////////
 	// Properties setters and getters
 public slots:
-	//! Set the color used to draw the nebula circles.
+	//! Set the color used to draw the nebula symbols (circles, boxes. etc).
 	void setCirclesColor(const Vec3f& c);
 	//! Get current value of the nebula circle color.
 	const Vec3f& getCirclesColor(void) const;
@@ -114,6 +116,7 @@
 	float getCircleScale(void) const;
 
 	//! Set how long it takes for nebula hints to fade in and out when turned on and off.
+	//! @param duration given in seconds
 	void setHintsFadeDuration(float duration) {hintsFader.setDuration((int) (duration * 1000.f));}
 
 	//! Set flag for displaying Nebulae Hints.
 
=== modified file 'src/core/modules/Planet.cpp'
--- src/core/modules/Planet.cpp	2013-02-10 10:26:03 +0000
+++ src/core/modules/Planet.cpp	2013-03-02 19:13:21 +0000
@@ -1050,7 +1050,7 @@
 		*/
 		// GZ: I prefer the values given by Meeus, Astronomical Algorithms (1992).
 		// There are two solutions:
-		// (1) G. Mller, based on visual observations 1877-91. [Expl.Suppl.1961]
+		// (1) G. Mueller, based on visual observations 1877-91. [Expl.Suppl.1961]
 		// (2) Astronomical Almanac 1984 and later. These give V (instrumental) magnitudes.
 		// The structure is almost identical, just the numbers are different!
 		// I activate (1) for now, because we want to simulate the eye's impression. (Esp. Venus!)
@@ -1068,7 +1068,7 @@
 			return -8.93 + d + extinctionMag;
 		if (englishName=="Saturn")
 		{
-			// TODO re-add rings computation
+			// add rings computation
 			// GZ: implemented from Meeus, Astr.Alg.1992
 			const double jd=core->getJDay();
 			const double T=(jd-2451545.0)/36525.0;
@@ -1100,7 +1100,7 @@
 			return -9.40 + d + 0.005*phaseDeg + extinctionMag;
 		if (englishName=="Saturn")
 		{
-			// TODO re-add rings computation
+			// add rings computation
 			// GZ: implemented from Meeus, Astr.Alg.1992
 			const double jd=core->getJDay();
 			const double T=(jd-2451545.0)/36525.0;
 
=== modified file 'src/core/modules/ZoneArray.cpp'
--- src/core/modules/ZoneArray.cpp	2012-09-05 13:30:21 +0000
+++ src/core/modules/ZoneArray.cpp	2013-03-02 19:13:21 +0000
@@ -444,6 +444,8 @@
 				file->close();
 			}
 		}
+		// GZ: Some diagnostics to understand the undocumented vars around mag.
+		// qDebug() << "SpecialZoneArray: mag_min=" << mag_min << ", mag_steps=" << mag_steps << ", mag_range=" << mag_range ;
 	}
 }
 
@@ -485,22 +487,24 @@
 	static const double d2000 = 2451545.0;
 	const double movementFactor = (M_PI/180)*(0.0001/3600) * ((core->getJDay()-d2000)/365.25) / star_position_scale;
 	const float* tmpRcmag; // will point to precomputed rC in table
-	// GZ, added for extinction
 	Extinction extinction=core->getSkyDrawer()->getExtinction();
 	const bool withExtinction=(drawer->getFlagHasAtmosphere() && extinction.getExtinctionCoefficient()>=0.01f);
 	const float k = (0.001f*mag_range)/mag_steps; // from StarMgr.cpp line 654
-
+	// GZ: allow artificial cutoff:
+	const int clampStellarMagnitude_mmag = (int) floor(drawer->getClampStellarMagnitude() * 1000.0f);
+	// find s->mag, which is the step into the magnitudes which is just bright enough to be drawn.
+	int cutoffMagStep=(drawer->getFlagClampStellarMagnitude() ? (clampStellarMagnitude_mmag - mag_min)*mag_steps/mag_range : mag_steps);
 
 	// go through all stars, which are sorted by magnitude (bright stars first)
 	for (const Star *s=z->getStars();s<end;++s)
 	{
+		if (s->mag > cutoffMagStep) break; // e.g. naked-eye stars only.
 		tmpRcmag = rcmag_table+2*s->mag;
 		if (*tmpRcmag<=0.f) break; // no size for this and following (even dimmer, unextincted) stars? --> early exit
 		s->getJ2000Pos(z,movementFactor, vf);
 
 		const Vec3d vd(vf[0], vf[1], vf[2]);
 
-		// GZ new:
 		if (withExtinction)
 		{
 			//GZ: We must compute position first, then shift magnitude.
@@ -509,7 +513,14 @@
 			extinction.forward(&altAz, &extMagShift);
 			const int extMagShiftStep = 
 				qMin((int)floor(extMagShift / k), RCMAG_TABLE_SIZE-mag_steps); 
-			tmpRcmag = rcmag_table + 2 * (s->mag+extMagShiftStep);
+			if ((s->mag + extMagShiftStep) > cutoffMagStep) // i.e., if extincted it is dimmer than cutoff, so remove [draw with hopefully zero size].
+			{
+				tmpRcmag = rcmag_table + 2 * (RCMAG_TABLE_SIZE-1);
+			}
+			else
+			{
+				tmpRcmag = rcmag_table + 2 * (s->mag+extMagShiftStep);
+			}
 		}
 
 		Vec3f win;
 
=== modified file 'src/core/modules/ZoneArray.hpp'
--- src/core/modules/ZoneArray.hpp	2012-08-19 16:37:16 +0000
+++ src/core/modules/ZoneArray.hpp	2013-03-02 19:13:21 +0000
@@ -122,13 +122,13 @@
 	//! Level in StelGeodesicGrid.
 	const int level;
 
-	//! Lower bound of magnitudes in this catalog.
+	//! Lower bound of magnitudes in this catalog. Units: millimag. May be negative for brightest stars.
 	const int mag_min;
 
-	//! Range of magnitudes in this catalog.
+	//! Range of magnitudes in this catalog. Units: millimags
 	const int mag_range;
 
-	//! Number of steps used to describe values in @em mag_range.
+	//! Number of steps used to describe values in @em mag_range. Always positive. Individual stars have their mag entries from 0..mag_steps.
 	const int mag_steps;
 
 	float star_position_scale;
 
=== modified file 'src/gui/ConfigurationDialog.cpp'
--- src/gui/ConfigurationDialog.cpp	2013-02-25 00:27:09 +0000
+++ src/gui/ConfigurationDialog.cpp	2013-03-02 19:13:21 +0000
@@ -494,6 +494,10 @@
 	conf->setValue("stars/relative_scale", skyd->getRelativeStarScale());
 	conf->setValue("stars/flag_star_twinkle", skyd->getFlagTwinkle());
 	conf->setValue("stars/star_twinkle_amount", skyd->getTwinkleAmount());
+	conf->setValue("astro/flag_clamp_stellar_mag", skyd->getFlagClampStellarMagnitude());
+	conf->setValue("astro/clamp_stellar_mag", skyd->getClampStellarMagnitude());
+	conf->setValue("astro/flag_clamp_dso_mag", skyd->getFlagClampDSOMagnitude());
+	conf->setValue("astro/clamp_dso_mag", skyd->getClampDSOMagnitude());
 	conf->setValue("viewing/use_luminance_adaptation", skyd->getFlagLuminanceAdaptation());
 	conf->setValue("astro/flag_planets", ssmgr->getFlagPlanets());
 	conf->setValue("astro/flag_planets_hints", ssmgr->getFlagHints());
 
=== modified file 'src/gui/ViewDialog.cpp'
--- src/gui/ViewDialog.cpp	2013-02-11 12:29:27 +0000
+++ src/gui/ViewDialog.cpp	2013-03-02 19:13:21 +0000
@@ -155,6 +155,19 @@
 	ui->adaptationCheckbox->setChecked(StelApp::getInstance().getCore()->getSkyDrawer()->getFlagLuminanceAdaptation());
 	connect(ui->adaptationCheckbox, SIGNAL(toggled(bool)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setFlagLuminanceAdaptation(bool)));
 
+	// Limit Magnitudes
+	ui->starLimitMagnitudeCheckBox->setChecked(StelApp::getInstance().getCore()->getSkyDrawer()->getFlagClampStellarMagnitude());
+	connect(ui->starLimitMagnitudeCheckBox, SIGNAL(toggled(bool)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setFlagClampStellarMagnitude(bool)));
+
+	ui->starLimitMagnitudeDoubleSpinBox->setValue(StelApp::getInstance().getCore()->getSkyDrawer()->getClampStellarMagnitude());
+	connect(ui->starLimitMagnitudeDoubleSpinBox, SIGNAL(valueChanged(double)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setClampStellarMagnitude(double)));
+
+	ui->nebulaLimitMagnitudeCheckBox->setChecked(StelApp::getInstance().getCore()->getSkyDrawer()->getFlagClampDSOMagnitude());
+	connect(ui->nebulaLimitMagnitudeCheckBox, SIGNAL(toggled(bool)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setFlagClampDSOMagnitude(bool)));
+
+	ui->nebulaLimitMagnitudeDoubleSpinBox->setValue(StelApp::getInstance().getCore()->getSkyDrawer()->getClampDSOMagnitude());
+	connect(ui->nebulaLimitMagnitudeDoubleSpinBox, SIGNAL(valueChanged(double)), StelApp::getInstance().getCore()->getSkyDrawer(), SLOT(setClampDSOMagnitude(double)));
+
 	// Planets section
 	SolarSystem* ssmgr = GETSTELMODULE(SolarSystem);
 	ui->showPlanetCheckBox->setChecked(ssmgr->getFlagPlanets());
 
=== modified file 'src/gui/viewDialog.ui'
--- src/gui/viewDialog.ui	2013-02-01 14:42:55 +0000
+++ src/gui/viewDialog.ui	2013-03-02 19:13:21 +0000
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>488</width>
-    <height>481</height>
+    <width>594</width>
+    <height>513</height>
    </rect>
   </property>
   <property name="font">
@@ -325,7 +325,7 @@
         </item>
        </widget>
       </item>
-      <item>
+      <item alignment="Qt::AlignTop">
        <widget class="QStackedWidget" name="stackedWidget">
         <property name="currentIndex">
          <number>0</number>
@@ -338,7 +338,273 @@
           <property name="spacing">
            <number>0</number>
           </property>
-          <item row="0" column="0">
+          <item row="1" column="1" alignment="Qt::AlignTop">
+           <widget class="QGroupBox" name="labelsGroupBox">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>150</height>
+             </size>
+            </property>
+            <property name="font">
+             <font>
+              <pointsize>10</pointsize>
+              <weight>50</weight>
+              <bold>false</bold>
+             </font>
+            </property>
+            <property name="title">
+             <string>Labels and Markers</string>
+            </property>
+            <property name="checkable">
+             <bool>false</bool>
+            </property>
+            <layout class="QGridLayout" name="gridLayoutx">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item row="0" column="0">
+              <widget class="QCheckBox" name="starLabelCheckBox">
+               <property name="text">
+                <string>Stars</string>
+               </property>
+              </widget>
+             </item>
+             <item row="0" column="1">
+              <widget class="QSlider" name="starsLabelsHorizontalSlider">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>180</width>
+                 <height>0</height>
+                </size>
+               </property>
+               <property name="value">
+                <number>33</number>
+               </property>
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QCheckBox" name="planetLabelCheckBox">
+               <property name="text">
+                <string>Planets</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QSlider" name="planetsLabelsHorizontalSlider">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>180</width>
+                 <height>0</height>
+                </size>
+               </property>
+               <property name="value">
+                <number>33</number>
+               </property>
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QCheckBox" name="nebulaLabelCheckBox">
+               <property name="text">
+                <string>Nebulas</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QSlider" name="nebulasLabelsHorizontalSlider">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>180</width>
+                 <height>0</height>
+                </size>
+               </property>
+               <property name="value">
+                <number>33</number>
+               </property>
+               <property name="orientation">
+                <enum>Qt::Horizontal</enum>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="0" column="1">
+           <widget class="QGroupBox" name="planetsGroupBox">
+            <property name="font">
+             <font>
+              <pointsize>10</pointsize>
+              <weight>50</weight>
+              <bold>false</bold>
+             </font>
+            </property>
+            <property name="title">
+             <string>Planets and satellites</string>
+            </property>
+            <property name="checkable">
+             <bool>false</bool>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_2">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QCheckBox" name="showPlanetCheckBox">
+               <property name="text">
+                <string>Show planets</string>
+               </property>
+               <property name="checked">
+                <bool>true</bool>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="planetMarkerCheckBox">
+               <property name="text">
+                <string>Show planet markers</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="planetOrbitCheckBox">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="text">
+                <string>Show planet orbits</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="planetLightSpeedCheckBox">
+               <property name="text">
+                <string>Simulate light speed</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <widget class="QCheckBox" name="planetScaleMoonCheckBox">
+               <property name="text">
+                <string>Scale Moon</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="1" column="0">
+           <widget class="QGroupBox" name="atmosphereGroupBox">
+            <property name="font">
+             <font>
+              <pointsize>10</pointsize>
+              <weight>50</weight>
+              <bold>false</bold>
+             </font>
+            </property>
+            <property name="title">
+             <string>Atmosphere</string>
+            </property>
+            <layout class="QVBoxLayout" name="verticalLayout_3">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item>
+              <widget class="QCheckBox" name="showAtmosphereCheckBox">
+               <property name="text">
+                <string>Show atmosphere</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <layout class="QHBoxLayout" name="_2">
+               <item>
+                <widget class="QLabel" name="label_4">
+                 <property name="text">
+                  <string>Light pollution:</string>
+                 </property>
+                </widget>
+               </item>
+               <item>
+                <widget class="QSpinBox" name="lightPollutionSpinBox">
+                 <property name="alignment">
+                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+                 </property>
+                 <property name="minimum">
+                  <number>1</number>
+                 </property>
+                 <property name="maximum">
+                  <number>9</number>
+                 </property>
+                 <property name="value">
+                  <number>1</number>
+                 </property>
+                </widget>
+               </item>
+              </layout>
+             </item>
+             <item>
+              <widget class="QPushButton" name="pushButtonAtmosphereDetails">
+               <property name="toolTip">
+                <string>pressure, temperature, extinction coefficient</string>
+               </property>
+               <property name="text">
+                <string>Refraction/Extinction settings...</string>
+               </property>
+              </widget>
+             </item>
+             <item>
+              <spacer name="verticalSpacer_2">
+               <property name="orientation">
+                <enum>Qt::Vertical</enum>
+               </property>
+               <property name="sizeType">
+                <enum>QSizePolicy::Expanding</enum>
+               </property>
+               <property name="sizeHint" stdset="0">
+                <size>
+                 <width>20</width>
+                 <height>0</height>
+                </size>
+               </property>
+              </spacer>
+             </item>
+            </layout>
+           </widget>
+          </item>
+          <item row="0" column="0" alignment="Qt::AlignTop">
            <widget class="QGroupBox" name="starGroupBox">
             <property name="font">
              <font>
@@ -621,309 +887,7 @@
             </layout>
            </widget>
           </item>
-          <item row="0" column="1">
-           <widget class="QGroupBox" name="planetsGroupBox">
-            <property name="font">
-             <font>
-              <pointsize>10</pointsize>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
-            <property name="title">
-             <string>Planets and satellites</string>
-            </property>
-            <property name="checkable">
-             <bool>false</bool>
-            </property>
-            <layout class="QVBoxLayout" name="verticalLayout_2">
-             <property name="margin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QCheckBox" name="showPlanetCheckBox">
-               <property name="text">
-                <string>Show planets</string>
-               </property>
-               <property name="checked">
-                <bool>true</bool>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="planetMarkerCheckBox">
-               <property name="text">
-                <string>Show planet markers</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="planetOrbitCheckBox">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="text">
-                <string>Show planet orbits</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="planetLightSpeedCheckBox">
-               <property name="text">
-                <string>Simulate light speed</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <widget class="QCheckBox" name="planetScaleMoonCheckBox">
-               <property name="text">
-                <string>Scale Moon</string>
-               </property>
-              </widget>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="1" column="0">
-           <widget class="QGroupBox" name="atmosphereGroupBox">
-            <property name="font">
-             <font>
-              <pointsize>10</pointsize>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
-            <property name="title">
-             <string>Atmosphere</string>
-            </property>
-            <layout class="QVBoxLayout" name="verticalLayout_3">
-             <property name="margin">
-              <number>0</number>
-             </property>
-             <item>
-              <widget class="QCheckBox" name="showAtmosphereCheckBox">
-               <property name="text">
-                <string>Show atmosphere</string>
-               </property>
-              </widget>
-             </item>
-             <item>
-              <layout class="QHBoxLayout" name="_2">
-               <item>
-                <widget class="QLabel" name="label_4">
-                 <property name="text">
-                  <string>Light pollution:</string>
-                 </property>
-                </widget>
-               </item>
-               <item>
-                <widget class="QSpinBox" name="lightPollutionSpinBox">
-                 <property name="alignment">
-                  <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-                 </property>
-                 <property name="minimum">
-                  <number>1</number>
-                 </property>
-                 <property name="maximum">
-                  <number>9</number>
-                 </property>
-                 <property name="value">
-                  <number>1</number>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <layout class="QHBoxLayout" name="horizontalLayout">
-               <item>
-                <widget class="QPushButton" name="pushButtonAtmosphereDetails">
-                 <property name="toolTip">
-                  <string>pressure, temperature, extinction coefficient</string>
-                 </property>
-                 <property name="text">
-                  <string>Refraction/Extinction settings...</string>
-                 </property>
-                </widget>
-               </item>
-              </layout>
-             </item>
-             <item>
-              <spacer name="verticalSpacer_2">
-               <property name="orientation">
-                <enum>Qt::Vertical</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Expanding</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>20</width>
-                 <height>0</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="1" column="1">
-           <widget class="QGroupBox" name="labelsGroupBox">
-            <property name="sizePolicy">
-             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
-              <horstretch>0</horstretch>
-              <verstretch>0</verstretch>
-             </sizepolicy>
-            </property>
-            <property name="minimumSize">
-             <size>
-              <width>0</width>
-              <height>150</height>
-             </size>
-            </property>
-            <property name="font">
-             <font>
-              <pointsize>10</pointsize>
-              <weight>50</weight>
-              <bold>false</bold>
-             </font>
-            </property>
-            <property name="title">
-             <string>Labels and Markers</string>
-            </property>
-            <property name="checkable">
-             <bool>false</bool>
-            </property>
-            <layout class="QGridLayout" name="gridLayoutx">
-             <property name="margin">
-              <number>0</number>
-             </property>
-             <item row="0" column="0">
-              <widget class="QCheckBox" name="starLabelCheckBox">
-               <property name="text">
-                <string>Stars</string>
-               </property>
-              </widget>
-             </item>
-             <item row="0" column="1">
-              <widget class="QSlider" name="starsLabelsHorizontalSlider">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>180</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="value">
-                <number>33</number>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="0">
-              <widget class="QCheckBox" name="nebulaLabelCheckBox">
-               <property name="text">
-                <string>Nebulas</string>
-               </property>
-              </widget>
-             </item>
-             <item row="1" column="1">
-              <widget class="QSlider" name="nebulasLabelsHorizontalSlider">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>180</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="value">
-                <number>33</number>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="0">
-              <widget class="QCheckBox" name="planetLabelCheckBox">
-               <property name="text">
-                <string>Planets</string>
-               </property>
-              </widget>
-             </item>
-             <item row="2" column="1">
-              <widget class="QSlider" name="planetsLabelsHorizontalSlider">
-               <property name="sizePolicy">
-                <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
-                 <horstretch>0</horstretch>
-                 <verstretch>0</verstretch>
-                </sizepolicy>
-               </property>
-               <property name="minimumSize">
-                <size>
-                 <width>180</width>
-                 <height>0</height>
-                </size>
-               </property>
-               <property name="value">
-                <number>33</number>
-               </property>
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-              </widget>
-             </item>
-             <item row="3" column="1">
-              <spacer name="horizontalSpacer_4">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Preferred</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>180</width>
-                 <height>0</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-             <item row="3" column="0">
-              <spacer name="horizontalSpacer_5">
-               <property name="orientation">
-                <enum>Qt::Horizontal</enum>
-               </property>
-               <property name="sizeType">
-                <enum>QSizePolicy::Minimum</enum>
-               </property>
-               <property name="sizeHint" stdset="0">
-                <size>
-                 <width>40</width>
-                 <height>0</height>
-                </size>
-               </property>
-              </spacer>
-             </item>
-            </layout>
-           </widget>
-          </item>
-          <item row="2" column="0" colspan="2">
+          <item row="3" column="0">
            <widget class="QGroupBox" name="shootingStarsGroupBox">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
@@ -959,8 +923,11 @@
                 </property>
                 <item>
                  <widget class="QLabel" name="label_14">
+                  <property name="toolTip">
+                   <string>Hourly zenith rate</string>
+                  </property>
                   <property name="text">
-                   <string>Hourly zenith rate:</string>
+                   <string>ZHR:</string>
                   </property>
                   <property name="textFormat">
                    <enum>Qt::PlainText</enum>
@@ -982,7 +949,7 @@
                 <property name="margin">
                  <number>0</number>
                 </property>
-                <item>
+                <item alignment="Qt::AlignTop">
                  <widget class="QFrame" name="frame_8">
                   <property name="frameShape">
                    <enum>QFrame::StyledPanel</enum>
@@ -1064,6 +1031,155 @@
             </layout>
            </widget>
           </item>
+          <item row="3" column="1">
+           <widget class="QGroupBox" name="limitsGroupBox">
+            <property name="sizePolicy">
+             <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+              <horstretch>0</horstretch>
+              <verstretch>0</verstretch>
+             </sizepolicy>
+            </property>
+            <property name="minimumSize">
+             <size>
+              <width>0</width>
+              <height>0</height>
+             </size>
+            </property>
+            <property name="font">
+             <font>
+              <pointsize>10</pointsize>
+              <weight>50</weight>
+              <bold>false</bold>
+             </font>
+            </property>
+            <property name="toolTip">
+             <string>Limit Magnitudes (for unaided/binocular observers)</string>
+            </property>
+            <property name="title">
+             <string>Limit Magnitudes</string>
+            </property>
+            <property name="checkable">
+             <bool>false</bool>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_6">
+             <property name="margin">
+              <number>0</number>
+             </property>
+             <item row="1" column="0">
+              <widget class="QCheckBox" name="starLimitMagnitudeCheckBox">
+               <property name="toolTip">
+                <string>Stars to magnitude</string>
+               </property>
+               <property name="text">
+                <string>Stars</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="1">
+              <widget class="QDoubleSpinBox" name="nebulaLimitMagnitudeDoubleSpinBox">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>0</width>
+                 <height>0</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>70</width>
+                 <height>16777215</height>
+                </size>
+               </property>
+               <property name="frame">
+                <bool>true</bool>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignCenter</set>
+               </property>
+               <property name="buttonSymbols">
+                <enum>QAbstractSpinBox::UpDownArrows</enum>
+               </property>
+               <property name="decimals">
+                <number>2</number>
+               </property>
+               <property name="minimum">
+                <double>3.000000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>21.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.250000000000000</double>
+               </property>
+               <property name="value">
+                <double>8.500000000000000</double>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QCheckBox" name="nebulaLimitMagnitudeCheckBox">
+               <property name="toolTip">
+                <string>Nebulas to magitude</string>
+               </property>
+               <property name="text">
+                <string>Nebulas</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="1">
+              <widget class="QDoubleSpinBox" name="starLimitMagnitudeDoubleSpinBox">
+               <property name="sizePolicy">
+                <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+                 <horstretch>0</horstretch>
+                 <verstretch>0</verstretch>
+                </sizepolicy>
+               </property>
+               <property name="minimumSize">
+                <size>
+                 <width>0</width>
+                 <height>0</height>
+                </size>
+               </property>
+               <property name="maximumSize">
+                <size>
+                 <width>70</width>
+                 <height>16777215</height>
+                </size>
+               </property>
+               <property name="frame">
+                <bool>true</bool>
+               </property>
+               <property name="alignment">
+                <set>Qt::AlignCenter</set>
+               </property>
+               <property name="buttonSymbols">
+                <enum>QAbstractSpinBox::UpDownArrows</enum>
+               </property>
+               <property name="decimals">
+                <number>2</number>
+               </property>
+               <property name="minimum">
+                <double>0.000000000000000</double>
+               </property>
+               <property name="maximum">
+                <double>21.000000000000000</double>
+               </property>
+               <property name="singleStep">
+                <double>0.100000000000000</double>
+               </property>
+               <property name="value">
+                <double>6.500000000000000</double>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </item>
          </layout>
         </widget>
         <widget class="QWidget" name="page_2">
@@ -1733,7 +1849,6 @@
   <tabstop>planetScaleMoonCheckBox</tabstop>
   <tabstop>showAtmosphereCheckBox</tabstop>
   <tabstop>lightPollutionSpinBox</tabstop>
-  <tabstop>pushButtonAtmosphereDetails</tabstop>
   <tabstop>starLabelCheckBox</tabstop>
   <tabstop>starsLabelsHorizontalSlider</tabstop>
   <tabstop>nebulaLabelCheckBox</tabstop>
 
=== modified file 'textures/CMakeLists.txt'
--- textures/CMakeLists.txt	2012-10-09 14:36:41 +0000
+++ textures/CMakeLists.txt	2013-03-02 19:13:21 +0000
@@ -1,6 +1,6 @@
 ########### install files ###############
 
-INSTALL(FILES amalthea.png proteus.png triton.png pluto.png charon.png moon.png mercury.png venus.png earth_cmap.png earth-clouds.png earthmap.png mars.png jupiter.png saturn.png uranus.png neptune.png earth-shadow.png saturn_rings_radial.png uranus_rings.png neptune_rings.png lune.png phobos.png deimos.png io.png europa.png ganymede.png callisto.png mimas.png enceladus.png tethys.png dione.png rhea.png titan.png hyperion.png iapetus.png miranda.png ariel.png umbriel.png titania.png oberon.png fog.png milkyway.png fogridge.png ocl.png gcl.png pnb.png neb.png halo.png pointeur2.png pointeur4.png pointeur5.png star16x16.png sun.png nomap.png haloLune.png planet-indicator.png corona.png DESTINATION share/${PACKAGE}/textures)
+INSTALL(FILES neb.png neb_dif.png neb_gal.png neb_gcl.png neb_ocl.png neb_ocln.png neb_pnb.png amalthea.png proteus.png triton.png pluto.png charon.png moon.png mercury.png venus.png earth_cmap.png earth-clouds.png earthmap.png mars.png jupiter.png saturn.png uranus.png neptune.png earth-shadow.png saturn_rings_radial.png uranus_rings.png neptune_rings.png lune.png phobos.png deimos.png io.png europa.png ganymede.png callisto.png mimas.png enceladus.png tethys.png dione.png rhea.png titan.png hyperion.png iapetus.png miranda.png ariel.png umbriel.png titania.png oberon.png fog.png milkyway.png fogridge.png halo.png pointeur2.png pointeur4.png pointeur5.png star16x16.png sun.png nomap.png haloLune.png planet-indicator.png corona.png DESTINATION share/${PACKAGE}/textures)
 
 ADD_CUSTOM_TARGET(splash ALL)
 SET(_splashFile logo24bits.png)
 
=== added file 'textures/neb_dif.png'
 Binary files textures/neb_dif.png	1970-01-01 00:00:00 +0000 and textures/neb_dif.png	2013-03-02 19:13:21 +0000 differ
=== added file 'textures/neb_gal.png'
 Binary files textures/neb_gal.png	1970-01-01 00:00:00 +0000 and textures/neb_gal.png	2013-03-02 19:13:21 +0000 differ
=== renamed file 'textures/gcl.png' => 'textures/neb_gcl.png'
=== renamed file 'textures/ocl.png' => 'textures/neb_ocl.png'
=== added file 'textures/neb_ocln.png'
 Binary files textures/neb_ocln.png	1970-01-01 00:00:00 +0000 and textures/neb_ocln.png	2013-03-02 19:13:21 +0000 differ
=== added file 'textures/neb_ocln.tif'
 Binary files textures/neb_ocln.tif	1970-01-01 00:00:00 +0000 and textures/neb_ocln.tif	2013-03-02 19:13:21 +0000 differ
=== renamed file 'textures/pnb.png' => 'textures/neb_pnb.png'