You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2014/05/21 17:49:21 UTC

svn commit: r1596604 - in /sling/trunk/tooling/ide/eclipse-ui: ./ icons/obj16/ src/org/apache/sling/ide/eclipse/ui/internal/

Author: rombert
Date: Wed May 21 15:49:20 2014
New Revision: 1596604

URL: http://svn.apache.org/r1596604
Log:
SLING-3597 - Sling server and module icons are jagged due to downscaling
SLING-3595 - Sling wizard icons are too large

Added:
    sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_bundle.gif   (with props)
    sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_content.gif   (with props)
    sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_misc.gif   (contents, props changed)
      - copied, changed from r1596584, sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling.gif
    sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_server.gif   (with props)
Removed:
    sling/trunk/tooling/ide/eclipse-ui/icons/obj16/logo.png
    sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling.gif
Modified:
    sling/trunk/tooling/ide/eclipse-ui/plugin.xml
    sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/sling-logo.png

Added: sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_bundle.gif
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_bundle.gif?rev=1596604&view=auto
==============================================================================
Binary file - no diff available.

Propchange: sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_bundle.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Added: sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_content.gif
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_content.gif?rev=1596604&view=auto
==============================================================================
Binary file - no diff available.

Propchange: sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_content.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Copied: sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_misc.gif (from r1596584, sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling.gif)
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_misc.gif?p2=sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_misc.gif&p1=sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling.gif&r1=1596584&r2=1596604&rev=1596604&view=diff
==============================================================================
Binary files - no diff available.

Propchange: sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_misc.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Added: sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_server.gif
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_server.gif?rev=1596604&view=auto
==============================================================================
Binary file - no diff available.

Propchange: sling/trunk/tooling/ide/eclipse-ui/icons/obj16/sling_server.gif
------------------------------------------------------------------------------
    svn:mime-type = image/gif

Modified: sling/trunk/tooling/ide/eclipse-ui/plugin.xml
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/plugin.xml?rev=1596604&r1=1596603&r2=1596604&view=diff
==============================================================================
--- sling/trunk/tooling/ide/eclipse-ui/plugin.xml (original)
+++ sling/trunk/tooling/ide/eclipse-ui/plugin.xml Wed May 21 15:49:20 2014
@@ -14,17 +14,16 @@
 
 	<!-- Define images -->
 	<extension point="org.eclipse.wst.server.ui.serverImages">
-	<!-- TODO : merge into a single image? -->
 	      <image
-             icon="icons/obj16/sling.gif"
+             icon="icons/obj16/sling_server.gif"
              id="slinggif"
              typeIds="org.apache.sling.ide.launchpadServer"/>
 	      <image
-             icon="icons/obj16/sling.gif"
+             icon="icons/obj16/sling_content.gif"
              id="slingcontentgif"
              typeIds="sling.content"/>
 	      <image
-             icon="icons/obj16/sling.gif"
+             icon="icons/obj16/sling_bundle.gif"
              id="slingbundle"
              typeIds="sling.bundle"/>
 	</extension>  
@@ -53,11 +52,11 @@
     <extension point="org.eclipse.wst.common.project.facet.ui.images">
     <image
           facet="sling.bundle"
-          path="icons/obj16/sling.gif"
+          path="icons/obj16/sling_bundle.gif"
           runtime-component-type="org.apache.sling.ide.launchpadRuntimeComponentType"/>
     <image
           facet="sling.content"
-          path="icons/obj16/sling.gif"
+          path="icons/obj16/sling_content.gif"
           runtime-component-type="org.apache.sling.ide.launchpadRuntimeComponentType">
     </image>
   </extension>
@@ -124,7 +123,7 @@
       <wizard
             category="org.apache.sling.ide.eclipse.ui.internal.sampleCategory"
             class="org.apache.sling.ide.eclipse.ui.internal.ImportWizard"
-            icon="icons/obj16/sling.gif"
+            icon="icons/obj16/sling_misc.gif"
             id="org.apache.sling.ide.eclipse.ui.internal.ImportWizard"
             name="Import from Sling Repository">
          <description>
@@ -158,7 +157,7 @@
       <wizard
             category="org.apache.sling.ide.eclipse.ui"
             class="org.apache.sling.ide.eclipse.ui.wizards.NewSlingContentProjectWizard"
-            icon="icons/obj16/sling.gif"
+            icon="icons/obj16/sling_misc.gif"
             id="org.apache.sling.ide.eclipse.ui.wizards.NewSlingContentProjectWizard"
             name="Sling Content Project"
             project="true">
@@ -199,7 +198,7 @@
       <navigatorContent
             appearsBefore="org.eclipse.jst.jee.ui.ejb"
             contentProvider="org.apache.sling.ide.eclipse.ui.nav.JcrContentContentProvider"
