[QGIS Commit] r15259 - in trunk/qgis/src: app core core/composer

[svn_qgis at osgeo.org]

Author: timlinux
Date: 2011-02-24 12:32:38 -0800 (Thu, 24 Feb 2011)
New Revision: 15259

Modified:
   trunk/qgis/src/app/qgisapp.cpp
   trunk/qgis/src/app/qgsoptions.cpp
   trunk/qgis/src/core/composer/qgscomposermap.cpp
   trunk/qgis/src/core/qgsmaprenderer.cpp
   trunk/qgis/src/core/qgsvectorlayer.cpp
Log:
Set the use of symbology ng and anti aliasing to default for qgis 1.7

Modified: trunk/qgis/src/app/qgisapp.cpp
===================================================================
--- trunk/qgis/src/app/qgisapp.cpp	2011-02-24 17:53:50 UTC (rev 15258)
+++ trunk/qgis/src/app/qgisapp.cpp	2011-02-24 20:32:38 UTC (rev 15259)
@@ -2375,7 +2375,8 @@
 
   // moved here to set anti aliasing to both map canvas and overview
   QSettings mySettings;
-  mMapCanvas->enableAntiAliasing( mySettings.value( "/qgis/enable_anti_aliasing", false ).toBool() );
+  // Anti Aliasing enabled by default as of QGIS 1.7
+  mMapCanvas->enableAntiAliasing( mySettings.value( "/qgis/enable_anti_aliasing", true ).toBool() );
   mMapCanvas->useImageToRender( mySettings.value( "/qgis/use_qimage_to_render", false ).toBool() );
 
   int action = mySettings.value( "/qgis/wheel_action", 0 ).toInt();

Modified: trunk/qgis/src/app/qgsoptions.cpp
===================================================================
--- trunk/qgis/src/app/qgsoptions.cpp	2011-02-24 17:53:50 UTC (rev 15258)
+++ trunk/qgis/src/app/qgsoptions.cpp	2011-02-24 20:32:38 UTC (rev 15259)
@@ -260,10 +260,12 @@
   cmbTheme->setCurrentIndex( cmbTheme->findText( settings.value( "/Themes", "default" ).toString() ) );
   cmbSize->setCurrentIndex( cmbSize->findText( settings.value( "/IconSize", 24 ).toString() ) );
   //set the state of the checkboxes
-  chkAntiAliasing->setChecked( settings.value( "/qgis/enable_anti_aliasing", false ).toBool() );
+  //Changed to default to true as of QGIS 1.7
+  chkAntiAliasing->setChecked( settings.value( "/qgis/enable_anti_aliasing", true ).toBool() );
   chkUseRenderCaching->setChecked( settings.value( "/qgis/enable_render_caching", false ).toBool() );
 
-  chkUseSymbologyNG->setChecked( settings.value( "/qgis/use_symbology_ng", false ).toBool() );
+  //Changed to default to true as of QGIS 1.7
+  chkUseSymbologyNG->setChecked( settings.value( "/qgis/use_symbology_ng", true ).toBool() );
 
   // Slightly awkard here at the settings value is true to use QImage,
   // but the checkbox is true to use QPixmap

Modified: trunk/qgis/src/core/composer/qgscomposermap.cpp
===================================================================
--- trunk/qgis/src/core/composer/qgscomposermap.cpp	2011-02-24 17:53:50 UTC (rev 15258)
+++ trunk/qgis/src/core/composer/qgscomposermap.cpp	2011-02-24 20:32:38 UTC (rev 15259)
@@ -150,7 +150,8 @@
 
   //set antialiasing if enabled in options
   QSettings settings;
-  if ( settings.value( "/qgis/enable_anti_aliasing", false ).toBool() )
+  // Changed to enable anti aliased rendering by default as of QGIS 1.7
+  if ( settings.value( "/qgis/enable_anti_aliasing", true ).toBool() )
   {
     painter->setRenderHint( QPainter::Antialiasing );
   }

Modified: trunk/qgis/src/core/qgsmaprenderer.cpp
===================================================================
--- trunk/qgis/src/core/qgsmaprenderer.cpp	2011-02-24 17:53:50 UTC (rev 15258)
+++ trunk/qgis/src/core/qgsmaprenderer.cpp	2011-02-24 20:32:38 UTC (rev 15259)
@@ -459,7 +459,8 @@
             mypImage->fill( 0 );
             ml->setCacheImage( mypImage ); //no need to delete the old one, maplayer does it for you
             QPainter * mypPainter = new QPainter( ml->cacheImage() );
-            if ( mySettings.value( "/qgis/enable_anti_aliasing", false ).toBool() )
+            // Changed to enable anti aliasing by default in QGIS 1.7
+            if ( mySettings.value( "/qgis/enable_anti_aliasing", true ).toBool() )
             {
               mypPainter->setRenderHint( QPainter::Antialiasing );
             }

Modified: trunk/qgis/src/core/qgsvectorlayer.cpp
===================================================================
--- trunk/qgis/src/core/qgsvectorlayer.cpp	2011-02-24 17:53:50 UTC (rev 15258)
+++ trunk/qgis/src/core/qgsvectorlayer.cpp	2011-02-24 20:32:38 UTC (rev 15259)
@@ -127,7 +127,8 @@
     setCoordinateSystem();
 
     QSettings settings;
-    if ( settings.value( "/qgis/use_symbology_ng", false ).toBool() && hasGeometryType() )
+    //Changed to default to true as of QGIS 1.7
+    if ( settings.value( "/qgis/use_symbology_ng", true ).toBool() && hasGeometryType() )
     {
       // using symbology-ng!
       setUsingRendererV2( true );