First clean version of the security UI, also tested with RAP

[lgpl/argeo-commons.git] / security / eclipse / plugins / org.argeo.security.ui.application / src / main / java / org / argeo / security / ui / application / SecureActionBarAdvisor.java

diff --git a/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java
index 5d7c58e0c8479f23d8a4a21aa8cfc65b88731c48..e8bcf018fe54fc800b6ad478ca22c9decfa32df1 100644 (file)
--- a/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java
+++ b/security/eclipse/plugins/org.argeo.security.ui.application/src/main/java/org/argeo/security/ui/application/SecureActionBarAdvisor.java
@@ -1,9 +1,13 @@
 package org.argeo.security.ui.application;
 
 import org.eclipse.jface.action.GroupMarker;
+import org.eclipse.jface.action.ICoolBarManager;
 import org.eclipse.jface.action.IMenuManager;
+import org.eclipse.jface.action.IToolBarManager;
 import org.eclipse.jface.action.MenuManager;
 import org.eclipse.jface.action.Separator;
+import org.eclipse.jface.action.ToolBarManager;
+import org.eclipse.swt.SWT;
 import org.eclipse.ui.IWorkbenchActionConstants;
 import org.eclipse.ui.IWorkbenchWindow;
 import org.eclipse.ui.actions.ActionFactory;
@@ -15,17 +19,16 @@ public class SecureActionBarAdvisor extends ActionBarAdvisor {
        private IWorkbenchAction exitAction;
        private IWorkbenchAction openPerspectiveDialogAction;
        private IWorkbenchAction showViewMenuAction;
-       private IWorkbenchAction newWindowAction;
        private IWorkbenchAction preferences;
        private IWorkbenchAction helpContentAction;
-       private IWorkbenchAction changePassword;
-       // private IWorkbenchAction aboutAction;
+       private IWorkbenchAction saveAction;
+       private IWorkbenchAction saveAllAction;
 
-       private final Boolean isRcp;
+       // private final Boolean isRcp;
 
        public SecureActionBarAdvisor(IActionBarConfigurer configurer, Boolean isRcp) {
                super(configurer);
-               this.isRcp = isRcp;
+               // this.isRcp = isRcp;
        }
 
        protected void makeActions(IWorkbenchWindow window) {
@@ -41,13 +44,13 @@ public class SecureActionBarAdvisor extends ActionBarAdvisor {
 
                exitAction = ActionFactory.QUIT.create(window);
                register(exitAction);
-               if (isRcp) {
-                       // aboutAction = ActionFactory.ABOUT.create(window);
-                       // register(aboutAction);
-                       newWindowAction = ActionFactory.OPEN_NEW_WINDOW.create(window);
-                       register(newWindowAction);
-               }
-               
+
+               // Save semantiocs
+               saveAction = ActionFactory.SAVE.create(window);
+               register(saveAction);
+               saveAllAction = ActionFactory.SAVE_ALL.create(window);
+               register(saveAllAction);
+
        }
 
        protected void fillMenuBar(IMenuManager menuBar) {
@@ -68,10 +71,10 @@ public class SecureActionBarAdvisor extends ActionBarAdvisor {
                menuBar.add(helpMenu);
 
                // File
-               if (isRcp) {
-                       fileMenu.add(newWindowAction);
-                       fileMenu.add(new Separator());
-               }
+               fileMenu.add(saveAction);
+               fileMenu.add(saveAllAction);
+               fileMenu.add(new GroupMarker(IWorkbenchActionConstants.MB_ADDITIONS));
+               fileMenu.add(new Separator());
                fileMenu.add(exitAction);
 
                // Edit
@@ -86,4 +89,12 @@ public class SecureActionBarAdvisor extends ActionBarAdvisor {
                // helpMenu.add(aboutAction);
        }
 
+       @Override
+       protected void fillCoolBar(ICoolBarManager coolBar) {
+               IToolBarManager saveToolbar = new ToolBarManager(SWT.FLAT | SWT.RIGHT);
+               saveToolbar.add(saveAction);
+               saveToolbar.add(saveAllAction);
+               coolBar.add(saveToolbar);
+       }
+
 }