diff --git a/gerrit-gwtui-common/BUCK b/gerrit-gwtui-common/BUCK index f4c2358870..2eb068401d 100644 --- a/gerrit-gwtui-common/BUCK +++ b/gerrit-gwtui-common/BUCK @@ -1,9 +1,11 @@ SRC = 'src/main/java/com/google/gerrit/' +DIFFY = glob(['src/main/resources/com/google/gerrit/client/diffy*.png']) gwt_module( name = 'client', srcs = glob([SRC + 'client/**/*.java']), gwt_xml = SRC + 'GerritGwtUICommon.gwt.xml', + resources = glob(['src/main/**/*']), deps = ['//lib/gwt:user'], visibility = ['PUBLIC'], ) @@ -28,3 +30,25 @@ java_library( resources = glob(['src/main/**/*']), visibility = ['PUBLIC'], ) + +prebuilt_jar( + name = 'diffy_logo', + binary_jar = ':diffy_image_files_ln', + deps = [ + '//lib:LICENSE-diffy', + '//lib:LICENSE-CC-BY3.0', + ], + visibility = ['PUBLIC'], +) + +genrule( + name = 'diffy_image_files_ln', + cmd = 'ln -s $(location :diffy_image_files) $OUT', + deps = [':diffy_image_files'], + out = 'diffy_images.jar', +) + +java_library( + name = 'diffy_image_files', + resources = DIFFY, +) diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/Resources.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/Resources.java new file mode 100644 index 0000000000..0c728ae063 --- /dev/null +++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/Resources.java @@ -0,0 +1,104 @@ +// Copyright (C) 2008 The Android Open Source Project +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.gerrit.client; + +import com.google.gwt.resources.client.ClientBundle; +import com.google.gwt.resources.client.ImageResource; + +public interface Resources extends ClientBundle { + @Source("arrowRight.png") + public ImageResource arrowRight(); + + @Source("arrowUp.png") + public ImageResource arrowUp(); + + @Source("arrowDown.png") + public ImageResource arrowDown(); + + @Source("editText.png") + public ImageResource edit(); + + @Source("mediaFloppy.png") + public ImageResource save(); + + @Source("starOpen.png") + public ImageResource starOpen(); + + @Source("starFilled.png") + public ImageResource starFilled(); + + @Source("greenCheck.png") + public ImageResource greenCheck(); + + @Source("redNot.png") + public ImageResource redNot(); + + @Source("editUndo.png") + public ImageResource editUndo(); + + @Source("downloadIcon.png") + public ImageResource downloadIcon(); + + @Source("queryIcon.png") + public ImageResource queryIcon(); + + @Source("addFileComment.png") + public ImageResource addFileComment(); + + @Source("diffy26.png") + public ImageResource gerritAvatar26(); + + @Source("draftComments.png") + public ImageResource draftComments(); + + @Source("readOnly.png") + public ImageResource readOnly(); + + @Source("gear.png") + public ImageResource gear(); + + @Source("info.png") + public ImageResource info(); + + @Source("warning.png") + public ImageResource warning(); + + @Source("listAdd.png") + public ImageResource listAdd(); + + @Source("merge.png") + public ImageResource merge(); + + @Source("removeReviewer.png") + public ImageResource removeReviewer(); + + @Source("deleteNormal.png") + public ImageResource deleteNormal(); + + @Source("deleteHover.png") + public ImageResource deleteHover(); + + @Source("undoNormal.png") + public ImageResource undoNormal(); + + @Source("goPrev.png") + public ImageResource goPrev(); + + @Source("goNext.png") + public ImageResource goNext(); + + @Source("goUp.png") + public ImageResource goUp(); +} diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/addFileComment.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/addFileComment.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/addFileComment.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/addFileComment.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowDown.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowDown.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowDown.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowDown.png diff --git a/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowRight.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowRight.png new file mode 100644 index 0000000000..8549f5d386 Binary files /dev/null and b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowRight.png differ diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowUp.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowUp.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowUp.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowUp.png diff --git a/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/deleteHover.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/deleteHover.png new file mode 100644 index 0000000000..9fde3fa521 Binary files /dev/null and b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/deleteHover.png differ diff --git a/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/deleteNormal.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/deleteNormal.png new file mode 100644 index 0000000000..47a1195789 Binary files /dev/null and b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/deleteNormal.png differ diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diffy100.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/diffy100.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/diffy100.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/diffy100.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diffy26.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/diffy26.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/diffy26.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/diffy26.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/downloadIcon.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/downloadIcon.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/downloadIcon.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/downloadIcon.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/draftComments.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/draftComments.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/draftComments.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/draftComments.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/editText.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/editText.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/editText.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/editText.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editUndo.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/editUndo.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/editUndo.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/editUndo.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/gear.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/gear.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/gear.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/gear.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-next.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goNext.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-next.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goNext.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-prev.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goPrev.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-prev.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goPrev.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-up.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goUp.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-up.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goUp.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/greenCheck.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/greenCheck.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/greenCheck.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/greenCheck.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/info.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/info.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/info.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/info.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/listAdd.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/listAdd.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/listAdd.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/listAdd.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/mediaFloppy.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/mediaFloppy.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/mediaFloppy.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/mediaFloppy.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/merge.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/merge.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/merge.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/merge.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/queryIcon.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/queryIcon.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/queryIcon.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/queryIcon.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/readOnly.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/readOnly.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/readOnly.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/readOnly.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/redNot.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/redNot.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/redNot.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/redNot.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/remove_reviewer.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/removeReviewer.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/change/remove_reviewer.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/removeReviewer.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/star_filled.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/starFilled.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/change/star_filled.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/starFilled.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/star_open.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/starOpen.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/change/star_open.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/starOpen.png diff --git a/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/undoNormal.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/undoNormal.png new file mode 100644 index 0000000000..b780f7560c Binary files /dev/null and b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/undoNormal.png differ diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/warning.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/warning.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/warning.png rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/warning.png diff --git a/gerrit-gwtui/BUCK b/gerrit-gwtui/BUCK index 413360645e..12945fa113 100644 --- a/gerrit-gwtui/BUCK +++ b/gerrit-gwtui/BUCK @@ -59,16 +59,14 @@ gwt_user_agent_permutations( visibility = ['//:'], ) -DIFFY = glob(['src/main/java/com/google/gerrit/client/diffy*.png']) - gwt_module( name = 'ui_module', srcs = glob(['src/main/java/**/*.java']), gwt_xml = 'src/main/java/%s.gwt.xml' % MODULE.replace('.', '/'), - resources = glob(['src/main/java/**/*'], excludes = DIFFY), + resources = glob(['src/main/java/**/*']), deps = [ - ':diffy_logo', ':freebie_application_icon_set', + '//gerrit-gwtui-common:diffy_logo', '//gerrit-gwtexpui:Clippy', '//gerrit-gwtexpui:GlobalKey', '//gerrit-gwtexpui:Progress', @@ -94,15 +92,6 @@ gwt_module( ], ) -prebuilt_jar( - name = 'diffy_logo', - binary_jar = ':diffy_image_files_ln', - deps = [ - '//lib:LICENSE-diffy', - '//lib:LICENSE-CC-BY3.0', - ], -) - java_library( name = 'freebie_application_icon_set', deps = [ @@ -111,18 +100,6 @@ java_library( ], ) -genrule( - name = 'diffy_image_files_ln', - cmd = 'ln -s $(location :diffy_image_files) $OUT', - deps = [':diffy_image_files'], - out = 'diffy_images.jar', -) - -java_library( - name = 'diffy_image_files', - resources = DIFFY, -) - java_test( name = 'ui_tests', srcs = glob(['src/test/java/**/*.java']), diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java index c45c797735..01be2f2381 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java @@ -14,77 +14,12 @@ package com.google.gerrit.client; -import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; -import com.google.gwt.resources.client.ImageResource; -public interface GerritResources extends ClientBundle { +public interface GerritResources extends Resources { @Source("gerrit.css") GerritCss css(); @Source("gwt_override.css") CssResource gwt_override(); - - @Source("arrowRight.gif") - public ImageResource arrowRight(); - - @Source("arrowUp.png") - public ImageResource arrowUp(); - - @Source("arrowDown.png") - public ImageResource arrowDown(); - - @Source("editText.png") - public ImageResource edit(); - - @Source("mediaFloppy.png") - public ImageResource save(); - - @Source("starOpen.gif") - public ImageResource starOpen(); - - @Source("starFilled.gif") - public ImageResource starFilled(); - - @Source("greenCheck.png") - public ImageResource greenCheck(); - - @Source("redNot.png") - public ImageResource redNot(); - - @Source("editUndo.png") - public ImageResource editUndo(); - - @Source("downloadIcon.png") - public ImageResource downloadIcon(); - - @Source("queryIcon.png") - public ImageResource queryIcon(); - - @Source("addFileComment.png") - public ImageResource addFileComment(); - - @Source("diffy26.png") - public ImageResource gerritAvatar26(); - - @Source("draftComments.png") - public ImageResource draftComments(); - - @Source("readOnly.png") - public ImageResource readOnly(); - - @Source("gear.png") - public ImageResource gear(); - - @Source("info.png") - public ImageResource info(); - - @Source("warning.png") - public ImageResource warning(); - - @Source("listAdd.png") - public ImageResource listAdd(); - - @Source("merge.png") - public ImageResource merge(); } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java index cd366f35f6..f1ac27f496 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java @@ -24,9 +24,6 @@ public interface AdminResources extends ClientBundle { @Source("admin.css") AdminCss css(); - @Source("editText.png") - public ImageResource editText(); - @Source("deleteNormal.png") public ImageResource deleteNormal(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ValueEditor.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ValueEditor.ui.xml index 9862848064..e5f66499df 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ValueEditor.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ValueEditor.ui.xml @@ -18,7 +18,7 @@ limitations under the License. xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui' > - + .panel { position: relative; @@ -49,7 +49,7 @@ limitations under the License. diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowRight.gif b/gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowRight.gif deleted file mode 100644 index d9e63a5754..0000000000 Binary files a/gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowRight.gif and /dev/null differ diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml index a645cada57..c51587acb2 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml @@ -20,7 +20,7 @@ limitations under the License. xmlns:x='urn:import:com.google.gerrit.client.ui' xmlns:clippy='urn:import:com.google.gwtexpui.clippy.client'> - + @eval trimColor com.google.gerrit.client.Gerrit.getTheme().trimColor; diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java index 1e6192a747..117ebe1783 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java @@ -171,7 +171,7 @@ public class Hashtags extends Composite { .setAttribute("title", "Remove hashtag") .setAttribute("onclick", REMOVE + "(event)") .append( - new ImageResourceRenderer().render(Resources.I.remove_reviewer())) + new ImageResourceRenderer().render(Gerrit.RESOURCES.removeReviewer())) .closeElement("button") .closeSpan(); if (itr.hasNext()) { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java index 9c4b8e1e28..47bf8054af 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java @@ -274,7 +274,7 @@ class Labels extends Grid { html.openElement("button") .setAttribute("title", Util.M.removeReviewer(name)) .setAttribute("onclick", REMOVE + "(event)") - .append(new ImageResourceRenderer().render(Resources.I.remove_reviewer())) + .append(new ImageResourceRenderer().render(Gerrit.RESOURCES.removeReviewer())) .closeElement("button"); } html.closeSpan(); diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java index 7ca3c5315e..4fc76c18ab 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java @@ -17,16 +17,12 @@ package com.google.gerrit.client.change; import com.google.gwt.core.client.GWT; import com.google.gwt.resources.client.ClientBundle; import com.google.gwt.resources.client.CssResource; -import com.google.gwt.resources.client.ImageResource; public interface Resources extends ClientBundle { public static final Resources I = GWT.create(Resources.class); static final ChangeConstants C = GWT.create(ChangeConstants.class); static final ChangeMessages M = GWT.create(ChangeMessages.class); - @Source("star_open.png") ImageResource star_open(); - @Source("star_filled.png") ImageResource star_filled(); - @Source("remove_reviewer.png") ImageResource remove_reviewer(); @Source("common.css") Style style(); public interface Style extends CssResource { diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/StarIcon.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/StarIcon.java index fccca27058..0f19406d0c 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/StarIcon.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/StarIcon.java @@ -14,13 +14,14 @@ package com.google.gerrit.client.change; +import com.google.gerrit.client.Gerrit; import com.google.gwt.user.client.ui.Image; import com.google.gwt.user.client.ui.ToggleButton; class StarIcon extends ToggleButton { StarIcon() { super( - new Image(Resources.I.star_open()), - new Image(Resources.I.star_filled())); + new Image(Gerrit.RESOURCES.starOpen()), + new Image(Gerrit.RESOURCES.starFilled())); } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/more_less.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/moreLess.png similarity index 100% rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/change/more_less.png rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/change/moreLess.png diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBoxUi.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBoxUi.css index da0754b528..441af22cc1 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBoxUi.css +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBoxUi.css @@ -123,15 +123,15 @@ color: #fff; } -@sprite .go_prev { - gwt-image: "go_prev"; +@sprite .goPrev { + gwt-image: "goPrev"; display: inline-block; } -@sprite .go_next { - gwt-image: "go_next"; +@sprite .goNext { + gwt-image: "goNext"; display: inline-block; } -@sprite .go_up { - gwt-image: "go_up"; +@sprite .goUp { + gwt-image: "goUp"; display: inline-block; } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.ui.xml index 7d1f1e5eb5..08b64db727 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.ui.xml +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.ui.xml @@ -18,6 +18,7 @@ limitations under the License. xmlns:ui='urn:ui:com.google.gwt.uibinder' xmlns:g='urn:import:com.google.gwt.user.client.ui' xmlns:x='urn:import:com.google.gerrit.client.ui'> + .header { @@ -60,16 +61,16 @@ limitations under the License. /
No Differences - + - + diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java index 8c4fc516b6..605935bb48 100644 --- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java +++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java @@ -24,10 +24,9 @@ interface Resources extends ClientBundle { static final Resources I = GWT.create(Resources.class); @Source("CommentBoxUi.css") Style style(); - @Source("go-prev.png") ImageResource go_prev(); - @Source("go-next.png") ImageResource go_next(); - @Source("go-up.png") ImageResource go_up(); - @Source("gear.png") ImageResource gear(); + @Source("goPrev.png") ImageResource goPrev(); + @Source("goNext.png") ImageResource goNext(); + @Source("goUp.png") ImageResource goUp(); interface Style extends CssResource { String commentWidgets(); @@ -38,8 +37,8 @@ interface Resources extends ClientBundle { String summary(); String date(); - String go_prev(); - String go_next(); - String go_up(); + String goPrev(); + String goNext(); + String goUp(); } } diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goNext.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goNext.png new file mode 100644 index 0000000000..872c1979e0 Binary files /dev/null and b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goNext.png differ diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goPrev.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goPrev.png new file mode 100644 index 0000000000..d68f29b34c Binary files /dev/null and b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goPrev.png differ diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goUp.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goUp.png new file mode 100644 index 0000000000..f75bed4478 Binary files /dev/null and b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goUp.png differ diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editText.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editText.png deleted file mode 100644 index 2927275f56..0000000000 Binary files a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editText.png and /dev/null differ diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gear.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gear.png deleted file mode 100644 index 2f84e4734f..0000000000 Binary files a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gear.png and /dev/null differ diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/starFilled.gif b/gerrit-gwtui/src/main/java/com/google/gerrit/client/starFilled.gif deleted file mode 100644 index 77619f0dc3..0000000000 Binary files a/gerrit-gwtui/src/main/java/com/google/gerrit/client/starFilled.gif and /dev/null differ diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/starOpen.gif b/gerrit-gwtui/src/main/java/com/google/gerrit/client/starOpen.gif deleted file mode 100644 index e8dc0a3aa2..0000000000 Binary files a/gerrit-gwtui/src/main/java/com/google/gerrit/client/starOpen.gif and /dev/null differ