save geometry and current row of options, vector and raster property dialogs

jef · jef · commit 4c339968fd38 · 2009-12-07T22:15:10.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@12362 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -4523,6 +4523,8 @@ void QgisApp::options()
     double zoomFactor = mySettings.value( "/qgis/zoom_factor", 2 ).toDouble();
     mMapCanvas->setWheelAction(( QgsMapCanvas::WheelAction ) action, zoomFactor );
   }
+
+  delete optionsDialog;
 }
 
 void QgisApp::helpContents()
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
@@ -294,15 +294,38 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   mOverlayAlgorithmComboBox->insertItem( 4, tr( "Popmusic chain (very slow)" ) );
 
   QString overlayAlgorithmString = settings.value( "qgis/overlayPlacementAlgorithm", "Central point" ).toString();
-  if ( overlayAlgorithmString == "Chain" ) {mOverlayAlgorithmComboBox->setCurrentIndex( 1 );}
-  else if ( overlayAlgorithmString == "Popmusic tabu chain" ) {mOverlayAlgorithmComboBox->setCurrentIndex( 2 );}
-  else if ( overlayAlgorithmString == "Popmusic tabu" ) {mOverlayAlgorithmComboBox->setCurrentIndex( 3 );}
-  else if ( overlayAlgorithmString == "Popmusic chain" ) {mOverlayAlgorithmComboBox->setCurrentIndex( 4 );}
-  else {mOverlayAlgorithmComboBox->setCurrentIndex( 0 );} //default is central point
+  if ( overlayAlgorithmString == "Chain" )
+  {
+    mOverlayAlgorithmComboBox->setCurrentIndex( 1 );
+  }
+  else if ( overlayAlgorithmString == "Popmusic tabu chain" )
+  {
+    mOverlayAlgorithmComboBox->setCurrentIndex( 2 );
+  }
+  else if ( overlayAlgorithmString == "Popmusic tabu" )
+  {
+    mOverlayAlgorithmComboBox->setCurrentIndex( 3 );
+  }
+  else if ( overlayAlgorithmString == "Popmusic chain" )
+  {
+    mOverlayAlgorithmComboBox->setCurrentIndex( 4 );
+  }
+  else
+  {
+    mOverlayAlgorithmComboBox->setCurrentIndex( 0 );
+  } //default is central point
+
+  restoreGeometry( settings.value( "/Windows/Options/geometry" ).toByteArray() );
+  listWidget->setCurrentRow( settings.value( "/Windows/Options/row" ).toInt() );
 }
 
 //! Destructor
-QgsOptions::~QgsOptions() {}
+QgsOptions::~QgsOptions()
+{
+  QSettings settings;
+  settings.setValue( "/Windows/Options/geometry", saveGeometry() );
+  settings.setValue( "/Windows/Options/row", listWidget->currentRow() );
+}
 
 void QgsOptions::on_pbnSelectionColour_clicked()
 {
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
@@ -318,11 +318,18 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer *lyr, QWidget *p
 
   // update based on lyr's current state
   sync();
+
+  QSettings settings;
+  restoreGeometry( settings.value( "/Windows/RasterLayerProperties/geometry" ).toByteArray() );
+  listWidget->setCurrentRow( settings.value( "/Windows/RasterLayerProperties/row" ).toInt() );
 } // QgsRasterLayerProperties ctor
 
 
 QgsRasterLayerProperties::~QgsRasterLayerProperties()
 {
+  QSettings settings;
+  settings.setValue( "/Windows/RasterLayerProperties/geometry", saveGeometry() );
+  settings.setValue( "/Windows/RasterLayerProperties/row", listWidget->currentRow() );
 }
 
 /*
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
@@ -153,6 +153,10 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
   }
 
   stackedWidget->setCurrentIndex( 0 );
+
+  QSettings settings;
+  restoreGeometry( settings.value( "/Windows/VectorLayerProperties/geometry" ).toByteArray() );
+  listWidget->setCurrentRow( settings.value( "/Windows/VectorLayerProperties/row" ).toInt() );
 } // QgsVectorLayerProperties ctor
 
 void QgsVectorLayerProperties::loadRows()
@@ -201,12 +205,15 @@ void QgsVectorLayerProperties::setRow( int row, int idx, const QgsField &field )
 
   //set the alias for the attribute
   tblAttributes->setItem( row, attrAliasCol, new QTableWidgetItem( layer->attributeAlias( idx ) ) );
-
 }
 
 QgsVectorLayerProperties::~QgsVectorLayerProperties()
 {
   disconnect( labelDialog, SIGNAL( labelSourceSet() ), this, SLOT( setLabelCheckBox() ) );
+
+  QSettings settings;
+  settings.setValue( "/Windows/VectorLayerProperties/geometry", saveGeometry() );
+  settings.setValue( "/Windows/VectorLayerProperties/row", listWidget->currentRow() );
 }
 
 void QgsVectorLayerProperties::attributeTypeDialog( )
@@ -1119,8 +1126,8 @@ void QgsVectorLayerProperties::setUsingNewSymbology( bool useNewSymbology )
 void QgsVectorLayerProperties::useNewSymbology()
 {
   int res = QMessageBox::question( this, tr( "Symbology" ),
-      tr( "Do you wish to use the new symbology implementation for this layer?" ),
-      QMessageBox::Yes | QMessageBox::No );
+                                   tr( "Do you wish to use the new symbology implementation for this layer?" ),
+                                   QMessageBox::Yes | QMessageBox::No );
 
   if ( res != QMessageBox::Yes )
     return;

Original file line number	Diff line number	Diff line change
`@@ -4523,6 +4523,8 @@ void QgisApp::options()`
`4523`	`4523`	`double zoomFactor = mySettings.value( "/qgis/zoom_factor", 2 ).toDouble();`
`4524`	`4524`	`mMapCanvas->setWheelAction(( QgsMapCanvas::WheelAction ) action, zoomFactor );`
`4525`	`4525`	`}`
	`4526`	`+`
	`4527`	`+ delete optionsDialog;`
`4526`	`4528`	`}`
`4527`	`4529`
`4528`	`4530`	`void QgisApp::helpContents()`