X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.plant3d%2Fplugin.xml;h=75426d136edc6700df7e7f21f066e3d5614e9893;hb=31fd8b586a816e12d85f361b3fe2f6ebd52e427b;hp=29f03e32f7d392644b72b7378416454831c33e71;hpb=6308b57b2793abbd92da9e004f9f7c068f18eba6;p=simantics%2F3d.git

diff --git a/org.simantics.plant3d/plugin.xml b/org.simantics.plant3d/plugin.xml
index 29f03e32..75426d13 100644
--- a/org.simantics.plant3d/plugin.xml
+++ b/org.simantics.plant3d/plugin.xml
@@ -5,6 +5,7 @@
          point="org.eclipse.ui.editors">
       <editor
             class="org.simantics.plant3d.editor.Plant3DEditor"
+            contributorClass="org.simantics.ui.toolbar.ToolbarContributor:toolbar=org.simantics.plant3d.toolbar;hide=true"
             default="false"
             icon="icons/factory.png"
             id="org.simantics.plant3d.editor"
@@ -21,159 +22,27 @@
             type_uris="http://www.simantics.org/Plant3D-0.1/Plant">
       </adapter>
    </extension>
-   <extension
-         point="org.eclipse.ui.perspectives">
-      <perspective
-            class="org.simantics.plant3d.project.P3DPerspectiveFactory"
-            icon="icons/factory.png"
-            id="org.simantics.plant3d.perspective"
-            name="Plant3D">
-      </perspective>
-   </extension>
-   <extension
-         point="org.eclipse.ui.perspectiveExtensions">
-      <perspectiveExtension
-            targetID="org.simantics.plant3d.perspective">
-         <view
-               id="org.simantics.plant3d.ModelBrowser"
-               minimized="false"
-               ratio="0.3"
-               relationship="left"
-               relative="org.eclipse.ui.editorss">
-         </view>
-         <view
-               id="org.simantics.browsing.ui.graph.propertyView"
-               minimized="false"
-               ratio="0.7"
-               relationship="bottom"
-               relative="org.eclipse.ui.editorss"
-               visible="true">
-         </view>
-         <view
-               id="org.simantics.browsing.ui.graph.propertyView:*"
-               minimized="false"
-               relationship="stack"
-               relative="org.simantics.browsing.ui.graph.propertyView"
-               visible="false">
-         </view>
-         <view
-               id="org.simantics.browsing.ui.graph.propertyViewPinned:*"
-               minimized="false"
-               relationship="stack"
-               relative="org.simantics.browsing.ui.graph.propertyView"
-               visible="false">
-         </view>
-         <view
-               id="org.eclipse.ui.views.ContentOutline"
-               minimized="false"
-               ratio="0.8"
-               relationship="right"
-               relative="org.eclipse.ui.editorss"
-               visible="true">
-         </view>
-      </perspectiveExtension>
-   </extension>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            class="org.simantics.plant3d.browser.P3DBrowser:browseContext=http://www.simantics.org/CSG-0.1/CSGBrowseContext;browseContext=http://www.simantics.org/Plant3D-0.1/P3DBrowseContext"
-            icon="icons/factory.png"
-            id="org.simantics.plant3d.ModelBrowser"
-            name="Model Browser"
-            restorable="true">
-      </view>
-   </extension>
    <extension
          point="org.eclipse.ui.menus">
-      <menuContribution
-            allPopups="false"
-            locationURI="menu:#FileNewMenu">
-         <command
-               commandId="org.simantics.plant3d.newPlant"
-               label="New Plant"
-               style="push">
-         </command>
-         <command
-               commandId="org.simantics.plant3d.newCSGModel"
-               label="New CSG Model"
-               style="push">
-         </command>
-      </menuContribution>
       <menuContribution
             allPopups="false"
             locationURI="toolbar:org.eclipse.ui.main.toolbar">
          <toolbar
-               id="org.simantics.plant3d.toolbar">
+               id="org.simantics.plant3d.toolbar"
+               label="Plant 3D Toolbar">
             <separator
                   name="view"
                   visible="true">
             </separator>
