Improve branding

diff --git a/org.argeo.cms.ui.workbench.rap/icons/security.gif b/org.argeo.cms.ui.workbench.rap/icons/security.gif
new file mode 100644 (file)
index 0000000..57fb95e
Binary files /dev/null and b/org.argeo.cms.ui.workbench.rap/icons/security.gif differ

diff --git a/org.argeo.cms.ui.workbench.rap/plugin.xml b/org.argeo.cms.ui.workbench.rap/plugin.xml
index aee0ef87b2470249628eb53a51fc9a823a250e91..39770d3f62ac697288ca20261c509039685496b3 100644 (file)
--- a/org.argeo.cms.ui.workbench.rap/plugin.xml
+++ b/org.argeo.cms.ui.workbench.rap/plugin.xml
@@ -90,7 +90,7 @@
                                icon="icons/preferences.png"/> -->
                <command
                                commandId="org.argeo.cms.ui.workbench.rap.openChangePasswordDialog"
-                               icon="icons/password.gif"
+                               icon="icons/security.gif"
                                label="%changePassword"/>
                        <separator
                                name="org.argeo.cms.ui.workbench.rap.beforeFile"

diff --git a/org.argeo.cms.ui.workbench/icons/group.png b/org.argeo.cms.ui.workbench/icons/group.png
new file mode 100644 (file)
index 0000000..cc6683a
Binary files /dev/null and b/org.argeo.cms.ui.workbench/icons/group.png differ

diff --git a/org.argeo.cms.ui.workbench/icons/person-logged-in.png b/org.argeo.cms.ui.workbench/icons/person-logged-in.png
new file mode 100644 (file)
index 0000000..87acc14
Binary files /dev/null and b/org.argeo.cms.ui.workbench/icons/person-logged-in.png differ

diff --git a/org.argeo.cms.ui.workbench/icons/person.png b/org.argeo.cms.ui.workbench/icons/person.png
new file mode 100644 (file)
index 0000000..7d979a5
Binary files /dev/null and b/org.argeo.cms.ui.workbench/icons/person.png differ

diff --git a/org.argeo.cms.ui.workbench/plugin.xml b/org.argeo.cms.ui.workbench/plugin.xml
index 423be7aa3aa7ce64590016d38f2b36d2c73d4e6b..32935842ea84343c5741c91fa1c959c191eaee14 100644 (file)
--- a/org.argeo.cms.ui.workbench/plugin.xml
+++ b/org.argeo.cms.ui.workbench/plugin.xml
@@ -6,7 +6,7 @@
       <perspective
             id="org.argeo.cms.ui.workbench.adminSecurityPerspective"
             class="org.argeo.cms.ui.workbench.SecurityAdminPerspective"
-            icon="icons/security.gif"
+            icon="icons/group.png"
             name="Security">
       </perspective>
       <perspective
@@ -70,13 +70,13 @@
                <view
                        id="org.argeo.cms.ui.workbench.usersView"
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       icon="icons/users.gif"
+                       icon="icons/person.png"
                        name="Users"
                        restorable="true">
                </view>
                <view
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
-                       icon="icons/role.gif"
+                       icon="icons/group.png"
                        id="org.argeo.cms.ui.workbench.groupsView"
                        name="Groups"
                        restorable="false">
@@ -85,7 +85,7 @@
                <view
                        id="org.argeo.cms.ui.workbench.userProfile"
                        class="org.argeo.cms.ui.workbench.useradmin.UserProfile"
-                       icon="icons/user.gif"
+                       icon="icons/person-logged-in.png"
                        name="Profile"
                        restorable="true">
                </view>
@@ -152,14 +152,14 @@
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
             id="org.argeo.cms.ui.workbench.userEditor"
             name="User"
-            icon="icons/user.gif"
+            icon="icons/person.png"
             default="false">
                </editor>
                <editor
                        class="org.argeo.eclipse.spring.SpringExtensionFactory"
             id="org.argeo.cms.ui.workbench.groupEditor"
             name="User"
-            icon="icons/users.gif"
+            icon="icons/group.png"
             default="false">
                </editor>
                <!-- Data Explorer -->
