- added "Delete (with children)" icon

 - cleaned up plugin.xml

diff --git a/.gitattributes b/.gitattributes
index 9380ea51fff478f41bfb3be23f04740e832e2595..e67243effe6d5ab1d68da5d44d853b6bc6cc675e 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -359,6 +359,7 @@ eu.etaxonomy.taxeditor.editor/build.properties -text
 eu.etaxonomy.taxeditor.editor/icons/address-book-new.png -text
 eu.etaxonomy.taxeditor.editor/icons/camera-photo.png -text
 eu.etaxonomy.taxeditor.editor/icons/check.png -text
+eu.etaxonomy.taxeditor.editor/icons/deep-delete-16x16-32.png -text
 eu.etaxonomy.taxeditor.editor/icons/derivate_view-16x16-32.png -text
 eu.etaxonomy.taxeditor.editor/icons/edit_16x16.gif -text
 eu.etaxonomy.taxeditor.editor/icons/emblem-photos.png -text

diff --git a/eu.etaxonomy.taxeditor.editor/icons/deep-delete-16x16-32.png b/eu.etaxonomy.taxeditor.editor/icons/deep-delete-16x16-32.png
new file mode 100644 (file)
index 0000000..6aae60d
Binary files /dev/null and b/eu.etaxonomy.taxeditor.editor/icons/deep-delete-16x16-32.png differ

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index f0ff65922f1da3becbff4dd81078b2d8529edc3e..134220d33e4bed4441f13e2ecb5478853db8d104 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -155,23 +155,6 @@
       </extension>
       
        <!-- VALIDATION RELATED STUFF -->
-       <extension point="org.eclipse.ui.menus">
-       <menuContribution locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=org.eclipse.ui.views.showView.supplemental">
-                       <separator
-                  name="eu.etaxonomy.taxeditor.store.showViewMenu.validation.separator"
-                  visible="true">
-            </separator>
-                       <command
-                             commandId="org.eclipse.ui.views.showView"
-                             label="%command.name.40"
-                             style="push">
-                          <parameter
-                                name="org.eclipse.ui.views.showView.viewId"
-                                value="eu.etaxonomy.taxeditor.editor.view.validation.problems">
-                          </parameter>
-                       </command>
-               </menuContribution>
-       </extension>
        <extension point="org.eclipse.core.resources.markers" name="Validation Error" id="eu.etaxonomy.taxeditor.markers.validationerror">
                <super type="org.eclipse.core.resources.problemmarker"/>
                <attribute name="databaseId"/>
@@ -716,6 +699,7 @@
          </command>
          <command
                commandId="eu.etaxonomy.taxeditor.editor.derivate.deepDelete"
+               icon="icons/deep-delete-16x16-32.png"
                label="Delete (with children)"
                style="push">
          </command>
@@ -961,6 +945,22 @@
                visible="true">
          </separator>
       </menuContribution>
+      <menuContribution
+            locationURI="menu:eu.etaxonomy.taxeditor.menu.showView?after=org.eclipse.ui.views.showView.supplemental">
+         <separator
+               name="eu.etaxonomy.taxeditor.store.showViewMenu.validation.separator"
+               visible="true">
+         </separator>
+         <command
+               commandId="org.eclipse.ui.views.showView"
+               label="%command.name.40"
+               style="push">
+            <parameter
+                  name="org.eclipse.ui.views.showView.viewId"
+                  value="eu.etaxonomy.taxeditor.editor.view.validation.problems">
+            </parameter>
+         </command>
+      </menuContribution>
    </extension>
    <extension
          point="org.eclipse.ui.handlers">