Merge branch 'release/3.12.0'

[taxeditor.git] / eu.etaxonomy.taxeditor.editor / plugin.xml

diff --git a/eu.etaxonomy.taxeditor.editor/plugin.xml b/eu.etaxonomy.taxeditor.editor/plugin.xml
index c4e90a5f644373e65922664c0198766161337a6b..7cf0948326fe2165c4c2c5a2ac01facb141dd4a9 100644 (file)
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@ -76,6 +76,13 @@
             id="eu.etaxonomy.taxeditor.editor.view.checklist.ChecklistEditor"
             name="%editor.name.8">
       </editor>
+         <editor
+               class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
+               default="false"
+               icon="icons/derivate_view-16x16-32.png"
+               id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
+               name="Derivative Editor">
+         </editor>
    </extension>
       <extension
             point="org.eclipse.ui.views">
@@ -145,13 +152,6 @@
                id="eu.etaxonomy.taxeditor.editor.view.validation.problems"
                name="%view.name.6">
          </view>
-         <view
-               class="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
-               icon="icons/derivate_view-16x16-32.png"
-               id="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView"
-               name="Derivative Editor"
-               restorable="true">
-         </view>
       </extension>
       
        <!-- VALIDATION RELATED STUFF -->
@@ -313,6 +313,10 @@
                </reference>
             </visibleWhen>
          </command>
+         <separator
+               name="eu.etaxonomy.taxeditor.editor.showViewMenu"
+               visible="true">
+         </separator>
          <command
                commandId="org.eclipse.ui.views.showView"
                label="%command.label.5"
@@ -720,29 +724,6 @@
                </or>
             </visibleWhen>
          </menu>
-         <separator
-               name="taxeditor-editor.separator1"
-               visible="true">
-         </separator>
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
-               label="%command.label.51"
-               style="push">
-            <visibleWhen
-                  checkEnabled="true">
-               <and>
-                  <with
-                        variable="selection">
-                     <count
-                           value="+">
-                     </count>
-                  </with>
-                  <reference
-                        definitionId="isIndividualsAssociation">
-                  </reference>
-               </and>
-            </visibleWhen>
-         </command>
          <command
                commandId="eu.etaxonomy.taxeditor.editor.view.descriptive.command.moveDescriptionToTaxon"
                label="%command.label.28"
@@ -1034,19 +1015,25 @@
       </menuContribution>
       <menuContribution
             allPopups="false"
-            locationURI="toolbar:eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
-         <command
-               commandId="eu.etaxonomy.taxeditor.editor.derivative.listenToSelectionChange"
-               icon="icons/synced.gif"
-               label="Link with Taxon Editor"
-               style="toggle">
-            <visibleWhen
-                  checkEnabled="false">
-               <reference
-                     definitionId="isCdmStoreConnected">
-               </reference>
-            </visibleWhen>
-         </command>
+            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=eu.etaxonomy.taxeditor.navigation.search.toolbar">
+         <toolbar
+               id="eu.etaxonomy.taxeditor.editor.derivativeViewToolbar">
+            <command
+                  commandId="eu.etaxonomy.taxeditor.editor.derivative.listenToSelectionChange"
+                  icon="icons/synced.gif"
+                  label="Link with Taxon Selection"
+                  style="toggle">
+               <visibleWhen
+                     checkEnabled="true">
+                  <with
+                        variable="activePartId">
+                     <equals
+                           value="eu.etaxonomy.taxeditor.editor.view.derivate.DerivateView">
+                     </equals>
+                  </with>
+               </visibleWhen>
+            </command>
+         </toolbar>
       </menuContribution>
    </extension>
    <extension
@@ -1143,18 +1130,6 @@
             </with>
          </activeWhen>
       </handler>
-      <handler
-            class="eu.etaxonomy.taxeditor.editor.view.derivate.handler.OpenDerivateEditorForTaxonHandler"
-            commandId="eu.etaxonomy.taxeditor.editor.handler.openDerivateView">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="eu.etaxonomy.taxeditor.navigation.navigator">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
       <handler
             class="eu.etaxonomy.taxeditor.editor.view.descriptive.handler.ToggleShowOnlyIndividualAssociationsHandler"
             commandId="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations">
@@ -1461,11 +1436,6 @@
             defaultHandler="eu.etaxonomy.taxeditor.editor.group.authority.handler.EditCdmAuthoritiesHandler"
             id="eu.etaxonomy.taxeditor.group.cdmauthorities.edit"
             name="%command.name.34">
-      </command>
-      <command
-            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenDerivateViewHandler"
-            id="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
-            name="%command.name.35">
       </command>
        <command
              defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenChecklistEditorHandler"
@@ -1530,7 +1500,7 @@
       <command
             defaultHandler="eu.etaxonomy.taxeditor.editor.view.derivate.handler.ListenToSelectionChangeHandler"
             id="eu.etaxonomy.taxeditor.editor.derivative.listenToSelectionChange"
-            name="Link with editor">
+            name="Link with taxon selection">
       </command>
         
    </extension>