From b65dafb5319144047b5fae1509a0f5aa094e1c2f Mon Sep 17 00:00:00 2001
From: Marko Luukkainen <marko.luukkainen@semantum.fi>
Date: Tue, 22 Oct 2019 16:07:31 +0300
Subject: [PATCH] Use simantics.toolbar with Plant3D

gitlab #38


Change-Id: Ib361bdc47ec9680dc4e6d8b264dad32a514f42f3
---
 org.simantics.g3d/plugin.xml     | 156 +++++++++++++++----------------
 org.simantics.plant3d/plugin.xml | 155 +++++++++++++++++-------------
 2 files changed, 166 insertions(+), 145 deletions(-)

diff --git a/org.simantics.g3d/plugin.xml b/org.simantics.g3d/plugin.xml
index d423d3fb..588b8fbe 100644
--- a/org.simantics.g3d/plugin.xml
+++ b/org.simantics.g3d/plugin.xml
@@ -1,79 +1,79 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
<!--
-    Copyright (c) 2012, 2013 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.4"?>
<!--
+    Copyright (c) 2012, 2013 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 id="toolbarCommand" name="toolbarCommand" schema="schema/toolbarCommand.exsd"/>
-   <extension
-         point="org.eclipse.ui.views">
-      <view
-            allowMultiple="false"
-            category="org.simantics.debug.ui"
-            class="org.simantics.g3d.ui.SceneGraphDebugger"
-            icon="platform:/plugin/com.famfamfam.silk/icons/car.png"
-            id="org.simantics.g3d.debug"
-            name="Scene-graph Debugger"
-            restorable="true">
-      </view>
-   </extension>
-   <extension
-         point="org.eclipse.ui.preferencePages">
-      <page
-            class="org.simantics.g3d.preferences.G3DPreferencePage"
-            id="org.simantics.g3d.preferences.G3DPreferencePage"
-            name="3D Modelling Preferences">
-      </page>
-   </extension>
-   <extension
-         point="org.eclipse.core.runtime.preferences">
-      <initializer
-            class="org.simantics.g3d.preferences.PreferenceInitializer">
-      </initializer>
-   </extension>
-   <extension
-         point="org.eclipse.ui.commands">
-      <category
-            id="org.simantics.g3d.category"
-            name="3D Modelling Commands">
-      </category>
-      <command
-            categoryId="org.simantics.g3d.category"
-            id="org.simantics.g3d.parallelperspective"
-            name="Parallel perspective">
-         <state
-               id="org.eclipse.ui.commands.toggleState">
-            <class
-                  class="org.eclipse.ui.handlers.RegistryToggleState">
-               <parameter
-                     name="persisted"
-                     value="false">
-               </parameter>
-               <parameter
-                     name="default"
-                     value="false">
-               </parameter>
-            </class>
-         </state>
-      </command>
-      <command
-            categoryId="org.simantics.g3d.category"
-            id="org.simantics.g3d.viewdir"
-            name="View Dir">
-         <commandParameter
-               id="org.simantics.g3d.viewDirection"
-               name="direction"
-               optional="true">
-         </commandParameter>
-      </command>
-   </extension>
-
-</plugin>
+<plugin>
+   <extension-point id="toolbarCommand" name="toolbarCommand" schema="schema/toolbarCommand.exsd"/>
+   <extension
+         point="org.eclipse.ui.views">
+      <view
+            allowMultiple="false"
+            category="org.simantics.debug.ui"
+            class="org.simantics.g3d.ui.SceneGraphDebugger"
+            icon="platform:/plugin/com.famfamfam.silk/icons/car.png"
+            id="org.simantics.g3d.debug"
+            name="Scene-graph Debugger"
+            restorable="true">
+      </view>
+   </extension>
+   <extension
+         point="org.eclipse.ui.preferencePages">
+      <page
+            class="org.simantics.g3d.preferences.G3DPreferencePage"
+            id="org.simantics.g3d.preferences.G3DPreferencePage"
+            name="3D Modelling Preferences">
+      </page>
+   </extension>
+   <extension
+         point="org.eclipse.core.runtime.preferences">
+      <initializer
+            class="org.simantics.g3d.preferences.PreferenceInitializer">
+      </initializer>
+   </extension>
+   <extension
+         point="org.eclipse.ui.commands">
+      <category
+            id="org.simantics.g3d.category"
+            name="3D Modelling Commands">
+      </category>
+      <command
+            categoryId="org.simantics.g3d.category"
+            id="org.simantics.g3d.parallelperspective"
+            name="Parallel perspective">
+         <state
+               id="org.eclipse.ui.commands.toggleState">
+            <class
+                  class="org.eclipse.ui.handlers.RegistryToggleState">
+               <parameter
+                     name="persisted"
+                     value="false">
+               </parameter>
+               <parameter
+                     name="default"
+                     value="false">
+               </parameter>
+            </class>
+         </state>
+      </command>
+      <command
+            categoryId="org.simantics.g3d.category"
+            id="org.simantics.g3d.viewdir"
+            name="View Direction">
+         <commandParameter
+               id="org.simantics.g3d.viewDirection"
+               name="direction"
+               optional="true">
+         </commandParameter>
+      </command>
+   </extension>
+
+</plugin>
diff --git a/org.simantics.plant3d/plugin.xml b/org.simantics.plant3d/plugin.xml
index fe2eb710..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"
@@ -27,77 +28,21 @@
             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>
@@ -173,4 +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>
-- 
2.45.2