@@ -390,19 +390,19 @@
             <command
                   commandId="org.argeo.cms.ui.workbench.deleteUsers"
                   icon="icons/delete.png"
-                  label="Delete User"
+                  label="Delete"
                   tooltip="Delete selected users">
             </command>
             <command
                   commandId="org.argeo.cms.ui.workbench.forceRefresh"
                   icon="icons/refresh.png"
-                  label="Refresh list"
+                  label="Refresh"
                   tooltip="Force the full refresh of the user list">
             </command>
             <command
                   commandId="org.argeo.cms.ui.workbench.newUser"
                   icon="icons/add.png"
-                  label="Add User"
+                  label="Add"
                   tooltip="Create a new user">
             </command>
             <command
@@ -418,7 +418,7 @@
             locationURI="toolbar:org.argeo.cms.ui.workbench.groupsView">
             <command
                   commandId="org.argeo.cms.ui.workbench.deleteGroups"
-                  icon="icons/remove.gif"
+                  icon="icons/delete.png"
                   label="Delete Group"
                   tooltip="Delete selected groups">
             </command>
@@ -430,7 +430,7 @@
             </command>
             <command
                   commandId="org.argeo.cms.ui.workbench.newGroup"
-                  icon="icons/add.gif"
+                  icon="icons/add.png"
                   label="Add Group"
                   tooltip="Create a new group">
             </command>

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/SecurityAdminImages.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/SecurityAdminImages.java
index 4b23724f40ce80296c604ec67a3fc462a9269375..816dead6e59fa8d7c1c0701626a97ac017d525dd 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/SecurityAdminImages.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/SecurityAdminImages.java
@@ -35,11 +35,11 @@ import org.eclipse.swt.graphics.Image;
 public class SecurityAdminImages {
        private final static String PREFIX = "icons/";
 
-       public final static ImageDescriptor ICON_REMOVE_DESC = getImageDescriptor(PREFIX + "remove.gif");
-       public final static ImageDescriptor ICON_USER_DESC = getImageDescriptor(PREFIX + "user.gif");
+       public final static ImageDescriptor ICON_REMOVE_DESC = getImageDescriptor(PREFIX + "delete.png");
+       public final static ImageDescriptor ICON_USER_DESC = getImageDescriptor(PREFIX + "person.png");
 
        public final static Image ICON_USER = ICON_USER_DESC.createImage();
-       public final static Image ICON_GROUP = getImageDescriptor(PREFIX + "users.gif").createImage();
+       public final static Image ICON_GROUP = getImageDescriptor(PREFIX + "group.png").createImage();
        public final static Image ICON_WORKGROUP = getImageDescriptor(PREFIX + "workgroup.png").createImage();
        public final static Image ICON_ROLE = getImageDescriptor(PREFIX + "role.gif").createImage();
 

diff --git a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersImages.java b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersImages.java
index dc8d9fb2d730f06bb11bb2a05b169be61767bfa4..595ef1738dff63470b96ea2f0bdc4ae1f859d4e9 100644 (file)
--- a/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersImages.java
+++ b/org.argeo.cms.ui.workbench/src/org/argeo/cms/ui/workbench/internal/useradmin/UsersImages.java
@@ -23,11 +23,11 @@ public class UsersImages {
        private final static String PREFIX = "icons/";
 
        public final static Image ICON_USER = WorkbenchUiPlugin.getImageDescriptor(
-                       PREFIX + "user.gif").createImage();
+                       PREFIX + "person.png").createImage();
        public final static Image ICON_GROUP = WorkbenchUiPlugin.getImageDescriptor(
-                       PREFIX + "users.gif").createImage();
+                       PREFIX + "group.png").createImage();
        public final static Image ICON_ROLE = WorkbenchUiPlugin.getImageDescriptor(
                        PREFIX + "role.gif").createImage();
        public final static Image ICON_CHANGE_PASSWORD = WorkbenchUiPlugin.getImageDescriptor(
-                       PREFIX + "changePassword.gif").createImage();
+                       PREFIX + "security.gif").createImage();
 }