X-Git-Url: https://gerrit.simantics.org/r/gitweb?p=simantics%2Fplatform.git;a=blobdiff_plain;f=bundles%2Forg.simantics.modeling.ui%2Fplugin.xml;h=039fed00abfe428941bbec2434e2aad109b1e487;hp=41bf9eccc5170e1ee55b1653c4c7dab4e1d2ea30;hb=8ded56d0a440f78cbf649b1e59b8a464e8650fdc;hpb=e36d0cb0313ea18c76479e8dbfaf8499fa52db98

diff --git a/bundles/org.simantics.modeling.ui/plugin.xml b/bundles/org.simantics.modeling.ui/plugin.xml
index 41bf9eccc..039fed00a 100644
--- a/bundles/org.simantics.modeling.ui/plugin.xml
+++ b/bundles/org.simantics.modeling.ui/plugin.xml
@@ -750,9 +750,20 @@
          <activeWhen>
             <with
                   variable="activeContexts">
+            <and>
                <test
                      property="org.simantics.ui.tester.canUndo">
                </test>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <not>
+                     <equals
+                           value="org.simantics.modeling.ui.diagramming.inlineEdit">
+                     </equals>
+                  </not>
+               </iterate>
+            </and>
             </with>
          </activeWhen>
       </handler>
@@ -762,9 +773,20 @@
          <activeWhen>
             <with
                   variable="activeContexts">
+            <and>
                <test
                      property="org.simantics.ui.tester.canRedo">
                </test>
+               <iterate
+                     ifEmpty="false"
+                     operator="and">
+                  <not>
+                     <equals
+                           value="org.simantics.modeling.ui.diagramming.inlineEdit">
+                     </equals>
+                  </not>
+               </iterate>
+            </and>
             </with>
          </activeWhen>
       </handler>
@@ -1288,6 +1310,10 @@
                class="org.simantics.diagram.handler.ConnectionRoutingMenuContribution"
                id="connectionRouting">
          </dynamic>
+         <dynamic
+               class="org.simantics.modeling.ui.actions.SwitchComponentTypeContribution"
+               id="org.simantics.modeling.ui.switchComponentType">
+         </dynamic>
       </menuContribution>
       <menuContribution
             locationURI="toolbar:org.simantics.browsing.ui.graph.propertyView">
@@ -1545,6 +1571,14 @@
                id="org.simantics.modeling.ui.context">
          </inContext>-->
       </adapterClass>
+      <adapterClass
+            groupId="org.simantics.diagramEditor.group"
+            priority="50"
+            class="org.simantics.modeling.ui.diagramEditor.OpenDiagramFromComponentAdapter">
+         <!--<inContext
+               id="org.simantics.modeling.ui.context">
+         </inContext>-->
+      </adapterClass>
       <adapterClass
             priority="150"
             class="org.simantics.modeling.ui.diagramEditor.OpenSheetAdapter">