Improve single sourcing

diff --git a/org.argeo.cms.ui.workbench.rap/plugin.xml b/org.argeo.cms.ui.workbench.rap/plugin.xml
index 880563bd3ebefd789d17cbb0f2c78ca0659dbcbd..ba37a18abece4461d0aff8ca4afc2278ffdafb8a 100644 (file)
--- 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 c656c2ff94bff0ba464e502f3416a39e882896b5..8ca4532561f4cf91cc58ab8d1e736c3433607657 100644 (file)
--- 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"