UI overhaul: actions, menus, labels, icons

3 files changed, 45 insertions, 30 deletions

diff --git a/plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF b/plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF
index 4a3b69b5bb..4d0e6508e0 100644
--- a/plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.net4j.ui.shared/META-INF/MANIFEST.MF
@@ -1,7 +1,7 @@
 Manifest-Version: 1.0
 Bundle-ManifestVersion: 2
 Bundle-SymbolicName: org.eclipse.net4j.ui.shared;singleton:=true
-Bundle-Version: 4.1.0.qualifier
+Bundle-Version: 4.2.0.qualifier
 Bundle-Name: %pluginName
 Bundle-Vendor: %providerName
 Bundle-Localization: plugin
@@ -9,8 +9,8 @@ Bundle-ActivationPolicy: lazy
 Bundle-Activator: org.eclipse.net4j.ui.internal.shared.bundle.OM$Activator
 Bundle-RequiredExecutionEnvironment: J2SE-1.5
 Bundle-ClassPath: .
-Export-Package: org.eclipse.net4j.ui.shared;version="4.1.0";uses:="org.eclipse.jface.resource,org.eclipse.swt.graphics",
- org.eclipse.net4j.ui.internal.shared.bundle;version="4.1.0";x-internal:=true
+Export-Package: org.eclipse.net4j.ui.shared;version="4.2.0";uses:="org.eclipse.jface.resource,org.eclipse.swt.graphics",
+ org.eclipse.net4j.ui.internal.shared.bundle;version="4.2.0";x-internal:=true
 Require-Bundle: org.eclipse.ui;bundle-version="[3.6.0,4.0.0)",
  org.eclipse.core.runtime;bundle-version="[3.4.0,4.0.0)",
  org.eclipse.net4j.util;bundle-version="[3.1.0,4.0.0)"
diff --git a/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/collapse_all.gif b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/collapse_all.gif
new file mode 100644
index 0000000000..a2d80a9044
--- /dev/null
+++ b/plugins/org.eclipse.net4j.ui.shared/icons/full/etool16/collapse_all.gif
diff --git a/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/SharedIcons.java b/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/SharedIcons.java
index 87835c5a4a..ca95b65b1d 100644
--- a/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/SharedIcons.java
+++ b/plugins/org.eclipse.net4j.ui.shared/src/org/eclipse/net4j/ui/shared/SharedIcons.java
@@ -25,8 +25,6 @@ public class SharedIcons
 {
   private static final ImageRegistry REGISTRY = new ImageRegistry(getDisplay());
 
-  private static final String ETOOL = "etool16/"; //$NON-NLS-1$
-
   private static final String OBJ = "obj16/"; //$NON-NLS-1$
 
   public static final String OBJ_ACCEPTOR = OBJ + "acceptor"; //$NON-NLS-1$
@@ -41,6 +39,26 @@ public class SharedIcons
 
   public static final String OBJ_FOLDER = OBJ + "folder"; //$NON-NLS-1$
 
+  public static final String OBJ_BEAN = OBJ + "javabean"; //$NON-NLS-1$
+
+  public static final String OBJ_ERROR = OBJ + "error"; //$NON-NLS-1$
+
+  public static final String OBJ_PENDING = OBJ + "pending"; //$NON-NLS-1$
+
+  public static final String OBJ_COLLABORATION = OBJ + "collaboration"; //$NON-NLS-1$
+
+  public static final String OBJ_BUDDY = OBJ + "buddy"; //$NON-NLS-1$
+
+  public static final String OBJ_BUDDY_LONESOME = OBJ + "buddy_lonesome"; //$NON-NLS-1$
+
+  public static final String OBJ_BUDDY_AWAY = OBJ + "buddy_away"; //$NON-NLS-1$
+
+  public static final String OBJ_BUDDY_DO_NOT_DISTURB = OBJ + "buddy_do_not_disturb"; //$NON-NLS-1$
+
+  public static final String OBJ_CHAT = OBJ + "chat"; //$NON-NLS-1$
+
+  private static final String ETOOL = "etool16/"; //$NON-NLS-1$
+
   public static final String ETOOL_ADD_ACCEPTOR = ETOOL + "add_acceptor"; //$NON-NLS-1$
 
   public static final String ETOOL_ADD_CONNECTOR = ETOOL + "add_connector"; //$NON-NLS-1$
@@ -56,42 +74,39 @@ public class SharedIcons
    */
   public static final String ETOOL_PART_MODE = ETOOL + "part_mode"; //$NON-NLS-1$
 
-  private static final String TOOL = "etool16/"; //$NON-NLS-1$
-
-  private static final String VIEW = "view16/"; //$NON-NLS-1$
+  public static final String ETOOL_HORIZONTAL = ETOOL + "horizontal_layout"; //$NON-NLS-1$
 
-  public static final String OBJ_BEAN = OBJ + "javabean"; //$NON-NLS-1$
+  public static final String ETOOL_VERTICAL = ETOOL + "vertical_layout"; //$NON-NLS-1$
 
-  public static final String OBJ_ERROR = OBJ + "error"; //$NON-NLS-1$
+  /**
+   * @since 4.2
+   */
+  public static final String ETOOL_COLLAPSE_ALL = ETOOL + "collapse_all"; //$NON-NLS-1$
 
-  public static final String OBJ_PENDING = OBJ + "pending"; //$NON-NLS-1$
+  private static final String VIEW = "view16/"; //$NON-NLS-1$
 
   public static final String VIEW_CONTAINER = VIEW + "container"; //$NON-NLS-1$
 
-  public static final String TOOL_ADD = TOOL + "add"; //$NON-NLS-1$
-
-  public static final String TOOL_DELETE = TOOL + "delete"; //$NON-NLS-1$
-
-  public static final String TOOL_REFRESH = TOOL + "refresh"; //$NON-NLS-1$
-
   @SuppressWarnings("unused")
   private static final String WIZBAN = "wizban/"; //$NON-NLS-1$
 
-  public static final String OBJ_COLLABORATION = OBJ + "collaboration"; //$NON-NLS-1$
-
-  public static final String OBJ_BUDDY = OBJ + "buddy"; //$NON-NLS-1$
-
-  public static final String OBJ_BUDDY_LONESOME = OBJ + "buddy_lonesome"; //$NON-NLS-1$
-
-  public static final String OBJ_BUDDY_AWAY = OBJ + "buddy_away"; //$NON-NLS-1$
-
-  public static final String OBJ_BUDDY_DO_NOT_DISTURB = OBJ + "buddy_do_not_disturb"; //$NON-NLS-1$
-
-  public static final String OBJ_CHAT = OBJ + "chat"; //$NON-NLS-1$
+  /**
+   * @deprecated As of 4.2 use {@link #ETOOL_ADD}
+   */
+  @Deprecated
+  public static final String TOOL_ADD = ETOOL_ADD;
 
-  public static final String ETOOL_HORIZONTAL = ETOOL + "horizontal_layout"; //$NON-NLS-1$
+  /**
+   * @deprecated As of 4.2 use {@link #ETOOL_DELETE}
+   */
+  @Deprecated
+  public static final String TOOL_DELETE = ETOOL_DELETE;
 
-  public static final String ETOOL_VERTICAL = ETOOL + "vertical_layout"; //$NON-NLS-1$
+  /**
+   * @deprecated As of 4.2 use {@link #ETOOL_REFRESH}
+   */
+  @Deprecated
+  public static final String TOOL_REFRESH = ETOOL_REFRESH;
 
   public static Image getImage(String key)
   {