geometry less features: update add feature tool in digitizing toolbar and icon in attribute table (fixes #8262)

jef-n · jef-n · commit dae8ea66a169 · 2014-02-13T23:35:35.000+01:00
diff --git a/images/images.qrc b/images/images.qrc
@@ -147,6 +147,7 @@
         <file>themes/default/mActionCaptureLine.png</file>
         <file>themes/default/mActionCapturePoint.png</file>
         <file>themes/default/mActionCapturePolygon.png</file>
+        <file>themes/default/mActionNewTableRow.png</file>
         <file>themes/default/mActionChangeLabelProperties.png</file>
         <file>themes/default/mActionCheckQgisVersion.png</file>
         <file>themes/default/mActionCollapseTree.png</file>
diff --git a/images/themes/default/mActionNewTableRow.png b/images/themes/default/mActionNewTableRow.png
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
@@ -8701,6 +8701,10 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
         mActionDeleteRing->setEnabled( isEditable && canChangeGeometry );
         mActionOffsetCurve->setEnabled( false );
       }
+      else if ( vlayer->geometryType() == QGis::NoGeometry )
+      {
+        mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionNewTableRow.png" ) );
+      }
 
       mActionOpenFieldCalc->setEnabled( isEditable && ( canChangeAttributes || canAddAttributes ) );
 
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
@@ -154,6 +154,7 @@ QgsAttributeTableDialog::QgsAttributeTableDialog( QgsVectorLayer *theLayer, QWid
   mTableViewButton->setIcon( QgsApplication::getThemeIcon( "/mActionOpenTable.png" ) );
   mAttributeViewButton->setIcon( QgsApplication::getThemeIcon( "/mActionPropertyItem.png" ) );
   mExpressionSelectButton->setIcon( QgsApplication::getThemeIcon( "/mIconExpressionSelect.svg" ) );
+  mAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionNewTableRow.png" ) );
 
   // toggle editing
   bool canChangeAttributes = mLayer->dataProvider()->capabilities() & QgsVectorDataProvider::ChangeAttributeValues;
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -45,6 +45,24 @@ bool QgsMapToolAddFeature::addFeature( QgsVectorLayer *vlayer, QgsFeature *f )
   return action.addFeature();
 }
 
+void QgsMapToolAddFeature::activate()
+{
+  if ( !mCanvas || mCanvas->isDrawing() )
+  {
+    return;
+  }
+
+  QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mCanvas->currentLayer() );
+  if ( vlayer && vlayer->geometryType() == QGis::NoGeometry )
+  {
+    QgsFeature f;
+    addFeature( vlayer, &f );
+    return;
+  }
+
+  QgsMapTool::activate();
+}
+
 void QgsMapToolAddFeature::canvasReleaseEvent( QMouseEvent * e )
 {
   QgsDebugMsg( "entered." );
diff --git a/src/app/qgsmaptooladdfeature.h b/src/app/qgsmaptooladdfeature.h
@@ -26,4 +26,5 @@ class APP_EXPORT QgsMapToolAddFeature : public QgsMapToolCapture
     void canvasReleaseEvent( QMouseEvent * e );
 
     bool addFeature( QgsVectorLayer *vlayer, QgsFeature *f );
+    void activate();
 };
diff --git a/src/ui/qgsattributetabledialog.ui b/src/ui/qgsattributetabledialog.ui
@@ -105,7 +105,13 @@
         <string>Add feature</string>
        </property>
        <property name="text">
-        <string>+</string>
+        <string/>
+       </property>
+       <property name="iconSize">
+        <size>
+         <width>18</width>
+         <height>18</height>
+        </size>
        </property>
       </widget>
      </item>

Original file line number	Diff line number	Diff line change
`@@ -8701,6 +8701,10 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )`
`8701`	`8701`	`mActionDeleteRing->setEnabled( isEditable && canChangeGeometry );`
`8702`	`8702`	`mActionOffsetCurve->setEnabled( false );`
`8703`	`8703`	`}`
	`8704`	`+ else if ( vlayer->geometryType() == QGis::NoGeometry )`
	`8705`	`+ {`
	`8706`	`+ mActionAddFeature->setIcon( QgsApplication::getThemeIcon( "/mActionNewTableRow.png" ) );`
	`8707`	`+ }`
`8704`	`8708`
`8705`	`8709`	`mActionOpenFieldCalc->setEnabled( isEditable && ( canChangeAttributes \|\| canAddAttributes ) );`
`8706`	`8710`