Fix grid spacing persistence + indentation

Author: Atque

src/core/modules/GridLinesMgr.cpp

@@ -148,7 +148,7 @@ static const double STEP_SIZES_HMS[] = {0.05, 0.2, 1.5, 7.5, 15., 15.*5., 15.*10
 //! Return the angular grid step in degree which best fits the given scale
 static double getClosestResolutionDMS(double pixelPerRad, double spacingMultiplier)
 {
-    // Apply spacing multiplier: higher values = denser grid
+	// Apply spacing multiplier: higher values = denser grid
 	double minResolution = 80.0 / spacingMultiplier;
 	double minSizeArcsec = minResolution/pixelPerRad*M_180_PI*3600;
 	for (unsigned int i=0;i<12;++i)
@@ -162,7 +162,7 @@ static double getClosestResolutionDMS(double pixelPerRad, double spacingMultipli
 //! Return the angular grid step in degree which best fits the given scale
 static double getClosestResolutionHMS(double pixelPerRad, double spacingMultiplier)
 {
-    // Apply spacing multiplier: higher values = denser grid
+	// Apply spacing multiplier: higher values = denser grid
 	double minResolution = 80.0 / spacingMultiplier;
 	double minSizeArcsec = minResolution/pixelPerRad*M_180_PI*3600;
 	for (unsigned int i=0;i<11;++i)
@@ -1992,7 +1992,7 @@ void GridLinesMgr::init()
 	setPartThickness(conf->value("viewing/part_thickness", 1.f).toFloat());
 	// Set the point size
 	setPointSize(conf->value("viewing/point_size", 5.f).toFloat());
-    // Set gridline spacing
+	// Set gridline spacing
 	setGridSpacingMultiplier(conf->value("viewing/grid_spacing_multiplier", 1.0).toDouble());
 
 	// Load colors from config file
@@ -4187,7 +4187,7 @@ void GridLinesMgr::setFontSizeFromApp(int size)
 }
 double GridLinesMgr::getGridSpacingMultiplier() const
 {
-        return gridSpacingMultiplier;
+	return gridSpacingMultiplier;
 }
 
 void GridLinesMgr::setGridSpacingMultiplier(double multiplier)

src/gui/ConfigurationDialog.cpp

@@ -1244,6 +1244,7 @@ void ConfigurationDialog::saveAllSettings()
         conf->setValue("viewing/line_thickness",                        propMgr->getStelPropertyValue("GridLinesMgr.lineThickness").toInt());
         conf->setValue("viewing/part_thickness",                        propMgr->getStelPropertyValue("GridLinesMgr.partThickness").toInt());
         conf->setValue("viewing/point_size",                            propMgr->getStelPropertyValue("GridLinesMgr.pointSize").toInt());
+        conf->setValue("viewing/grid_spacing_multiplier",               propMgr->getStelPropertyValue("GridLinesMgr.gridSpacingMultiplier").toDouble());
 
         conf->setValue("viewing/constellation_font_size",               propMgr->getStelPropertyValue("ConstellationMgr.fontSize").toInt());
         conf->setValue("viewing/flag_constellation_abbreviations",      propMgr->getStelPropertyValue("StelSkyCultureMgr.flagUseAbbreviatedNames").toBool());

src/gui/ViewDialog.cpp

@@ -446,8 +446,9 @@ void ViewDialog::createDialogContent()
 	updateDefaultLandscape();
 	connect(lmgr, SIGNAL(landscapesChanged()), this, SLOT(populateLists()));
 	connect(ui->pushButtonAddRemoveLandscapes, SIGNAL(clicked()), this, SLOT(showAddRemoveLandscapesDialog()));
-    // Connect grid spacing combo box
+	// Connect grid spacing combo box
 	connect(ui->gridSpacingComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(gridSpacingChanged(int)));
+	updateGridSpacingComboBox();
 
 	// Grid and lines
 	connectGroupBox(ui->celestialSphereGroupBox,              "actionShow_Gridlines");
@@ -1846,15 +1847,15 @@ void ViewDialog::gridSpacingChanged(int index)
 {
 	GridLinesMgr* gridMgr = GETSTELMODULE(GridLinesMgr);
 
-		// Map combo box index to multiplier values
-		// Index 0 = Fine (2.0x), Index 1 = Normal (1.0x), Index 2 = Coarse (0.5x)
+	// Map combo box index to multiplier values
+	// Index 0 = Fine (2.0x), Index 1 = Normal (1.0x), Index 2 = Coarse (0.5x)
 	double multiplier = 1.0;
 	switch(index)
 	{
 		case 0: // Fine
 			multiplier = 2.0;
 			break;
-        case 1: // Normal
+		case 1: // Normal
 			multiplier = 1.0;
 			break;
 		case 2: // Coarse
@@ -1890,5 +1891,4 @@ void ViewDialog::updateGridSpacingComboBox()
 	ui->gridSpacingComboBox->blockSignals(true);
 	ui->gridSpacingComboBox->setCurrentIndex(index);
 	ui->gridSpacingComboBox->blockSignals(false);
-	updateGridSpacingComboBox();
 }