Merge pull request #4913 from pblottiere/joineditable2

[FEATURE] Joined layers are editable
qgis · Aug 28, 2017 · 30b46f7 · 30b46f7
2 parents 55a01dc + 19ce33f
commit 30b46f7
Show file tree

Hide file tree

Showing 27 changed files with 1,735 additions and 117 deletions.
diff --git a/images/images.qrc b/images/images.qrc
@@ -342,6 +342,9 @@
         <file>themes/default/mIconDelete.png</file>
         <file>themes/default/mIconDeselected.svg</file>
         <file>themes/default/mIconDropDownMenu.svg</file>
+        <file>themes/default/mIconJoinNotEditable.svg</file>
+        <file>themes/default/mIconJoinedLayerNotEditable.svg</file>
+        <file>themes/default/mIconJoinHasNotUpsertOnEdit.svg</file>
         <file>themes/default/mIconEditableEdits.svg</file>
         <file>themes/default/mIconExpand.svg</file>
         <file>themes/default/mIconExpandSmall.svg</file>

diff --git a/images/themes/default/mIconJoinHasNotUpsertOnEdit.svg b/images/themes/default/mIconJoinHasNotUpsertOnEdit.svg