From 93b43d32879520639f6d89010fc2ac184995e9e7 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Tue, 19 Dec 2017 15:27:17 +0100
Subject: [PATCH] Improve base workbench UI

---
 org.argeo.cms.ui.workbench.rap/plugin.xml            | 12 ++++++++++++
 .../cms/ui/workbench/rap/commands/OpenHome.java      |  4 +++-
 org.argeo.cms.ui.workbench/plugin.xml                |  4 ++--
 3 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/org.argeo.cms.ui.workbench.rap/plugin.xml b/org.argeo.cms.ui.workbench.rap/plugin.xml
index 39770d3f6..3dfbf2dc1 100644
--- a/org.argeo.cms.ui.workbench.rap/plugin.xml
+++ b/org.argeo.cms.ui.workbench.rap/plugin.xml
@@ -74,6 +74,18 @@
 			</toolbar>
 		</menuContribution>
 		-->
+    	<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.png"
+					id="org.argeo.cms.ui.workbench.rap.mainMenu"
+					style="pulldown">
+				</command>
+				<command commandId="org.eclipse.ui.file.save" icon="icons/save.png"/>
+				<command commandId="org.eclipse.ui.file.saveAll" icon="icons/save-all.png"/>
+			</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.rap/src/org/argeo/cms/ui/workbench/rap/commands/OpenHome.java b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/commands/OpenHome.java
index a6744d213..86e01036d 100644
--- a/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/commands/OpenHome.java
+++ b/org.argeo.cms.ui.workbench.rap/src/org/argeo/cms/ui/workbench/rap/commands/OpenHome.java
@@ -35,8 +35,10 @@ public class OpenHome extends AbstractHandler {
 			CommandUtils.callCommand(defaultCmdId);
 		else {
 			try {
+				String defaultPerspective = HandlerUtil.getActiveWorkbenchWindow(event).getWorkbench()
+						.getPerspectiveRegistry().getDefaultPerspective();
 				HandlerUtil.getActiveSite(event).getWorkbenchWindow()
-						.openPage(UserHomePerspective.ID, null);
+						.openPage(defaultPerspective != null ? defaultPerspective : UserHomePerspective.ID, null);
 			} catch (WorkbenchException e) {
 				ErrorFeedback.show("Cannot open home perspective", e);
 			}
diff --git a/org.argeo.cms.ui.workbench/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml
index 32935842e..758a9e339 100644
--- a/org.argeo.cms.ui.workbench/plugin.xml
+++ b/org.argeo.cms.ui.workbench/plugin.xml
@@ -339,7 +339,7 @@
 	<!-- MENU CONTRIBUTIONS -->
 	<extension
 		point="org.eclipse.ui.menus">
-    	<!-- Main tool bar menu -->
+    	<!-- Main tool bar menu
     	<menuContribution locationURI="toolbar:org.eclipse.ui.main.toolbar">
         	<toolbar id="org.argeo.cms.ui.workbench.userToolbar">
 				<command
@@ -352,7 +352,7 @@
 				<command commandId="org.eclipse.ui.file.saveAll" icon="icons/save-all.png"/>
 			</toolbar>
 		</menuContribution>
-		
+		-->
 		<menuContribution
 			locationURI="toolbar:org.argeo.cms.ui.workbench.userToolbar?after=org.eclipse.ui.file.saveAll"> 
 			<!-- Transaction management --> 
-- 
2.30.2