Yet another tweak to svn r5815 (dialog box now remembers the

drawpolyogn toggle state git-svn-id: http://svn.osgeo.org/qgis/trunk@5823 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 13, 2006 · 2c8c195 · 2c8c195
1 parent 44a2bc3
commit 2c8c195
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 5 deletions.
diff --git a/src/gui/qgscontinuouscolordialog.cpp b/src/gui/qgscontinuouscolordialog.cpp
@@ -86,11 +86,20 @@ QgsContinuousColorDialog::QgsContinuousColorDialog(QgsVectorLayer * layer)
         }
 	outlinewidthspinbox->setMinValue(1);
 	outlinewidthspinbox->setValue(minsymbol->pen().width());
-    }
 
-
-    cb_polygonOutline->setCheckState(Qt::Checked);
-    outlinewidthspinbox->setEnabled(true);
+	if (renderer->drawPolygonOutline()) 
+	  cb_polygonOutline->setCheckState(Qt::Checked);
+	else
+	  cb_polygonOutline->setCheckState(Qt::Unchecked);
+    }
+    else
+    {
+      cb_polygonOutline->setCheckState(Qt::Checked);
+      outlinewidthspinbox->setValue(1);
+    }
+    // Ensure that the state of other widgets is appropriate for the
+    // state of the polygonoutline checkbox.
+    on_cb_polygonOutline_clicked();
 }
 
 QgsContinuousColorDialog::QgsContinuousColorDialog()

diff --git a/src/gui/qgscontinuouscolorrenderer.h b/src/gui/qgscontinuouscolorrenderer.h
@@ -52,7 +52,7 @@ class QgsContinuousColorRenderer: public QgsRenderer
     /**Returns the symbol for the maximum value*/
     const QgsSymbol* maximumSymbol() const;
     /** whether to draw a polygon outline*/
-    bool drawPolygonOutline() { return mDrawPolygonOutline; }
+    bool drawPolygonOutline() const { return mDrawPolygonOutline; }
     /**Reads the renderer configuration from an XML file
      @param rnode the DOM node to read 
      @param vl the vector layer which will be associated with the renderer*/