-            <command
-                  commandId="org.simantics.g3d.parallelperspective"
-                  icon="platform:/plugin/com.famfamfam.silk/icons/image.png"
-                  label="Parallel perspective"
-                  style="toggle">
-            </command>
-            <command
-                  commandId="org.simantics.g3d.viewdir"
-                  icon="icons/x-axis.png"
-                  label="View X+"
-                  style="push">
-               <parameter
-                     name="org.simantics.g3d.viewDirection"
-                     value="1,0,0">
-               </parameter>
-            </command>
-            <command
-                  commandId="org.simantics.g3d.viewdir"
-                  icon="icons/x-axis.png"
-                  label="View X-"
-                  style="push">
-               <parameter
-                     name="org.simantics.g3d.viewDirection"
-                     value="-1,0,0">
-               </parameter>
-            </command>
-            <command
-                  commandId="org.simantics.g3d.viewdir"
-                  icon="icons/y-axis.png"
-                  label="View Y+"
-                  style="push">
-               <parameter
-                     name="org.simantics.g3d.viewDirection"
-                     value="0,1,0">
-               </parameter>
-            </command>
-            <command
-                  commandId="org.simantics.g3d.viewdir"
-                  icon="icons/y-axis.png"
-                  label="View Y-"
-                  style="push">
-               <parameter
-                     name="org.simantics.g3d.viewDirection"
-                     value="0,-1,0">
-               </parameter>
-            </command>
-            <command
-                  commandId="org.simantics.g3d.viewdir"
-                  icon="icons/z-axis.png"
-                  label="View Z+"
-                  style="push">
-               <parameter
-                     name="org.simantics.g3d.viewDirection"
-                     value="0,0,1">
-               </parameter>
-            </command>
-            <command
-                  commandId="org.simantics.g3d.viewdir"
-                  icon="icons/z-axis.png"
-                  label="View Z-"
-                  style="push">
-               <parameter
-                     name="org.simantics.g3d.viewDirection"
-                     value="0,0,-1">
-               </parameter>
-            </command>
+            <visibleWhen
+                  checkEnabled="false">
+               <with
+                     variable="activeEditorId">
+                  <equals
+                        value="org.simantics.plant3d.editor">
+                  </equals>
+               </with>
+            </visibleWhen>
          </toolbar>
       </menuContribution>
    </extension>
@@ -233,19 +102,6 @@
             commandId="org.simantics.plant3d.newCSGModel">
       </handler>
    </extension>
-   <extension
-         point="org.simantics.project.feature">
-      <feature
-            class="org.simantics.plant3d.project.P3DProjectFeature"
-            id="org.simantics.plant3d.project.feature"
-            label="Plant3D Project"
-            published="true">
-         <installGroup
-               id="org.simantics.plant3d.installGroup"
-               version="[1.0.0,2.0.0)">
-         </installGroup>
-      </feature>
-   </extension>
    <extension
          point="org.eclipse.ui.contexts">
       <context
@@ -253,13 +109,6 @@
             name="Plant3D Context">
       </context>
    </extension>
-   <extension
-         point="org.simantics.ui.perspectiveContextBinding">
-      <binding
-            contextIds="org.simantics.plant3d.context"
-            perspectiveId="org.simantics.plant3d.perspective">
-      </binding>
-   </extension>
    <extension
          point="org.simantics.browsing.ui.common.selectionProcessorBinding">
       <binding
@@ -269,5 +118,80 @@
          </implementation>
       </binding>
    </extension>
-
+   <extension
+         point="org.simantics.ui.toolbarCommand">
+            <command
+            commandId="org.simantics.g3d.parallelperspective"
+            image="platform:/plugin/com.famfamfam.silk/icons/image.png"
+            name="Parallel perspective"
+            toolbarId="org.simantics.plant3d.toolbar"
+            type="toggle">
+      </command>
+      <command
+            commandId="org.simantics.g3d.viewdir"
+            image="platform:/plugin/org.simantics.plant3d/icons/x-axis.png"
+            name="View X+"
+            toolbarId="org.simantics.plant3d.toolbar"
+            type="push">
+         <parameter
+               name="org.simantics.g3d.viewDirection"
+               value="1,0,0">
+         </parameter>
+      </command>
+      <command
+            commandId="org.simantics.g3d.viewdir"
+            image="platform:/plugin/org.simantics.plant3d/icons/x-axis.png"
+            name="View X-"
+            toolbarId="org.simantics.plant3d.toolbar"
+            type="push">
+         <parameter
+               name="org.simantics.g3d.viewDirection"
+               value="-1,0,0">
+         </parameter>
+      </command>
+      <command
+            commandId="org.simantics.g3d.viewdir"
+            image="platform:/plugin/org.simantics.plant3d/icons/y-axis.png"
+            name="View Y+"
+            toolbarId="org.simantics.plant3d.toolbar"
+            type="push">
+         <parameter
+               name="org.simantics.g3d.viewDirection"
+               value="0,1,0">
+         </parameter>
+      </command>
+      <command
+            commandId="org.simantics.g3d.viewdir"
+            image="platform:/plugin/org.simantics.plant3d/icons/y-axis.png"
+            name="View Y-"
+            toolbarId="org.simantics.plant3d.toolbar"
+            type="push">
+         <parameter
+               name="org.simantics.g3d.viewDirection"
+               value="0,-1,0">
+         </parameter>
+      </command>
+      <command
+            commandId="org.simantics.g3d.viewdir"
+            image="platform:/plugin/org.simantics.plant3d/icons/z-axis.png"
+            name="View Z+"
+            toolbarId="org.simantics.plant3d.toolbar"
+            type="push">
+         <parameter
+               name="org.simantics.g3d.viewDirection"
+               value="0,0,1">
+         </parameter>
+      </command>
+      <command
+            commandId="org.simantics.g3d.viewdir"
+            image="platform:/plugin/org.simantics.plant3d/icons/z-axis.png"
+            name="View Z-"
+            toolbarId="org.simantics.plant3d.toolbar"
+            type="push">
+         <parameter
+               name="org.simantics.g3d.viewDirection"
+               value="0,0,-1">
+         </parameter>
+      </command>
+   </extension>
 </plugin>