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=c6596a7b0c73749a619ce2baa827bc621576778f;hb=8ded56d0a440f78cbf649b1e59b8a464e8650fdc;hpb=489dcdf697f8752924199aca84d111e5d011d656

diff --git a/bundles/org.simantics.modeling.ui/plugin.xml b/bundles/org.simantics.modeling.ui/plugin.xml
index c6596a7b0..039fed00a 100644
--- a/bundles/org.simantics.modeling.ui/plugin.xml
+++ b/bundles/org.simantics.modeling.ui/plugin.xml
@@ -40,6 +40,14 @@
    </extension>
    <extension
          point="org.eclipse.ui.views">
+      <view
+            allowMultiple="false"
+            category="org.simantics.scl.ui.category"
+            class="org.simantics.modeling.ui.scl.expressions.SCLExpressionView"
+            id="org.simantics.modeling.ui.scl.expressionsView"
+            name="Used SCL Expressions"
+            restorable="true">
+      </view>
       <view
             name="Diagram Tools"
             icon="platform:/plugin/com.famfamfam.silk/icons/wrench.png"
@@ -138,6 +146,20 @@
             class="org.simantics.modeling.ui.componentTypeEditor.ComponentTypeScriptEditor"
             id="org.simantics.modeling.ui.componentTypeScriptEditor">
       </editor>
+      <editor
+            class="org.simantics.modeling.ui.scl.scriptEditor.SCLScriptEditor"
+            default="false"
+            icon="platform:/plugin/com.famfamfam.silk/icons/script_go.png"
+            id="org.simantics.modeling.ui.scl.scriptEditor"
+            name="SCL Script Editor">
+      </editor>
+   </extension>
+   <extension
+         point="org.eclipse.ui.elementFactories">
+      <factory
+            class="org.simantics.modeling.ui.scl.scriptEditor.SCLScriptEditorInputFactory"
+            id="org.simantics.modeling.ui.scl.scriptEditor.inputFactory">
+      </factory>
    </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
@@ -176,6 +198,15 @@
             </equals>
          </with>
       </definition>
+      <definition
+            id="org.simantics.modeling.ui.inSCLScriptEditor">
+         <with
+               variable="activePartId">
+            <equals
+                  value="org.simantics.modeling.ui.scl.scriptEditor">
+            </equals>
+         </with>
+      </definition>
    </extension>
    <extension
          point="org.eclipse.ui.commands">
@@ -369,6 +400,11 @@
             categoryId="org.simantics.modeling.ui.category"
             id="org.simantics.modeling.typical.sync.toggleRealtime">
       </command>
+      <command
+            name="Run SCL Script"
+            categoryId="org.simantics.modeling.ui.category"
+            id="org.simantics.modeling.ui.scl.scriptEditor.run">
+      </command>
    </extension>
    <extension
          point="org.eclipse.core.expressions.definitions">
@@ -714,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>
@@ -726,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>
@@ -954,6 +1012,15 @@
             commandId="org.simantics.modeling.typical.sync.toggleRealtime"
             class="org.simantics.modeling.ui.typicals.ToggleTypicalRealtimeSync">
       </handler>
+      <handler
+            commandId="org.simantics.modeling.ui.scl.scriptEditor.run"
+            class="org.simantics.modeling.ui.scl.scriptEditor.RunSCLScriptHandler">
+         <enabledWhen>
+            <reference
+                  definitionId="org.simantics.modeling.ui.inSCLScriptEditor">
+            </reference>
+         </enabledWhen>
+      </handler>
    </extension>
    <extension
          point="org.eclipse.ui.bindings">
@@ -993,6 +1060,12 @@
             schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
             sequence="F1">
       </key>
+      <key
+            commandId="org.simantics.modeling.ui.scl.scriptEditor.run"
+            contextId="org.simantics.modeling.ui.scl.scriptEditor.context"
+            schemeId="org.eclipse.ui.defaultAcceleratorConfiguration"
+            sequence="Ctrl+R">
+      </key>
    </extension>
    <extension
          point="org.eclipse.ui.menus">
@@ -1237,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">
@@ -1431,6 +1508,17 @@
                id="org.simantics.modeling.ui.elementtoolbar">
          </toolbar>
       </menuContribution>-->
+      <menuContribution
+            allPopups="false"
+            locationURI="popup:org.simantics.modeling.ui.scl.scriptEditor.EditorContext?after=additions">
+         <command
+               commandId="org.simantics.modeling.ui.scl.scriptEditor.run"
+               label="Run Script"
+               icon="platform:/plugin/com.famfamfam.silk/companion/script_start.png"
+               style="push"
+               tooltip="Run the Current Contents of This SCL Script">
+         </command>
+      </menuContribution>
    </extension>
    <extension
          point="org.eclipse.ui.contexts">
@@ -1454,6 +1542,11 @@
             id="org.simantics.ui.undoContext"
             parentId="org.eclipse.ui.contexts.window">
       </context>
+      <context
+            name="In SCL Script Editor"
+            id="org.simantics.modeling.ui.scl.scriptEditor.context"
+            parentId="org.eclipse.ui.contexts.window">
+      </context>
    </extension>
    <extension
          point="org.simantics.ui.perspectiveContextBinding">
@@ -1478,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">
@@ -1551,6 +1652,11 @@
             id="org.simantics.modeling.ui.sclModuleEditor2"
             priority="10">
       </adapterClass>
+      <adapterClass
+            class="org.simantics.modeling.ui.scl.scriptEditor.SCLScriptEditorAdapter"
+            id="org.simantics.modeling.ui.scl.scriptEditor.adapter"
+            priority="20">
+      </adapterClass>
    </extension>
    <extension
          point="org.eclipse.core.runtime.preferences">
@@ -1645,7 +1751,7 @@
          point="org.simantics.ui.doubleClick">
       <doubleClickAction
             name="Expand Browser Node"
-            priority="0.5"
+            priority="-1"
             class="org.simantics.modeling.ui.ExpandNodeHandler">
       </doubleClickAction>
    </extension>