Use cross by default as editing vertex marker: semi-transparent circle markers take way too long time to render.

Also make the markers smaller by default for better readability.


git-svn-id: http://svn.osgeo.org/qgis/trunk@12558 c8812cc2-4d05-0410-92ff-de0c093fc19c

Author: wonder

src/app/qgsoptions.cpp

@@ -265,7 +265,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   mMarkerStyleComboBox->addItem( tr( "Cross" ) );
   mMarkerStyleComboBox->addItem( tr( "None" ) );
 
-  QString markerStyle = settings.value( "/qgis/digitizing/marker_style", "SemiTransparentCircle" ).toString();
+  QString markerStyle = settings.value( "/qgis/digitizing/marker_style", "Cross" ).toString();
   if ( markerStyle == "SemiTransparentCircle" )
   {
     mMarkerStyleComboBox->setCurrentIndex( mMarkerStyleComboBox->findText( tr( "Semi transparent circle" ) ) );
@@ -278,7 +278,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   {
     mMarkerStyleComboBox->setCurrentIndex( mMarkerStyleComboBox->findText( tr( "None" ) ) );
   }
-  mMarkerSizeSpinBox->setValue( settings.value( "/qgis/digitizing/marker_size", 7 ).toInt() );
+  mMarkerSizeSpinBox->setValue( settings.value( "/qgis/digitizing/marker_size", 3 ).toInt() );
 
   chkDisableAttributeValuesDlg->setChecked( settings.value( "/qgis/digitizing/disable_enter_attribute_values_dialog", false ).toBool() );
 

src/core/qgsvectorlayer.cpp

@@ -3812,7 +3812,7 @@ int QgsVectorLayer::boundingBoxFromPointList( const QList<QgsPoint>& list, doubl
 QgsVectorLayer::VertexMarkerType QgsVectorLayer::currentVertexMarkerType()
 {
   QSettings settings;
-  QString markerTypeString = settings.value( "/qgis/digitizing/marker_style", "SemiTransparentCircle" ).toString();
+  QString markerTypeString = settings.value( "/qgis/digitizing/marker_style", "Cross" ).toString();
   if ( markerTypeString == "Cross" )
   {
     return QgsVectorLayer::Cross;
@@ -3830,7 +3830,7 @@ QgsVectorLayer::VertexMarkerType QgsVectorLayer::currentVertexMarkerType()
 int QgsVectorLayer::currentVertexMarkerSize()
 {
   QSettings settings;
-  return settings.value( "/qgis/digitizing/marker_size", 7 ).toInt();
+  return settings.value( "/qgis/digitizing/marker_size", 3 ).toInt();
 }
 
 void QgsVectorLayer::drawFeature( QgsRenderContext &renderContext,