Use silk icons

The silk icons [1] look a little more modern than the tango icons and
the set contains a bigger variation of icons.

The silk icons are available under the Creative Commons Attribution
3.0 License.

For some icons (arrowDown.png, arrowUp.png, arrowRight.png,
draftComments.png and queryIcon.png) the origin is unclear and hence
we should no longer use them.

The origin of deleteNormal.png and deleteHover.png is also unclear but
at the moment we don't have a good replacement for them.

The magnifying glass icon that was used as query icon is replaced by a
spy glasses icon. This is because the magnifying glass is associated
with zoom and not with find/query.

Some icons from the tango icon library [2] (goNext.png, goPrev.png,
goUp.png, listAdd.png) are still used because there is no suitable
replacement for them in the silk icons set.

Some unused icons have been removed.

In the source code the icons are now grouped by origin. This should
make it more obvious when icons of unknown origin are added.

[1] http://famfamfam.com/lab/icons/silk/
[2] http://tango.freedesktop.org/Tango_Icon_Library

Change-Id: I5e153647c60410115d06da1a706a0ec1ecdfcaed
Signed-off-by: Edwin Kempin <ekempin@google.com>

gerrit-gwtui-common/src/main/java/com/google/gerrit/client/Resources.java

@@ -18,42 +18,75 @@ import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.ImageResource;
 
 public interface Resources extends ClientBundle {
-  @Source("addFileComment.png")
+  /**
+   * silk icons (CC-BY3.0): http://famfamfam.com/lab/icons/silk/
+   */
+  @Source("note_add.png")
   ImageResource addFileComment();
 
-  @Source("arrowDown.png")
+  // derived from resultset_next.png
+  @Source("resultset_down_gray.png")
   ImageResource arrowDown();
 
-  @Source("arrowRight.png")
+  // derived from resultset_next.png
+  @Source("resultset_next_gray.png")
   ImageResource arrowRight();
 
-  @Source("arrowUp.png")
+  // derived from resultset_next.png
+  @Source("resultset_up_gray.png")
   ImageResource arrowUp();
 
-  @Source("deleteHover.png")
+  @Source("page_white_put.png")
-  ImageResource deleteHover();
-
-  @Source("deleteNormal.png")
-  ImageResource deleteNormal();
-
-  @Source("diffy26.png")
-  ImageResource gerritAvatar26();
-
-  @Source("downloadIcon.png")
   ImageResource downloadIcon();
 
-  @Source("draftComments.png")
+  // derived from comment.png
+  @Source("comment_draft.png")
   ImageResource draftComments();
 
-  @Source("editText.png")
+  @Source("page_edit.png")
   ImageResource edit();
 
-  @Source("editUndo.png")
+  @Source("arrow_undo.png")
   ImageResource editUndo();
 
-  @Source("gear.png")
+  @Source("cog.png")
   ImageResource gear();
 
+  @Source("tick.png")
+  ImageResource greenCheck();
+
+  @Source("lightbulb.png")
+  ImageResource info();
+
+  @Source("find.png")
+  ImageResource queryIcon();
+
+  @Source("lock.png")
+  ImageResource readOnly();
+
+  @Source("cross.png")
+  ImageResource redNot();
+
+  @Source("disk.png")
+  ImageResource save();
+
+  @Source("star.png")
+  ImageResource starFilled();
+
+  // derived from star.png
+  @Source("star-open.png")
+  ImageResource starOpen();
+
+  @Source("exclamation.png")
+  ImageResource warning();
+
+  @Source("help.png")
+  ImageResource question();
+
+  /**
+   * tango icon library (public domain):
+   * http://tango.freedesktop.org/Tango_Icon_Library
+   */
   @Source("goNext.png")
   ImageResource goNext();
 
@@ -63,48 +96,25 @@ public interface Resources extends ClientBundle {
   @Source("goUp.png")
   ImageResource goUp();
 
-  @Source("greenCheck.png")
-  ImageResource greenCheck();
-
-  @Source("info.png")
-  ImageResource info();
-
   @Source("listAdd.png")
   ImageResource listAdd();
 
-  @Source("mediaFloppy.png")
+  // derived from important.png
-  ImageResource save();
-
   @Source("merge.png")
   ImageResource merge();
 
-  @Source("queryIcon.png")
+  /**
-  ImageResource queryIcon();
+   * contributed by the artist under Apache2.0
-
+   */
-  @Source("readOnly.png")
-  ImageResource readOnly();
-
-  @Source("redNot.png")
-  ImageResource redNot();
-
   @Source("sideBySideDiff.png")
   ImageResource sideBySideDiff();
 
-  @Source("starFilled.png")
-  ImageResource starFilled();
-
-  @Source("starOpen.png")
-  ImageResource starOpen();
-
-  @Source("undoNormal.png")
-  ImageResource undoNormal();
-
   @Source("unifiedDiff.png")
   ImageResource unifiedDiff();
 
-  @Source("warning.png")
+  /**
-  ImageResource warning();
+   * contributed by the artist under CC-BY3.0
-
+   */
-  @Source("question.png")
+  @Source("diffy26.png")
-  ImageResource question();
+  ImageResource gerritAvatar26();
 }

gerrit-gwtui/BUCK

@@ -26,6 +26,7 @@ gwt_module(
   resources = glob(['src/main/java/**/*']),
   deps = [
     ':freebie_application_icon_set',
+    ':silk_icons',
     '//gerrit-gwtui-common:diffy_logo',
     '//gerrit-gwtui-common:client',
     '//gerrit-gwtexpui:CSS',
@@ -47,6 +48,14 @@ java_library(
   ],
 )
 
+java_library(
+  name = 'silk_icons',
+  deps = [
+    '//lib:LICENSE-silk_icons',
+    '//lib:LICENSE-CC-BY3.0',
+  ],
+)
+
 java_test(
   name = 'ui_tests',
   srcs = glob(['src/test/java/**/*.java']),

gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritCss.java

@@ -160,6 +160,7 @@ public interface GerritCss extends CssResource {
   String projectFilterLabel();
   String projectFilterPanel();
   String projectNameColumn();
+  String queryIcon();
   String rebaseContentPanel();
   String rebaseSuggestBox();
   String registerScreenExplain();

gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java

@@ -24,12 +24,19 @@ public interface AdminResources extends ClientBundle {
   @Source("admin.css")
   AdminCss css();
 
+  /**
+   * unknown origin
+   * TODO replace icons
+   */
   @Source("deleteNormal.png")
   ImageResource deleteNormal();
 
   @Source("deleteHover.png")
   ImageResource deleteHover();
 
-  @Source("undoNormal.png")
+  /**
+   * silk icons (CC-BY3.0): http://famfamfam.com/lab/icons/silk/
+   */
+  @Source("arrow_undo.png")
   ImageResource undoNormal();
 }

gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java

@@ -25,6 +25,10 @@ interface Resources extends ClientBundle {
   @Source("CommentBox.css") CommentBox.Style style();
   @Source("Scrollbar.css") Scrollbar.Style scrollbarStyle();
 
+  /**
+   * tango icon library (public domain):
+   * http://tango.freedesktop.org/Tango_Icon_Library
+   */
   @Source("goPrev.png") ImageResource goPrev();
   @Source("goNext.png") ImageResource goNext();
   @Source("goUp.png") ImageResource goUp();

gerrit-gwtui/src/main/java/com/google/gerrit/client/gerrit.css

@@ -1306,6 +1306,12 @@ a:hover.downloadLink {
   min-width: 300px;
 }
 
+.queryIcon {
+  position: relative;
+  top: 2px;
+  margin-right: 3px;
+}
+
 /** ProjectSettings */
 .maxObjectSizeLimitEffectiveLabel {
   padding-top: 5px;

gerrit-gwtui/src/main/java/com/google/gerrit/client/ui/ProjectSearchLink.java

@@ -27,6 +27,7 @@ public class ProjectSearchLink extends InlineHyperlink {
     super(" ", PageLinks.toProjectDefaultDashboard(projectName));
     setTitle(Util.C.projectListQueryLink());
     final Image image = new Image(Gerrit.RESOURCES.queryIcon());
+    image.setStyleName(Gerrit.RESOURCES.css().queryIcon());
     DOM.insertBefore(getElement(), image.getElement(),
         DOM.getFirstChild(getElement()));
   }

lib/BUCK

@@ -24,6 +24,7 @@ define_license(name = 'prologcafe')
 define_license(name = 'promise-polyfill')
 define_license(name = 'protobuf')
 define_license(name = 'PublicDomain')
+define_license(name = 'silk_icons')
 define_license(name = 'slf4j')
 define_license(name = 'xz')
 

lib/LICENSE-silk_icons

@@ -0,0 +1 @@
+link:http://creativecommons.org/licenses/by/3.0/us/[CC-BY 3.0] (c) Mark James, link:http://famfamfam.com/lab/icons/silk/[SILK ICONS]