merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Wed, 26 Nov 2014 14:37:34 +0000 (14:37 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Wed, 26 Nov 2014 14:37:34 +0000 (14:37 +0000)
1  2 
.gitattributes
eu.etaxonomy.taxeditor.editor/plugin.xml

diff --cc .gitattributes
index 8022fc5c55944043c09384f2ed723cd2036a2825,03a3a308100b889127190287cd83520083fb5dc7..52d0b6230dc9d1703b5fb68943c2edd563d9a6e8
@@@ -357,12 -357,8 +357,13 @@@ eu.etaxonomy.taxeditor.editor/icons/der
  eu.etaxonomy.taxeditor.editor/icons/edit_16x16.gif -text
  eu.etaxonomy.taxeditor.editor/icons/emblem-photos.png -text
  eu.etaxonomy.taxeditor.editor/icons/leaf_detail.png -text
+ eu.etaxonomy.taxeditor.editor/icons/link_obj.gif -text
  eu.etaxonomy.taxeditor.editor/icons/xper64.png -text
 +eu.etaxonomy.taxeditor.editor/lib/biojava3-alignment-3.0.7.jar -text
 +eu.etaxonomy.taxeditor.editor/lib/biojava3-core-3.0.7.jar -text
 +eu.etaxonomy.taxeditor.editor/lib/commons-lang3-3.1.jar -text
 +eu.etaxonomy.taxeditor.editor/lib/core-1.8.5.jar -text
 +eu.etaxonomy.taxeditor.editor/lib/sequencing-1.8.5.jar -text
  eu.etaxonomy.taxeditor.editor/p2.inf -text
  eu.etaxonomy.taxeditor.editor/plugin.xml -text
  eu.etaxonomy.taxeditor.editor/pom.xml -text
index c139ebbe59d5a5d44e011397a7b226c5555780b1,e0dc27452a6e82856dd48cd39980258a16e69300..1fdf2b517425979d001b956dc22b96ef267e501e
              </visibleWhen>
           </command>
        </menuContribution>
 +      <menuContribution
 +            allPopups="false"
 +            locationURI="menu:org.eclipse.ui.main.menu">
 +         <menu
 +               label="Alignment Editor">
 +            <command
 +                  commandId="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.loadPherogram"
 +                  label="Load Pherogram"
 +                  style="push">
 +            </command>
 +            <visibleWhen
 +                  checkEnabled="true">
 +               <with
 +                     variable="activePartId">
 +                  <equals
 +                        value="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor">
 +                  </equals>
 +               </with>
 +            </visibleWhen>
 +         </menu>
 +      </menuContribution>
 +      <menuContribution
 +            locationURI="toolbar:org.eclipse.ui.main.toolbar?after=eu.etaxonomy.taxeditor.navigation.search.toolbar">
 +         <toolbar
 +               id="eu.etaxonomy.taxeditor.editor.alignmentToolbar">
 +            <control
 +                  class="eu.etaxonomy.taxeditor.editor.molecular.ToggleLeftRightInsertionButton">
 +               <visibleWhen
 +                     checkEnabled="true">
 +                  <with
 +                        variable="activePartId">
 +                     <equals
 +                           value="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor">
 +                     </equals>
 +                  </with>
 +               </visibleWhen>
 +            </control>
 +            <control
 +                  class="eu.etaxonomy.taxeditor.editor.molecular.ToggleInsertOverwriteButton">
 +               <visibleWhen
 +                     checkEnabled="true">
 +                  <with
 +                        variable="activePartId">
 +                     <equals
 +                           value="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor">
 +                     </equals>
 +                  </with>
 +               </visibleWhen>
 +            </control>
 +         </toolbar>
 +      </menuContribution>
++      
+       <menuContribution
+             allPopups="false"
+             locationURI="toolbar:eu.etaxonomy.taxeditor.editor.view.descriptive">
+          <command
+                commandId="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations"
+                icon="icons/link_obj.gif"
+                style="toggle"
+                tooltip="Show Only Individuals Associations">
+          </command>
+       </menuContribution>
+       <menuContribution
+             allPopups="false"
+             locationURI="popup:eu.etaxonomy.taxeditor.navigation.navigatorpopup?after=taxeditor-navigation.separator2">
+          <command
+                commandId="eu.etaxonomy.taxeditor.editor.handler.openDerivateView"
+                label="Open Associated Derivates"
+                style="push">
+          </command>
+          <separator
+                name="eu.etaxonomy.taxeditor.editor.separator1"
+                visible="true">
+          </separator>
+       </menuContribution>
     </extension>
     <extension
           point="org.eclipse.ui.handlers">
              id="eu.etaxonomy.taxeditor.editor.command.new.datasource"
              name="%command.name.39">
        </command>
 +      <command
 +            defaultHandler="eu.etaxonomy.taxeditor.editor.handler.OpenAlignmentEditor"
 +            id="eu.etaxonomy.taxeditor.editor.handler.OpenAlignmentEditor"
 +            name="Open Alignment Editor">
 +      </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.addA"
 +            name="Add A">
 +      </command>
 +      <command
 +            id="eu.etaxonomy.taxeditor.editor.molecular.AlignmentEditor.loadPherogram"
 +            name="Load Pherogram">
 +      </command>
+       <command
+             id="eu.etaxonomy.taxeditor.editor.handler.showOnlyIndividualAssociations"
+             name="Show Only Individual Associations">
+       </command>
 +
     </extension>
     <extension
           point="org.eclipse.core.expressions.definitions">