X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.diagram%2Fplugin.xml;h=ef8a32516069d795ecda3a4966b99afdcdc576ba;hp=bd54fd24885f900fdea2f0f45d784cfac088a938;hb=refs%2Fchanges%2F38%2F238%2F2;hpb=24e2b34260f219f0d1644ca7a138894980e25b14

diff --git a/bundles/org.simantics.diagram/plugin.xml b/bundles/org.simantics.diagram/plugin.xml
index bd54fd248..ef8a32516 100644
--- a/bundles/org.simantics.diagram/plugin.xml
+++ b/bundles/org.simantics.diagram/plugin.xml
@@ -1,930 +1,930 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.2"?>
<!--
-    Copyright (c) 2007, 2010 Association for Decentralized Information Management
-    in Industry THTH ry.
-    All rights reserved. This program and the accompanying materials
-    are made available under the terms of the Eclipse Public License v1.0
-    which accompanies this distribution, and is available at
-    http://www.eclipse.org/legal/epl-v10.html
-   
-    Contributors:
-        VTT Technical Research Centre of Finland - initial API and implementation
- -->
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.2"?>
<!--
+    Copyright (c) 2007, 2010 Association for Decentralized Information Management
+    in Industry THTH ry.
+    All rights reserved. This program and the accompanying materials
+    are made available under the terms of the Eclipse Public License v1.0
+    which accompanies this distribution, and is available at
+    http://www.eclipse.org/legal/epl-v10.html
+   
+    Contributors:
+        VTT Technical Research Centre of Finland - initial API and implementation
+ -->
 