-            icon="icons/obj16/sling.gif"
+            icon="icons/obj16/sling_misc.gif"
             id="org.apache.sling.ide.eclipse-ui.navigatorJcrContent"
             labelProvider="org.apache.sling.ide.eclipse.ui.nav.JcrContentLabelProvider"
             name="Sling (JCR) Content"
@@ -377,21 +376,21 @@
             objectClass="org.apache.sling.ide.eclipse.ui.nav.model.JcrNode">
          <action
                class="org.apache.sling.ide.eclipse.ui.actions.JcrNewNodeAction"
-               icon="icons/obj16/sling.gif"
+               icon="icons/obj16/sling_misc.gif"
                id="org.apache.sling.ide.eclipse.ui.nav.NewJcrNodeAction"
                label="&amp;New JCR Node"
                menubarPath="jcr">
          </action>
          <action
                class="org.apache.sling.ide.eclipse.ui.actions.JcrNodeRenameAction"
-               icon="icons/obj16/sling.gif"
+               icon="icons/obj16/sling_misc.gif"
                id="org.apache.sling.ide.eclipse.ui.actions.JcrNodeRenameAction"
                label="&amp;Rename JCR Node"
                menubarPath="jcr">
          </action>
          <action
                class="org.apache.sling.ide.eclipse.ui.actions.JcrNodeDeleteAction"
-               icon="icons/obj16/sling.gif"
+               icon="icons/obj16/sling_misc.gif"
                id="org.apache.sling.ide.eclipse.ui.actions.JcrNodeDeleteAction"
                label="&amp;Delete JCR Node"
                menubarPath="jcr">
@@ -413,7 +412,7 @@
             objectClass="org.apache.sling.ide.eclipse.ui.nav.model.JcrNode">
          <action
                class="org.apache.sling.ide.eclipse.ui.actions.OpenHtmlInBrowserAction"
-               icon="icons/obj16/sling.gif"
+               icon="icons/obj16/sling_misc.gif"
                id="org.apache.sling.ide.eclipse.ui.actionsOpenHtmlInBrowserAction"
                label="&amp;Open .html (on server) in browser"
                menubarPath="jcr">
@@ -436,28 +435,28 @@
             objectClass="org.apache.sling.ide.eclipse.ui.nav.model.JcrNode">
          <action
                class="org.apache.sling.ide.eclipse.ui.actions.JcrNewNodeAction"
-               icon="icons/obj16/sling.gif"
+               icon="icons/obj16/sling_misc.gif"
                id="org.apache.sling.ide.eclipse.ui.nav.NewNonJcrNodeAction"
                label="New JCR Node"
                menubarPath="common.new.menu/jcr">
          </action>
          <action
                class="org.apache.sling.ide.eclipse.ui.actions.JcrNodeRenameAction"
-               icon="icons/obj16/sling.gif"
+               icon="icons/obj16/sling_misc.gif"
                id="org.apache.sling.ide.eclipse.ui.actions.JcrNodeRenameAction"
                label="&amp;Rename JCR Node"
                toolbarPath="common.new.menu/jcr">
          </action>
          <action
                class="org.apache.sling.ide.eclipse.ui.actions.JcrNodeDeleteAction"
-               icon="icons/obj16/sling.gif"
+               icon="icons/obj16/sling_misc.gif"
                id="org.apache.sling.ide.eclipse.ui.actions.JcrNodeDeleteAction"
                label="&amp;Delete JCR Node"
                toolbarPath="common.new.menu/jcr">
          </action>
          <action
                class="org.apache.sling.ide.eclipse.ui.actions.OpenHtmlInBrowserAction"
-               icon="icons/obj16/sling.gif"
+               icon="icons/obj16/sling_misc.gif"
                id="org.apache.sling.ide.eclipse.ui.actionsOpenHtmlInBrowserAction"
                label="&amp;Open .html (on server) in browser"
                menubarPath="common.open.menu/jcr">
@@ -562,7 +561,7 @@
        <view
              category="org.apache.sling.ide.eclipse-ui"
              class="org.apache.sling.ide.eclipse.ui.views.JcrPropertiesView"
-             icon="icons/obj16/sling.gif"
+             icon="icons/obj16/sling_misc.gif"
              id="org.apache.sling.ide.eclipse.ui.views.JcrPropertiesView"
              name="JCR Properties">
        </view>

Modified: sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/sling-logo.png
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/ide/eclipse-ui/src/org/apache/sling/ide/eclipse/ui/internal/sling-logo.png?rev=1596604&r1=1596603&r2=1596604&view=diff
==============================================================================
Binary files - no diff available.