From d60781ac6715796bfbf7c0029dd5c1158cf16ec9 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Fri, 1 Dec 2017 10:34:38 +0100
Subject: [PATCH] Improve single sourcing

---
 org.argeo.cms.ui.workbench.rap/plugin.xml |  2 ++
 org.argeo.cms.ui.workbench/plugin.xml     | 16 +++++++++++++++-
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/org.argeo.cms.ui.workbench.rap/plugin.xml b/org.argeo.cms.ui.workbench.rap/plugin.xml
index 880563bd3..ba37a18ab 100644
--- a/org.argeo.cms.ui.workbench.rap/plugin.xml
+++ b/org.argeo.cms.ui.workbench.rap/plugin.xml
@@ -60,6 +60,7 @@
 	<!-- MENUS --> 
 	<extension point="org.eclipse.ui.menus">
     	<!-- Main tool bar menu -->
+    	<!--
     	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
         	<toolbar id="org.argeo.cms.ui.workbench.rap.userToolbar">
 				<command
@@ -72,6 +73,7 @@
 				<command commandId="org.eclipse.ui.file.saveAll"/>
 			</toolbar>
 		</menuContribution>
+		-->
 		
 		<!-- User drop down default menu -->
 		<menuContribution locationURI="menu:org.argeo.cms.ui.workbench.rap.mainMenu">
diff --git a/org.argeo.cms.ui.workbench/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml
index c656c2ff9..8ca453256 100644
--- a/org.argeo.cms.ui.workbench/plugin.xml
+++ b/org.argeo.cms.ui.workbench/plugin.xml
@@ -339,8 +339,22 @@
 	<!-- MENU CONTRIBUTIONS -->
 	<extension
 		point="org.eclipse.ui.menus">
+    	<!-- Main tool bar menu -->
+    	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
+        	<toolbar id="org.argeo.cms.ui.workbench.userToolbar">
+				<command
+					commandId="org.argeo.cms.ui.workbench.rap.mainMenuCommand"
+					icon="icons/home.gif"
+					id="org.argeo.cms.ui.workbench.rap.mainMenu"
+					style="pulldown">
+				</command>
+				<command commandId="org.eclipse.ui.file.save"/>
+				<command commandId="org.eclipse.ui.file.saveAll"/>
+			</toolbar>
+		</menuContribution>
+		
 		<menuContribution
-			locationURI="toolbar:org.argeo.cms.ui.workbench.rap.userToolbar?after=org.eclipse.ui.file.saveAll"> 
+			locationURI="toolbar:org.argeo.cms.ui.workbench.userToolbar?after=org.eclipse.ui.file.saveAll"> 
 			<!-- Transaction management --> 
  			<command
 				commandId="org.argeo.cms.ui.workbench.userTransactionHandler"
-- 
2.30.2