Improve Office E4

diff --git a/org.argeo.suite.e4/build.properties b/org.argeo.suite.e4/build.properties
index e9765d7915e837056d08e080d0132d1b0224320a..8795cd4eb7dcea2607e9a4c4c422f0f915c29afb 100644 (file)
--- a/org.argeo.suite.e4/build.properties
+++ b/org.argeo.suite.e4/build.properties
@@ -2,5 +2,6 @@ output.. = bin/
 bin.includes = META-INF/,\
                .,\
                OSGI-INF/,\
-               e4xmi/
+               e4xmi/,\
+               plugin.xml
 source.. = src/

diff --git a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi
index c2338f7952323f8b4e6d9bdf6092db011fbfabfc..6fdf51e2c8088086bbbb3d60464b8a79a3ba55c8 100644 (file)
--- a/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi
+++ b/org.argeo.suite.e4/e4xmi/argeo-office.e4xmi
@@ -25,6 +25,8 @@
         <children xsi:type="menu:HandledToolItem" xmi:id="_W4V9UDDhEeiUfOa4rxEKwQ" elementId="org.argeo.suite.e4.handledtoolitem.saveall" label="Save All" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/actions/save-all.png" enabled="false" command="_5EpEADDgEeiUfOa4rxEKwQ"/>
         <children xsi:type="menu:HandledToolItem" xmi:id="_bV4tYDDmEeiUfOa4rxEKwQ" elementId="org.argeo.suite.e4.handledtoolitem.closeall" label="Close All" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/actions/close-all.png" command="_VdldQDDmEeiUfOa4rxEKwQ"/>
         <children xsi:type="menu:ToolBarSeparator" xmi:id="_Bn7o0DDjEeiUfOa4rxEKwQ" elementId="org.argeo.suite.e4.toolbarseparator.0"/>
+      </children>
+      <children xsi:type="menu:ToolBar" xmi:id="_k0mYYD28EeiR-OuUuIB1Aw" elementId="org.argeo.suite.e4.toolbar.newEntity">
         <children xsi:type="menu:HandledToolItem" xmi:id="_4Ssr8DArEei3AbO1ldMI0w" elementId="org.argeo.suite.e4.handledtoolitem.createTask" label="New Task" iconURI="platform:/plugin/org.argeo.theme.argeo2/icons/types/todo.png" command="_2Xkt8DApEei3AbO1ldMI0w">
           <parameters xmi:id="_NYpK8DAsEei3AbO1ldMI0w" elementId="targetNodeType" name="targetNodeType" value="activities:task"/>
         </children>
@@ -47,9 +49,9 @@
     </trimBars>
   </children>
   <handlers xmi:id="_ipB00DArEei3AbO1ldMI0w" elementId="org.argeo.suite.e4.handler.0" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.connect.e4.handlers.CreateEntity" command="_2Xkt8DApEei3AbO1ldMI0w"/>
-  <handlers xmi:id="_9gu00DDgEeiUfOa4rxEKwQ" elementId="org.argeo.suite.e4.handler.1" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.connect.e4.handlers.SavePart" command="_1lO94DDgEeiUfOa4rxEKwQ"/>
-  <handlers xmi:id="_ADDAkDDhEeiUfOa4rxEKwQ" elementId="org.argeo.suite.e4.handler.2" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.connect.e4.handlers.SaveAllParts" command="_5EpEADDgEeiUfOa4rxEKwQ"/>
-  <handlers xmi:id="_ZBWe8DDmEeiUfOa4rxEKwQ" elementId="org.argeo.suite.e4.handler.3" contributionURI="bundleclass://org.argeo.connect.e4/org.argeo.connect.e4.handlers.CloseAllParts" command="_VdldQDDmEeiUfOa4rxEKwQ"/>
+  <handlers xmi:id="_9gu00DDgEeiUfOa4rxEKwQ" elementId="org.argeo.suite.e4.handler.1" contributionURI="bundleclass://org.argeo.cms.e4/org.argeo.cms.e4.handlers.SavePart" command="_1lO94DDgEeiUfOa4rxEKwQ"/>
+  <handlers xmi:id="_ADDAkDDhEeiUfOa4rxEKwQ" elementId="org.argeo.suite.e4.handler.2" contributionURI="bundleclass://org.argeo.cms.e4/org.argeo.cms.e4.handlers.SaveAllParts" command="_5EpEADDgEeiUfOa4rxEKwQ"/>
+  <handlers xmi:id="_ZBWe8DDmEeiUfOa4rxEKwQ" elementId="org.argeo.suite.e4.handler.3" contributionURI="bundleclass://org.argeo.cms.e4/org.argeo.cms.e4.handlers.CloseAllParts" command="_VdldQDDmEeiUfOa4rxEKwQ"/>
   <bindingTables xmi:id="_gxEm4DDqEeiUfOa4rxEKwQ" elementId="org.argeo.suite.e4.bindingtable.0" bindingContext="_Byl7gDD1EeiUfOa4rxEKwQ">
     <bindings xmi:id="_hj9cYDDqEeiUfOa4rxEKwQ" elementId="org.argeo.suite.e4.keybinding.0" keySequence="CTRL+S" command="_1lO94DDgEeiUfOa4rxEKwQ"/>
     <bindings xmi:id="_pEAGYDDqEeiUfOa4rxEKwQ" elementId="org.argeo.suite.e4.keybinding.1" keySequence="SHIFT+CTRL+S" command="_5EpEADDgEeiUfOa4rxEKwQ"/>

diff --git a/org.argeo.suite.e4/plugin.xml b/org.argeo.suite.e4/plugin.xml
new file mode 100644 (file)
index 0000000..1b8789e
--- /dev/null
+++ b/org.argeo.suite.e4/plugin.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+   <extension
+         point="org.eclipse.core.expressions.definitions">
+      <definition
+            id="org.argeo.suite.e4.featureActive">
+     <with variable="org.eclipse.ui.selection">
+        <iterate ifEmpty="true" operator="or">
+          <instanceof value="javax.jcr.Node">
+          </instanceof>
+        </iterate>
+      </with>
+      </definition>
+   </extension>
+
+</plugin>

diff --git a/org.argeo.suite.e4/src/org/argeo/suite/e4/ActiveFeature.java b/org.argeo.suite.e4/src/org/argeo/suite/e4/ActiveFeature.java
new file mode 100644 (file)
index 0000000..24a17b0
--- /dev/null
+++ b/org.argeo.suite.e4/src/org/argeo/suite/e4/ActiveFeature.java
@@ -0,0 +1,17 @@
+
+package org.argeo.suite.e4;
+
+import org.eclipse.e4.core.di.annotations.Evaluate;
+
+public class ActiveFeature {
+       
+       
+       public ActiveFeature() {
+               super();
+       }
+
+       @Evaluate
+       public boolean evaluate() {
+               return false;
+       }
+}