From 4c1873fcdb948bfef4e7a298e1e8d4d718f710bc Mon Sep 17 00:00:00 2001 From: Reino Ruusu Date: Fri, 6 Mar 2020 17:16:42 +0200 Subject: [PATCH] Move global UI bindings to the product plugin gitlab #101 Change-Id: I83c0e42c400579cd3709b78146a5b07cdeac82d1 --- .../graph/plant3d_viewpoint.pgraph | 2 +- org.simantics.plant3d.product/.gitignore | 1 + org.simantics.plant3d.product/.project | 6 ++++++ .../META-INF/MANIFEST.MF | 6 +++++- org.simantics.plant3d.product/build.properties | 3 ++- .../graph/plant3d_product.pgraph | 5 +++++ org.simantics.plant3d.product/plugin.xml | 16 +++++++++++++--- org.simantics.plant3d/plugin.xml | 10 ---------- 8 files changed, 33 insertions(+), 16 deletions(-) create mode 100644 org.simantics.plant3d.product/graph/plant3d_product.pgraph diff --git a/org.simantics.plant3d.ontology/graph/plant3d_viewpoint.pgraph b/org.simantics.plant3d.ontology/graph/plant3d_viewpoint.pgraph index 5be0264c..e898991d 100644 --- a/org.simantics.plant3d.ontology/graph/plant3d_viewpoint.pgraph +++ b/org.simantics.plant3d.ontology/graph/plant3d_viewpoint.pgraph @@ -40,7 +40,7 @@ IMAGES.Tank : IMAGE.PngImage @L0.loadBytes "images/tank.png" MAC = P3D.P3DActionContext : VP.BrowseContext - VP.BrowseContext.IsIncludedIn PROJ.ProjectActionContext + // VP.BrowseContext.IsIncludedIn PROJ.ProjectActionContext - This is added in the product plugin @VP.actionContribution "Plant" L0.Library IMAGES.Factory VP.NewActionCategory P3D.Actions.NewPlant diff --git a/org.simantics.plant3d.product/.gitignore b/org.simantics.plant3d.product/.gitignore index ae3c1726..e696a218 100644 --- a/org.simantics.plant3d.product/.gitignore +++ b/org.simantics.plant3d.product/.gitignore @@ -1 +1,2 @@ /bin/ +/graph.tg diff --git a/org.simantics.plant3d.product/.project b/org.simantics.plant3d.product/.project index 6ef52379..f9bddb1b 100644 --- a/org.simantics.plant3d.product/.project +++ b/org.simantics.plant3d.product/.project @@ -5,6 +5,11 @@ + + org.simantics.graph.builder + + + org.eclipse.pde.ManifestBuilder @@ -18,5 +23,6 @@ org.eclipse.pde.PluginNature + org.simantics.graph.nature diff --git a/org.simantics.plant3d.product/META-INF/MANIFEST.MF b/org.simantics.plant3d.product/META-INF/MANIFEST.MF index b8e15b91..18b269a2 100644 --- a/org.simantics.plant3d.product/META-INF/MANIFEST.MF +++ b/org.simantics.plant3d.product/META-INF/MANIFEST.MF @@ -6,6 +6,10 @@ Bundle-Version: 1.0.0.qualifier Require-Bundle: org.eclipse.core.runtime, org.eclipse.ui;bundle-version="3.7.0", org.simantics.plant3d;bundle-version="1.0.0", - org.simantics.project;bundle-version="1.0.1" + org.simantics.project;bundle-version="1.0.1", + org.simantics.project.ontology;bundle-version="1.2.0", + org.simantics.viewpoint.ontology;bundle-version="1.2.0", + org.simantics.plant3d.ontology;bundle-version="1.0.0", + org.simantics.layer0;bundle-version="1.1.0" Bundle-ActivationPolicy: lazy Bundle-Vendor: VTT diff --git a/org.simantics.plant3d.product/build.properties b/org.simantics.plant3d.product/build.properties index 122283d1..33770595 100644 --- a/org.simantics.plant3d.product/build.properties +++ b/org.simantics.plant3d.product/build.properties @@ -1,4 +1,5 @@ bin.includes = META-INF/,\ .,\ plugin.xml,\ - splash.bmp + splash.bmp,\ + graph.tg diff --git a/org.simantics.plant3d.product/graph/plant3d_product.pgraph b/org.simantics.plant3d.product/graph/plant3d_product.pgraph new file mode 100644 index 00000000..9bbc98db --- /dev/null +++ b/org.simantics.plant3d.product/graph/plant3d_product.pgraph @@ -0,0 +1,5 @@ +VP = +PROJ = +P3D = + +P3D.P3DActionContext VP.BrowseContext.IsIncludedIn PROJ.ProjectActionContext diff --git a/org.simantics.plant3d.product/plugin.xml b/org.simantics.plant3d.product/plugin.xml index 490a25e1..cde18bec 100644 --- a/org.simantics.plant3d.product/plugin.xml +++ b/org.simantics.plant3d.product/plugin.xml @@ -17,7 +17,17 @@ - + + + + @@ -45,7 +55,7 @@ point="org.eclipse.ui.perspectives"> diff --git a/org.simantics.plant3d/plugin.xml b/org.simantics.plant3d/plugin.xml index 7d6b9042..8fb207a6 100644 --- a/org.simantics.plant3d/plugin.xml +++ b/org.simantics.plant3d/plugin.xml @@ -12,16 +12,6 @@ name="Plant3D Editor"> - - - -