commit | 1b6346fa96b9d028d070ec516a8078fca20b8d90 | [log] [tgz] |
---|---|---|
author | Edwin Kempin <ekempin@google.com> | Tue Jan 19 10:06:39 2016 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Jan 19 10:06:39 2016 +0000 |
tree | 82b3d2ff4f81019570ac1721c8be07af9a13512b | |
parent | 71bbf635878f8a07c6dba2f6a83600e160292cac [diff] | |
parent | 489adde37754ed3e61fd2b23f129e48f4a027192 [diff] |
Merge "Reuse icons from Gerrit core"
diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java index 8b4f2c1..5d5116b 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java +++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/ImageUploadScreen.java
@@ -55,7 +55,7 @@ HorizontalPanel p = new HorizontalPanel(); p.setStyleName("imagare-menu-panel"); Anchor prefsAnchor = new Anchor(new ImageResourceRenderer().render( - ImagarePlugin.RESOURCES.preferences()), + ImagarePlugin.RESOURCES.gear()), "#/settings/x/" + Plugin.get().getPluginName() + "/preferences"); prefsAnchor.setTitle("Edit Preferences"); p.add(prefsAnchor);
diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/Resources.java b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/Resources.java index 345a2b7..7e85e6e 100644 --- a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/Resources.java +++ b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/Resources.java
@@ -14,10 +14,9 @@ package com.googlesource.gerrit.plugins.imagare.client; -import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.ImageResource; -public interface Resources extends ClientBundle { +public interface Resources extends com.google.gerrit.client.Resources { @Source("delete.png") public ImageResource delete(); @@ -27,10 +26,4 @@ @Source("image.png") public ImageResource image(); - - @Source("info.png") - public ImageResource info(); - - @Source("preferences.png") - public ImageResource preferences(); }
diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/info.png b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/info.png deleted file mode 100644 index 8851b99..0000000 --- a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/info.png +++ /dev/null Binary files differ
diff --git a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/preferences.png b/src/main/java/com/googlesource/gerrit/plugins/imagare/client/preferences.png deleted file mode 100644 index d90ab66..0000000 --- a/src/main/java/com/googlesource/gerrit/plugins/imagare/client/preferences.png +++ /dev/null Binary files differ