Tweak to go with svn r5815

g_j_m · g_j_m · commit 44a2bc351b4f · 2006-09-13T00:36:55.000Z
git-svn-id: http://svn.osgeo.org/qgis/trunk@5821 c8812cc2-4d05-0410-92ff-de0c093fc19c
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
@@ -48,13 +48,13 @@ lib_LTLIBRARIES = libqgis_gui.la
 
 qgis_SOURCES =	main.cpp
 
-qgis_LDADD = ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la $(LDADD) $(QT_LDADD) $(GDAL_LDADD) $(PG_LIB) $(GEOS_LDADD) $(PYTHON_LIB) -lproj -lsqlite3 libqgis_gui.la ../core/libqgis_core.la
+qgis_LDADD =  $(GDAL_LDADD)  $(GEOS_LDADD) ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la $(LDADD) $(QT_LDADD) $(PG_LIB) $(PYTHON_LIB) -lproj -lsqlite3 libqgis_gui.la ../core/libqgis_core.la
 if HAVE_QTMAC
 qgis_LDFLAGS = -framework ApplicationServices
 else
 qgis_LDFLAGS = -rdynamic
 endif
-qgis_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS)  $(HAVE_PYTHON) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../core/ -I../plugins/
+qgis_CXXFLAGS = $(GEOS_CFLAGS) $(GDAL_CFLAGS) $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH)  $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS)  $(HAVE_PYTHON) $(PYTHON_INCLUDE_DIR) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../core/ -I../plugins/
 
 
 ##
@@ -295,7 +295,7 @@ nodist_libqgis_gui_la_SOURCES = $(libqgis_gui_la_MOC)
 BUILT_SOURCES = $(libqgis_gui_la_MOC) $(qgis_YACC)  $(postgresMOC)
 
 
-libqgis_gui_la_LIBADD = ../core/libqgis_core.la ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la ../widgets/projectionselector/libqgsprojectionselector.la $(QT_LDADD) $(GEOS_LDADD) $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
+libqgis_gui_la_LIBADD = $(GEOS_LDADD) ../core/libqgis_core.la ../raster/libqgis_raster.la ../legend/libqgis_legend.la ../composer/libqgis_composer.la ../widgets/projectionselector/libqgsprojectionselector.la $(QT_LDADD)  $(GDAL_LDADD) $(PYTHON_LIB) -lsqlite3
 libqgis_gui_la_LDFLAGS = -version-info $(INTERFACE_VERSION)
 
 libqgis_gui_la_CXXFLAGS = $(PREFIX) $(PLUGINPATH) $(PKGDATAPATH) $(GDAL_CFLAGS) $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(PG_INC) $(DEBUG_QGIS) $(GEOS_CFLAGS) $(PYTHON_INCLUDE_DIR) $(HAVE_PYTHON) -I../ui/ -I../widgets/projectionselector/ -I../legend/ -I../raster/ -I../composer/ -I../core/ -I../plugins/
@@ -318,7 +318,7 @@ if HAVE_POSTGRESQL
 
 EXTRA_DIST += $(postgresSOURCES) \
 		$(postgresLIBSOURCES) 
-		
+
 pkginclude_HEADERS += $(postgresHEADERS) \
 		$(postgresLIBHEADERS) \
 		$(libqgisHEADERS) 
diff --git a/src/gui/qgscontinuouscolordialog.cpp b/src/gui/qgscontinuouscolordialog.cpp
@@ -84,10 +84,12 @@ QgsContinuousColorDialog::QgsContinuousColorDialog(QgsVectorLayer * layer)
 	    lblMinValue->setPaletteBackgroundColor(minsymbol->brush().color());
 	    lblMaxValue->setPaletteBackgroundColor(maxsymbol->brush().color());
         }
-	outlinewidthspinbox->setValue(minsymbol->pen().width());
 	outlinewidthspinbox->setMinValue(1);
+	outlinewidthspinbox->setValue(minsymbol->pen().width());
     }
 
+    
+    cb_polygonOutline->setCheckState(Qt::Checked);
     outlinewidthspinbox->setEnabled(true);
 }
 

Original file line number	Diff line number	Diff line change
`@@ -84,10 +84,12 @@ QgsContinuousColorDialog::QgsContinuousColorDialog(QgsVectorLayer * layer)`
`84`	`84`	`lblMinValue->setPaletteBackgroundColor(minsymbol->brush().color());`
`85`	`85`	`lblMaxValue->setPaletteBackgroundColor(maxsymbol->brush().color());`
`86`	`86`	`}`
`87`		`- outlinewidthspinbox->setValue(minsymbol->pen().width());`
`88`	`87`	`outlinewidthspinbox->setMinValue(1);`
	`88`	`+ outlinewidthspinbox->setValue(minsymbol->pen().width());`
`89`	`89`	`}`
`90`	`90`
	`91`	`+`
	`92`	`+ cb_polygonOutline->setCheckState(Qt::Checked);`
`91`	`93`	`outlinewidthspinbox->setEnabled(true);`
`92`	`94`	`}`
`93`	`95`