fix flag and group vector layer properties

qgis · Oct 4, 2018 · c842e54 · c842e54
1 parent 2240e1f
commit c842e54
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/src/app/qgsappscreenshots.cpp b/src/app/qgsappscreenshots.cpp
@@ -193,11 +193,11 @@ void QgsAppScreenShots::takePicturesOf( Categories categories )
   if ( !categories || categories.testFlag( GlobalOptions ) )
     takeGlobalOptions();
 
-  if ( !categories || categories.testFlag( Symbol25D ) )
-    take25dSymbol();
-
   if ( !categories || categories.testFlag( VectorLayerProperties ) )
+  {
     takeVectorLayerProperties();
+    takeVectorLayerProperties25DSymbol();
+  }
 }
 
 void QgsAppScreenShots::setGradientSize( int size )
@@ -245,7 +245,7 @@ void QgsAppScreenShots::takeVectorLayerProperties()
 
 //---------------
 
-void QgsAppScreenShots::take25dSymbol()
+void QgsAppScreenShots::takeVectorLayerProperties25DSymbol()
 {
   QString folder = QLatin1String( "working_with_vector/img/auto_generated/vector_layer_properties/" );
   QgsVectorLayerProperties *dlg = new QgsVectorLayerProperties( mPolygonLayer, QgisApp::instance() );

diff --git a/src/app/qgsappscreenshots.h b/src/app/qgsappscreenshots.h
@@ -46,9 +46,8 @@ class QgsAppScreenShots
     enum Category
     {
       All = 0,
-      GlobalOptions = 1 << 1,
-      Symbol25D = 1 << 2,
-      VectorLayerProperties = 1 << 3,
+      GlobalOptions = 1 << 0,
+      VectorLayerProperties = 1 << 1,
     };
     Q_ENUM( Category )
     Q_DECLARE_FLAGS( Categories, Category )
@@ -80,7 +79,7 @@ class QgsAppScreenShots
     void saveScreenshot( QPixmap &pixmap, const QString &name, const QString &folder );
 
     void takeVectorLayerProperties();
-    void take25dSymbol();
+    void takeVectorLayerProperties25DSymbol();
     void takeGlobalOptions();
 
     QString mSaveDirectory;