[QGIS Commit] r12362 - trunk/qgis/src/app

[svn_qgis at osgeo.org]

Author: jef
Date: 2009-12-07 17:15:10 -0500 (Mon, 07 Dec 2009)
New Revision: 12362

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgsoptions.cpp
   trunk/qgis/src/app/qgsrasterlayerproperties.cpp
   trunk/qgis/src/app/qgsvectorlayerproperties.cpp
Log:
save geometry and current row of options, vector and raster property dialogs

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2009-12-07 21:37:56 UTC (rev 12361)
+++ trunk/qgis/src/app/qgisapp.cpp	2009-12-07 22:15:10 UTC (rev 12362)
@@ -4523,6 +4523,8 @@
     double zoomFactor = mySettings.value( "/qgis/zoom_factor", 2 ).toDouble();
     mMapCanvas->setWheelAction(( QgsMapCanvas::WheelAction ) action, zoomFactor );
   }
+
+  delete optionsDialog;
 }
 
 void QgisApp::helpContents()

Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp	2009-12-07 21:37:56 UTC (rev 12361)
+++ trunk/qgis/src/app/qgsoptions.cpp	2009-12-07 22:15:10 UTC (rev 12362)
@@ -294,15 +294,38 @@
   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()
 {

Modified: trunk/qgis/src/app/qgsrasterlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsrasterlayerproperties.cpp	2009-12-07 21:37:56 UTC (rev 12361)
+++ trunk/qgis/src/app/qgsrasterlayerproperties.cpp	2009-12-07 22:15:10 UTC (rev 12362)
@@ -318,11 +318,18 @@
 
   // 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() );
 }
 
 /*

Modified: trunk/qgis/src/app/qgsvectorlayerproperties.cpp
===================================================================
--- trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2009-12-07 21:37:56 UTC (rev 12361)
+++ trunk/qgis/src/app/qgsvectorlayerproperties.cpp	2009-12-07 22:15:10 UTC (rev 12362)
@@ -153,6 +153,10 @@
   }
 
   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 @@
 
   //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::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;