-<plugin>
-
-   <extension
-         point="org.eclipse.ui.views">
-      <category
-            id="org.simantics.diagram.views"
-            name="Diagramming">
-      </category>
-      <view
-            category="org.simantics.diagram.views"
-            class="org.simantics.diagram.symbollibrary.ui.SymbolPageView"
-            icon="platform:/plugin/com.famfamfam.silk/icons/brick_add.png"
-            id="org.simantics.diagram.symbollibrary"
-            name="Symbols">
-         <description>
-            A paged view for showing rasterized previews of grouped symbols contributed by editors.
-         </description>
-      </view>
-      <!--
-      <view
-            category="org.simantics.diagram.views"
-            class="org.simantics.diagram.symbollibrary.ui.SymbolLibraryView"
-            icon="icons/images.png"
-            id="org.simantics.diagram.symbollibrary.managed"
-            name="Symbols">
-         <description>
-            A view for showing rasterized previews of all available symbols.
-            This is similar to org.simantics.diagram.symbollibrary but is meant
-            for viewing a set of symbols contributed through the active project's
-            org.simantics.diagram.symbollibrary.ISymbolManager instead of a paged
-            editor-specific view.
-         </description>
-      </view>
-      -->
-      <!--
-      <view
-            category="org.simantics.diagram.views"
-            class="org.simantics.diagram.layer.LayersView"
-            icon="icons/layers.png"
-            id="org.simantics.diagram.layers"
-            name="Roles">
-         <description>
-            A view for editing diagram layers.
-         </description>
-      </view>
-      -->
-   </extension>
-
- <extension
-         point="org.eclipse.ui.menus">
-      <menuContribution
-            locationURI="toolbar:org.simantics.diagram.symbollibrary">
-         <command
-               commandId="org.simantics.diagram.symbollibrary.collapseAll"
-               icon="icons/collapseall.gif"
-               label="Collapse All"
-               style="push"
-               tooltip="Collapse All">
-             <visibleWhen
-                   checkEnabled="true">
-             </visibleWhen>
-         </command>
-         <command
-               commandId="org.simantics.diagram.symbollibrary.expandAll"
-               icon="icons/expandall.gif"
-               label="Expand All"
-               style="push"
-               tooltip="Expand All">
-             <visibleWhen
-                   checkEnabled="true">
-             </visibleWhen>
-         </command>
-      </menuContribution>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.commands">
-      <category
-            id="org.simantics.diagram.category"
-            name="Diagramming">
-      </category>
-      <command
-            categoryId="org.simantics.diagram.category"
-            id="org.simantics.diagram.symbollibrary.expandAll"
-            name="expandAll">
-      </command>
-      <command
-            categoryId="org.simantics.diagram.category"
-            id="org.simantics.diagram.symbollibrary.collapseAll"
-            name="collapseAll">
-      </command>
-      <command
-            categoryId="org.simantics.diagram.category"
-            description="Switch to full screen mode"
-            id="fullScreen"
-            name="Full Screen">
-      </command>
-      <command
-            id="rulerDisable"
-            name="Disable Ruler"
-            description="Disable Ruler"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="rulerEnable"
-            name="Enable Ruler"
-            description="Enable Ruler"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="rulerToggle"
-            name="Toggle ruler"
-            description="Toggle ruler"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="snapDisable"
-            name="Disable snap"
-            description="Disable snap"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="snapEnable"
-            name="Enable snape"
-            description="Enable snap"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="snapToggle"
-            name="Toggle snap"
-            description="Toggle snap"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="gridDisable"
-            name="Disable grid"
-            description="disable grid"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="gridEnable"
-            name="Enable grid"
-            description="Enable grid"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="gridToggle"
-            name="Toggle Grid"
-            description="Grid toggle"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="sendDown"
-            name="Send down"
-            description="Send down"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="bringUp"
-            name="Bring up"
-            description="Bring up"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="sendToBottom"
-            name="Send to bottom"
-            description="Send to bottom"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="bringToTop"
-            name="Bring to top"
-            description="Bring element to top"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="cancel"
-            name="Cancel"
-            description="Cancel current action"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="invertSelection"
-            name="Invert Selection"
-            description="Invert current selection"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="rotateCCW"
-            name="Rotate counter clock-wise"
-            description="Rotate counter clock-wise"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="rotateCW"
-            name="Rotate Clock-wise"
-            description="Rotate Clock-wise"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="flipElementVertical"
-            name="Flip Element Vertical"
-            description="Flip Element Vertical"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="flipElementHorizontal"
-            name="Flip Element Horizontal"
-            description="Flip Element Horizontal"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="rotateElementCCW"
-            name="Rotate Element Counter Clock-wise"
-            description="Rotate Element Counter Clock-wise"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="rotateElementCW"
-            name="Rotate Element Clock-wise"
-            description="Rotate Element clock-wise"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="zoomToSelection"
-            name="Zoom to selection"
-            description="Zoom to selection"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="zoomToFit"
-            name="Zoom to fit"
-            description="Zoom to fit"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="zoomToPage"
-            name="Zoom to page"
-            description="Zoom to page"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="zoomOut"
-            name="Zoom Out"
-            description="Zoom Out"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="zoomIn"
-            name="Zoom In"
-            description="Zoom In"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="panDown"
-            name="Pan Down"
-            description="Pan Down"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="panUp"
-            name="Pan Up"
-            description="Pan Up"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="panRight"
-            name="Pan Right"
-            description="Pan Right"
-            categoryId="org.simantics.diagram.category">
-      </command>      
-      <command
-            id="panLeft"
-            name="Pan Left"
-            description="Pan Left"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="splitConnection"
-            name="Split Connection"
-            description="Split Selected Connection with Branch Point"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            id="scaleElement"
-            name="Scale Element"
-            description="Enter Element Scaling Mode"
-            categoryId="org.simantics.diagram.category">
-      </command>
-      <command
-            categoryId="org.simantics.diagram.category"
-            id="symbolLibrary.activateFilter"
-            name="Activate Symbol Library Filter">
-      </command>
-   </extension>
-
-   <extension point="org.eclipse.core.expressions.definitions">
-      <definition id="org.simantics.modeling.ui.diagram.active">
-         <and>
-            <with variable="activeContexts">
-               <iterate operator="and" ifEmpty="true">
-                  <not>
-                     <equals value="org.simantics.modeling.ui.diagramming.inlineEdit"/>
-                  </not>
-               </iterate>
-            </with>
-            <!-- This works better than the UI context iteration above,
-            since UI contexts will currently disappear the moment a toolbar
-            item is pressed since focus is lost at that moment. -->
-            <with variable="activePart">
-                <adapt type="org.simantics.g2d.canvas.ICanvasContext"/>
-            </with>
-         </and>
-      </definition>
-      <definition id="org.simantics.diagram.symbolLibrary.active">
-         <with variable="activeContexts">
-            <iterate operator="or" ifEmpty="false">
-               <equals value="org.simantics.diagram.symbolLibrary"/>
-            </iterate>
-         </with>
-      </definition>
-   </extension>
-
-   <extension
-         point="org.eclipse.ui.handlers">
-     <handler
-            commandId="org.simantics.diagram.symbollibrary.expandAll"
-            class="org.simantics.diagram.handler.ExpandAll">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="org.simantics.diagram.symbollibrary">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
-     <handler
-            commandId="org.simantics.diagram.symbollibrary.collapseAll"
-            class="org.simantics.diagram.handler.CollapseAll">
-         <activeWhen>
-            <with
-                  variable="activePartId">
-               <equals
-                     value="org.simantics.diagram.symbollibrary">
-               </equals>
-            </with>
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="org.eclipse.ui.edit.rename">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="fullScreen">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="panLeft">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="org.eclipse.ui.edit.copy">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="org.eclipse.ui.edit.cut">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="org.eclipse.ui.edit.paste">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="org.eclipse.ui.edit.delete">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="sendDown">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="bringUp">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="sendToBottom">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="bringToTop">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="zoomToSelection">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="zoomToPage">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="zoomOut">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="zoomToFit">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="zoomIn">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="panDown">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="panUp">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="panRight">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="rulerDisable">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="rulerEnable">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="rulerToggle">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="snapDisable">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="snapEnable">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="snapToggle">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="gridDisable">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="gridEnable">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="gridToggle">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="cancel">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="org.eclipse.ui.edit.selectAll">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="invertSelection">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="rotateElementCCW">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="rotateElementCW">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="rotateCCW">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="rotateCW">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="flipElementVertical">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="flipElementHorizontal">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="splitConnection">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.handler.CanvasCommandDelegate"
-            commandId="scaleElement">
-         <activeWhen>
-            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
-         </activeWhen>
-      </handler>
-      <handler
-            class="org.simantics.diagram.symbollibrary.ui.ActivateFilterHandler"
-            commandId="symbolLibrary.activateFilter">
-         <activeWhen>
-            <reference definitionId="org.simantics.diagram.symbolLibrary.active" />
-         </activeWhen>
-      </handler>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.bindings">
-      <key
-            commandId="fullScreen"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="Alt+Enter">
-      </key>
-      <key
-            commandId="cancel"
-            sequence="Esc"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            commandId="zoomToFit"
-            sequence="1"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            commandId="zoomToSelection"
-            sequence="2"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            commandId="zoomToPage"
-            sequence="3"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            commandId="zoomIn"
-            sequence="Numpad_Add"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            commandId="zoomOut"
-            sequence="Numpad_Subtract"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="zoomIn"
-            sequence="+"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            commandId="zoomOut"
-            sequence="-"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="org.eclipse.ui.file.refresh"
-            sequence="F5"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="org.eclipse.ui.edit.selectAll"
-            sequence="Ctrl+A"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="invertSelection"
-            sequence="Ctrl+I"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="bringToTop"
-            sequence="Home"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="sendToBottom"
-            sequence="End"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="bringUp"
-            sequence="Page_Up"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="sendDown"
-            sequence="Page_Down"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="rotateElementCCW"
-            sequence=","
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="rotateElementCW"
-            sequence="."
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="gridToggle"
-            sequence="G"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="rulerToggle"
-            sequence="R"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>      
-      <key
-            commandId="flipElementHorizontal"
-            sequence="H"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            commandId="flipElementVertical"
-            sequence="V"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            commandId="panLeft"
-            sequence="Arrow_Left"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>            
-      <key
-            commandId="panRight"
-            sequence="Arrow_Right"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>            
-      <key
-            commandId="panUp"
-            sequence="Arrow_Up"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>            
-      <key
-            commandId="panDown"
-            sequence="Arrow_Down"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            commandId="splitConnection"
-            sequence="S"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            commandId="scaleElement"
-            sequence="Alt+S"
-            contextId="org.simantics.modeling.ui.diagramming"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
-      </key>
-      <key
-            commandId="symbolLibrary.activateFilter"
-            contextId="org.simantics.diagram.symbolLibrary"
-            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
-            sequence="Ctrl+F">
-      </key>
-   </extension>
-   
-   <extension
-         point="org.eclipse.ui.contexts">
-      <context
-            description="Diagramming Editor Context"
-            id="org.simantics.modeling.ui.diagramming"
-            name="In Diagram Editor"
-            parentId="org.eclipse.ui.contexts.window">
-      </context>
-      <context
-            description="An inline editor within a diagram is active"
-            id="org.simantics.modeling.ui.diagramming.inlineEdit"
-            name="Inline Editor Active"
-            parentId="org.eclipse.ui.contexts.window">
-      </context>
-      <context
-            description="Symbol Library Context"
-            id="org.simantics.diagram.symbolLibrary"
-            name="In Symbol Library"
-            parentId="org.eclipse.ui.contexts.window">
-      </context>
-   </extension>
-   
-   <extension
-         point="org.eclipse.core.expressions.propertyTesters">
-      <propertyTester
-            class="org.simantics.diagram.flag.FlagPropertyTester"
-            id="org.simantics.diagram.flagPropertyTester"
-            namespace="org.simantics.diagram.flag"
-            properties="connected,locallyConnected,external,merged"
-            type="java.lang.Object">
-      </propertyTester>
-      <propertyTester
-            class="org.simantics.diagram.elements.ElementPropertyTester"
-            id="org.simantics.diagram.elementPropertyTester"
-            namespace="org.simantics.diagram.element"
-            properties="mapped"
-            type="java.lang.Object">
-      </propertyTester>
-      <propertyTester
-            class="org.simantics.diagram.ui.ToolPropertyTester"
-            id="org.simantics.diagram.toolPropertyTester"
-            namespace="org.simantics.diagram.tool"
-            properties="mode"
-            type="org.eclipse.ui.IEditorPart">
-      </propertyTester>
-   </extension>
-
-   <extension
-         point="org.simantics.scl.reflection.binding">
-      <namespace
-            path="http://www.simantics.org/Diagram-0.0/Functions">
-         <externalClass className="org.simantics.diagram.content.ElementContext"/>
-         <externalClass className="org.simantics.db.Resource"/>
-         <externalClass className="org.simantics.db.ReadGraph"/>
-         <externalClass className="org.simantics.db.layer0.variable.Variable"/>
-         <class
-               className="org.simantics.diagram.function.All">
-         </class>
-      </namespace>
-   </extension>
-   <extension
-         point="org.simantics.export.core.export">
-         
-      <content_type
-            icon="platform:/plugin/com.famfamfam.silk/companion/shape_3d.png"
-            id="componentType"
-            label="User Component"
-            plural="User Components"
-            model="false">
-      </content_type>
-      <content_type
-            contentTypeAction="org.simantics.diagram.export.DiagramContentTypeAction"
-            icon="platform:/plugin/org.simantics.diagram/icons/Generic_Diagram.png"
-            id="diagram"
-            label="Diagram"
-            model="false"
-            plural="Diagrams">
-      </content_type>
-      <content_type
-            icon="platform:/plugin/com.famfamfam.silk/icons/layout.png"
-            id="diagramTemplate"
-            label="Diagram Template"
-            plural="Diagram Templates"
-            model="false">
-      </content_type>
-      <content_type
-            icon="platform:/plugin/org.simantics.diagram/icons/Typical_Diagram.png"
-            id="typical"
-            label="Typical Template"
-            plural="Typical Templates"
-            model="false">
-      </content_type>
-
-      <discoverer
-            content_type_id="diagram"
-            discoverAction="org.simantics.diagram.export.DiscoverDiagrams">
-      </discoverer>
-
-	  <exporter
-         content_type_id="diagram"
-         exportAction="org.simantics.diagram.export.ExportDiagramPdf"
-         exportPriority="5"
-         formatId="pdf">
-      </exporter>    
-         
-   </extension>
-
-</plugin>
+<plugin>
+
+   <extension
+         point="org.eclipse.ui.views">
+      <category
+            id="org.simantics.diagram.views"
+            name="Diagramming">
+      </category>
+      <view
+            category="org.simantics.diagram.views"
+            class="org.simantics.diagram.symbollibrary.ui.SymbolPageView"
+            icon="platform:/plugin/com.famfamfam.silk/icons/brick_add.png"
+            id="org.simantics.diagram.symbollibrary"
+            name="Symbols">
+         <description>
+            A paged view for showing rasterized previews of grouped symbols contributed by editors.
+         </description>
+      </view>
+      <!--
+      <view
+            category="org.simantics.diagram.views"
+            class="org.simantics.diagram.symbollibrary.ui.SymbolLibraryView"
+            icon="icons/images.png"
+            id="org.simantics.diagram.symbollibrary.managed"
+            name="Symbols">
+         <description>
+            A view for showing rasterized previews of all available symbols.
+            This is similar to org.simantics.diagram.symbollibrary but is meant
+            for viewing a set of symbols contributed through the active project's
+            org.simantics.diagram.symbollibrary.ISymbolManager instead of a paged
+            editor-specific view.
+         </description>
+      </view>
+      -->
+      <!--
+      <view
+            category="org.simantics.diagram.views"
+            class="org.simantics.diagram.layer.LayersView"
+            icon="icons/layers.png"
+            id="org.simantics.diagram.layers"
+            name="Roles">
+         <description>
+            A view for editing diagram layers.
+         </description>
+      </view>
+      -->
+   </extension>
+
+ <extension
+         point="org.eclipse.ui.menus">
+      <menuContribution
+            locationURI="toolbar:org.simantics.diagram.symbollibrary">
+         <command
+               commandId="org.simantics.diagram.symbollibrary.collapseAll"
+               icon="icons/collapseall.gif"
+               label="Collapse All"
+               style="push"
+               tooltip="Collapse All">
+             <visibleWhen
+                   checkEnabled="true">
+             </visibleWhen>
+         </command>
+         <command
+               commandId="org.simantics.diagram.symbollibrary.expandAll"
+               icon="icons/expandall.gif"
+               label="Expand All"
+               style="push"
+               tooltip="Expand All">
+             <visibleWhen
+                   checkEnabled="true">
+             </visibleWhen>
+         </command>
+      </menuContribution>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.commands">
+      <category
+            id="org.simantics.diagram.category"
+            name="Diagramming">
+      </category>
+      <command
+            categoryId="org.simantics.diagram.category"
+            id="org.simantics.diagram.symbollibrary.expandAll"
+            name="expandAll">
+      </command>
+      <command
+            categoryId="org.simantics.diagram.category"
+            id="org.simantics.diagram.symbollibrary.collapseAll"
+            name="collapseAll">
+      </command>
+      <command
+            categoryId="org.simantics.diagram.category"
+            description="Switch to full screen mode"
+            id="fullScreen"
+            name="Full Screen">
+      </command>
+      <command
+            id="rulerDisable"
+            name="Disable Ruler"
+            description="Disable Ruler"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="rulerEnable"
+            name="Enable Ruler"
+            description="Enable Ruler"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="rulerToggle"
+            name="Toggle ruler"
+            description="Toggle ruler"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="snapDisable"
+            name="Disable snap"
+            description="Disable snap"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="snapEnable"
+            name="Enable snape"
+            description="Enable snap"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="snapToggle"
+            name="Toggle snap"
+            description="Toggle snap"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="gridDisable"
+            name="Disable grid"
+            description="disable grid"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="gridEnable"
+            name="Enable grid"
+            description="Enable grid"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="gridToggle"
+            name="Toggle Grid"
+            description="Grid toggle"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="sendDown"
+            name="Send down"
+            description="Send down"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="bringUp"
+            name="Bring up"
+            description="Bring up"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="sendToBottom"
+            name="Send to bottom"
+            description="Send to bottom"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="bringToTop"
+            name="Bring to top"
+            description="Bring element to top"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="cancel"
+            name="Cancel"
+            description="Cancel current action"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="invertSelection"
+            name="Invert Selection"
+            description="Invert current selection"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="rotateCCW"
+            name="Rotate counter clock-wise"
+            description="Rotate counter clock-wise"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="rotateCW"
+            name="Rotate Clock-wise"
+            description="Rotate Clock-wise"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="flipElementVertical"
+            name="Flip Element Vertical"
+            description="Flip Element Vertical"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="flipElementHorizontal"
+            name="Flip Element Horizontal"
+            description="Flip Element Horizontal"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="rotateElementCCW"
+            name="Rotate Element Counter Clock-wise"
+            description="Rotate Element Counter Clock-wise"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="rotateElementCW"
+            name="Rotate Element Clock-wise"
+            description="Rotate Element clock-wise"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="zoomToSelection"
+            name="Zoom to selection"
+            description="Zoom to selection"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="zoomToFit"
+            name="Zoom to fit"
+            description="Zoom to fit"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="zoomToPage"
+            name="Zoom to page"
+            description="Zoom to page"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="zoomOut"
+            name="Zoom Out"
+            description="Zoom Out"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="zoomIn"
+            name="Zoom In"
+            description="Zoom In"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="panDown"
+            name="Pan Down"
+            description="Pan Down"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="panUp"
+            name="Pan Up"
+            description="Pan Up"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="panRight"
+            name="Pan Right"
+            description="Pan Right"
+            categoryId="org.simantics.diagram.category">
+      </command>      
+      <command
+            id="panLeft"
+            name="Pan Left"
+            description="Pan Left"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="splitConnection"
+            name="Split Connection"
+            description="Split Selected Connection with Branch Point"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            id="scaleElement"
+            name="Scale Element"
+            description="Enter Element Scaling Mode"
+            categoryId="org.simantics.diagram.category">
+      </command>
+      <command
+            categoryId="org.simantics.diagram.category"
+            id="symbolLibrary.activateFilter"
+            name="Activate Symbol Library Filter">
+      </command>
+   </extension>
+
+   <extension point="org.eclipse.core.expressions.definitions">
+      <definition id="org.simantics.modeling.ui.diagram.active">
+         <and>
+            <with variable="activeContexts">
+               <iterate operator="and" ifEmpty="true">
+                  <not>
+                     <equals value="org.simantics.modeling.ui.diagramming.inlineEdit"/>
+                  </not>
+               </iterate>
+            </with>
+            <!-- This works better than the UI context iteration above,
+            since UI contexts will currently disappear the moment a toolbar
+            item is pressed since focus is lost at that moment. -->
+            <with variable="activePart">
+                <adapt type="org.simantics.g2d.canvas.ICanvasContext"/>
+            </with>
+         </and>
+      </definition>
+      <definition id="org.simantics.diagram.symbolLibrary.active">
+         <with variable="activeContexts">
+            <iterate operator="or" ifEmpty="false">
+               <equals value="org.simantics.diagram.symbolLibrary"/>
+            </iterate>
+         </with>
+      </definition>
+   </extension>
+
+   <extension
+         point="org.eclipse.ui.handlers">
+     <handler
+            commandId="org.simantics.diagram.symbollibrary.expandAll"
+            class="org.simantics.diagram.handler.ExpandAll">
+         <activeWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="org.simantics.diagram.symbollibrary">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+     <handler
+            commandId="org.simantics.diagram.symbollibrary.collapseAll"
+            class="org.simantics.diagram.handler.CollapseAll">
+         <activeWhen>
+            <with
+                  variable="activePartId">
+               <equals
+                     value="org.simantics.diagram.symbollibrary">
+               </equals>
+            </with>
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="org.eclipse.ui.edit.rename">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="fullScreen">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="panLeft">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="org.eclipse.ui.edit.copy">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="org.eclipse.ui.edit.cut">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="org.eclipse.ui.edit.paste">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="org.eclipse.ui.edit.delete">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="sendDown">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="bringUp">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="sendToBottom">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="bringToTop">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="zoomToSelection">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="zoomToPage">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="zoomOut">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="zoomToFit">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="zoomIn">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="panDown">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="panUp">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="panRight">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="rulerDisable">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="rulerEnable">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="rulerToggle">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="snapDisable">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="snapEnable">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="snapToggle">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="gridDisable">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="gridEnable">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="gridToggle">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="cancel">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="org.eclipse.ui.edit.selectAll">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="invertSelection">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="rotateElementCCW">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="rotateElementCW">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="rotateCCW">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="rotateCW">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="flipElementVertical">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="flipElementHorizontal">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="splitConnection">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.handler.CanvasCommandDelegate"
+            commandId="scaleElement">
+         <activeWhen>
+            <reference definitionId="org.simantics.modeling.ui.diagram.active" />
+         </activeWhen>
+      </handler>
+      <handler
+            class="org.simantics.diagram.symbollibrary.ui.ActivateFilterHandler"
+            commandId="symbolLibrary.activateFilter">
+         <activeWhen>
+            <reference definitionId="org.simantics.diagram.symbolLibrary.active" />
+         </activeWhen>
+      </handler>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.bindings">
+      <key
+            commandId="fullScreen"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="Alt+Enter">
+      </key>
+      <key
+            commandId="cancel"
+            sequence="Esc"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            commandId="zoomToFit"
+            sequence="1"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            commandId="zoomToSelection"
+            sequence="2"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            commandId="zoomToPage"
+            sequence="3"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            commandId="zoomIn"
+            sequence="Numpad_Add"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            commandId="zoomOut"
+            sequence="Numpad_Subtract"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="zoomIn"
+            sequence="+"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            commandId="zoomOut"
+            sequence="-"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="org.eclipse.ui.file.refresh"
+            sequence="F5"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="org.eclipse.ui.edit.selectAll"
+            sequence="Ctrl+A"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="invertSelection"
+            sequence="Ctrl+I"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="bringToTop"
+            sequence="Home"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="sendToBottom"
+            sequence="End"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="bringUp"
+            sequence="Page_Up"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="sendDown"
+            sequence="Page_Down"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="rotateElementCCW"
+            sequence=","
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="rotateElementCW"
+            sequence="."
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="gridToggle"
+            sequence="G"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="rulerToggle"
+            sequence="R"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>      
+      <key
+            commandId="flipElementHorizontal"
+            sequence="H"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            commandId="flipElementVertical"
+            sequence="V"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            commandId="panLeft"
+            sequence="Arrow_Left"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>            
+      <key
+            commandId="panRight"
+            sequence="Arrow_Right"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>            
+      <key
+            commandId="panUp"
+            sequence="Arrow_Up"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>            
+      <key
+            commandId="panDown"
+            sequence="Arrow_Down"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            commandId="splitConnection"
+            sequence="S"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            commandId="scaleElement"
+            sequence="Alt+S"
+            contextId="org.simantics.modeling.ui.diagramming"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration">
+      </key>
+      <key
+            commandId="symbolLibrary.activateFilter"
+            contextId="org.simantics.diagram.symbolLibrary"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="Ctrl+F">
+      </key>
+   </extension>
+   
+   <extension
+         point="org.eclipse.ui.contexts">
+      <context
+            description="Diagramming Editor Context"
+            id="org.simantics.modeling.ui.diagramming"
+            name="In Diagram Editor"
+            parentId="org.eclipse.ui.contexts.window">
+      </context>
+      <context
+            description="An inline editor within a diagram is active"
+            id="org.simantics.modeling.ui.diagramming.inlineEdit"
+            name="Inline Editor Active"
+            parentId="org.eclipse.ui.contexts.window">
+      </context>
+      <context
+            description="Symbol Library Context"
+            id="org.simantics.diagram.symbolLibrary"
+            name="In Symbol Library"
+            parentId="org.eclipse.ui.contexts.window">
+      </context>
+   </extension>
+   
+   <extension
+         point="org.eclipse.core.expressions.propertyTesters">
+      <propertyTester
+            class="org.simantics.diagram.flag.FlagPropertyTester"
+            id="org.simantics.diagram.flagPropertyTester"
+            namespace="org.simantics.diagram.flag"
+            properties="connected,locallyConnected,external,merged"
+            type="java.lang.Object">
+      </propertyTester>
+      <propertyTester
+            class="org.simantics.diagram.elements.ElementPropertyTester"
+            id="org.simantics.diagram.elementPropertyTester"
+            namespace="org.simantics.diagram.element"
+            properties="mapped"
+            type="java.lang.Object">
+      </propertyTester>
+      <propertyTester
+            class="org.simantics.diagram.ui.ToolPropertyTester"
+            id="org.simantics.diagram.toolPropertyTester"
+            namespace="org.simantics.diagram.tool"
+            properties="mode"
+            type="org.eclipse.ui.IEditorPart">
+      </propertyTester>
+   </extension>
+
+   <extension
+         point="org.simantics.scl.reflection.binding">
+      <namespace
+            path="http://www.simantics.org/Diagram-0.0/Functions">
+         <externalClass className="org.simantics.diagram.content.ElementContext"/>
+         <externalClass className="org.simantics.db.Resource"/>
+         <externalClass className="org.simantics.db.ReadGraph"/>
+         <externalClass className="org.simantics.db.layer0.variable.Variable"/>
+         <class
+               className="org.simantics.diagram.function.All">
+         </class>
+      </namespace>
+   </extension>
+   <extension
+         point="org.simantics.export.core.export">
+         
+      <content_type
+            icon="platform:/plugin/com.famfamfam.silk/companion/shape_3d.png"
+            id="componentType"
+            label="User Component"
+            plural="User Components"
+            model="false">
+      </content_type>
+      <content_type
+            contentTypeAction="org.simantics.diagram.export.DiagramContentTypeAction"
+            icon="platform:/plugin/org.simantics.diagram/icons/Generic_Diagram.png"
+            id="diagram"
+            label="Diagram"
+            model="false"
+            plural="Diagrams">
+      </content_type>
+      <content_type
+            icon="platform:/plugin/com.famfamfam.silk/icons/layout.png"
+            id="diagramTemplate"
+            label="Diagram Template"
+            plural="Diagram Templates"
+            model="false">
+      </content_type>
+      <content_type
+            icon="platform:/plugin/org.simantics.diagram/icons/Typical_Diagram.png"
+            id="typical"
+            label="Typical Template"
+            plural="Typical Templates"
+            model="false">
+      </content_type>
+
+      <discoverer
+            content_type_id="diagram"
+            discoverAction="org.simantics.diagram.export.DiscoverDiagrams">
+      </discoverer>
+
+	  <exporter
+         content_type_id="diagram"
+         exportAction="org.simantics.diagram.export.ExportDiagramPdf"
+         exportPriority="5"
+         formatId="pdf">
+      </exporter>    
+         
+   </extension>
+
+</plugin>