Mercurial > dive4elements > river
changeset 2471:a1ff911e8365
Replaced FLYS specific icon set.
flys-client/trunk@4194 c6561f87-3c4e-4783-a992-168aeb5c3f6f
line wrap: on
line diff
--- a/flys-client/ChangeLog Mon Apr 02 08:41:09 2012 +0000 +++ b/flys-client/ChangeLog Wed Apr 04 07:20:08 2012 +0000 @@ -1,3 +1,68 @@ +2012-04-04 Ingo Weinzierl <ingo@intevation.de> + + * src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties, + src/main/java/de/intevation/flys/client/client/FLYSConstants.properties, + src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: + Modified references to images. + + * src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java, + src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java, + src/main/java/de/intevation/flys/client/client/ui/map/MeasureControl.java: + Explicitly disabled mouse over effects. + + * src/main/webapp/images/arrow_up.png, + src/main/webapp/images/hand.png, + src/main/webapp/images/mag_zoom_plus.png, + src/main/webapp/images/mag_zoom_back.png, + src/main/webapp/images/mag_zoom_box_Selected.png, + src/main/webapp/images/mag_100_Selected.png, + src/main/webapp/images/png_export_Selected.png, + src/main/webapp/images/svg_export.png, + src/main/webapp/images/arrow_first.png, + src/main/webapp/images/properties_Selected.png, + src/main/webapp/images/measure_line.png, + src/main/webapp/images/measure_plane.png, + src/main/webapp/images/mag_zoom_plus_Selected.png, + src/main/webapp/images/png_export.png, + src/main/webapp/images/info.png, + src/main/webapp/images/mag_glass.png, + src/main/webapp/images/save.png, + src/main/webapp/images/save_Selected.png, + src/main/webapp/images/pdf_export.png, + src/main/webapp/images/arrow_last.png, + src/main/webapp/images/mag_zoom_box.png, + src/main/webapp/images/arrow_down.png, + src/main/webapp/images/pdf_export_Selected.png, + src/main/webapp/images/mag_zoom_minus.png, + src/main/webapp/images/properties.png, + src/main/webapp/images/add_map_Selected.png, + src/main/webapp/images/mag_zoom_back_Selected.png, + src/main/webapp/images/info_Selected.png, + src/main/webapp/images/svg_export_Selected.png, + src/main/webapp/images/mag_100.png, + src/main/webapp/images/measure_line_Selected.png, + src/main/webapp/images/add_map.png, + src/main/webapp/images/measure_plane_Selected.png, + src/main/webapp/images/mag_zoom_minus_Selected.png: New icons. + + * src/main/webapp/images/addWMS.png, + src/main/webapp/images/theme_top.png, + src/main/webapp/images/zoom-in_Selected.png, + src/main/webapp/images/theme_up.png, + src/main/webapp/images/getFeatureInfo.png, + src/main/webapp/images/getFeatureInfo_Selected.png, + src/main/webapp/images/measureLine_Selected.png, + src/main/webapp/images/measurePolygon_Selected.png, + src/main/webapp/images/zoom-1.png, + src/main/webapp/images/zoom-back.png, + src/main/webapp/images/theme_bottom.png, + src/main/webapp/images/zoom-in.png, + src/main/webapp/images/zoom-out.png, + src/main/webapp/images/measureLine.png, + src/main/webapp/images/measurePolygon.png, + src/main/webapp/images/theme_down.png: Removed old icons (replaced by + new icons). + 2012-04-02 Ingo Weinzierl <ingo@intevation.de> flys/issue556 (ÜSK: neues Projekt, wenn zuvor INFO-Button verwendet wurde)
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Mon Apr 02 08:41:09 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Wed Apr 04 07:20:08 2012 +0000 @@ -87,16 +87,16 @@ bfgLogo = images/bfg_logo.gif # Images -downloadPNG = images/downloadPNG.png -downloadPDF = images/downloadPDF.png -downloadSVG = images/downloadSVG.png -downloadCSV = images/save.gif +downloadPNG = images/png_export.png +downloadPDF = images/pdf_export.png +downloadSVG = images/svg_export.png +downloadCSV = images/save.png loadingImg = images/loading.gif cancelCalculation = images/cancelCalculation.png markerRed = images/marker_red.png markerGreen = images/marker_green.png riverMap = images/gewkarte.png -properties_ico = images/properties.gif +properties_ico = images/properties.png dpLabelFrom = From dpUnitFrom = km @@ -162,16 +162,16 @@ buttonNext = Next imageBack = images/back_en.png -imageSave = images/save.gif -theme_top = images/theme_top.png -theme_up = images/theme_up.png -theme_down = images/theme_down.png -theme_bottom = images/theme_bottom.png -zoom_all = images/zoom-1.png -zoom_in = images/zoom-in.png -zoom_out = images/zoom-out.png -zoom_back = images/zoom-back.png -pan = images/pan.png +imageSave = images/save.png +theme_top = images/arrow_first.png +theme_up = images/arrow_up.png +theme_down = images/arrow_down.png +theme_bottom = images/arrow_last.png +zoom_all = images/mag_100.png +zoom_in = images/mag_zoom_box.png +zoom_out = images/mag_zoom_minus.png +zoom_back = images/mag_zoom_back.png +pan = images/hand.png askThemeRemove = Are you sure that you want to remove the selected theme / themes? discharge_curve = Discharge Curves at Gauges @@ -291,14 +291,14 @@ ring_dike = Ringdike selectFeature = images/selectFeature.png removeFeature = images/removeFeature.png -getFeatureInfo = images/getFeatureInfo.png +getFeatureInfo = images/info.png getFeatureInfoTooltip = Information Tool getFeatureInfoWindowTitle = Informations for Map Layers. addWMS = images/addWMS.png addWMSTooltip = Load layers from external WMS service. adjustElevation = images/adjustElevation.png -measureLine = images/measureLine.png -measurePolygon = images/measurePolygon.png +measureLine = images/measure_line.png +measurePolygon = images/measure_plane.png step = Step calculationStarted = Calculation started. zoomMaxExtent = Max extent
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Mon Apr 02 08:41:09 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Wed Apr 04 07:20:08 2012 +0000 @@ -87,16 +87,16 @@ bfgLogo = images/bfg_logo.gif # Images -downloadPNG = images/downloadPNG.png -downloadPDF = images/downloadPDF.png -downloadSVG = images/downloadSVG.png -downloadCSV = images/save.gif +downloadPNG = images/png_export.png +downloadPDF = images/pdf_export.png +downloadSVG = images/svg_export.png +downloadCSV = images/save.png loadingImg = images/loading.gif cancelCalculation = images/cancelCalculation.png markerRed = images/marker_red.png markerGreen = images/marker_green.png riverMap = images/gewkarte.png -properties_ico = images/properties.gif +properties_ico = images/properties.png dpLabelFrom = Von dpUnitFrom = km @@ -162,16 +162,16 @@ buttonNext = \u00dcbernehmen imageBack = images/back_de.png -imageSave = images/save.gif -theme_top = images/theme_top.png -theme_up = images/theme_up.png -theme_down = images/theme_down.png -theme_bottom = images/theme_bottom.png -zoom_all = images/zoom-1.png -zoom_in = images/zoom-in.png -zoom_out = images/zoom-out.png -zoom_back = images/zoom-back.png -pan = images/pan.png +imageSave = images/save.png +theme_top = images/arrow_first.png +theme_up = images/arrow_up.png +theme_down = images/arrow_down.png +theme_bottom = images/arrow_last.png +zoom_all = images/mag_100.png +zoom_in = images/mag_zoom_box.png +zoom_out = images/mag_zoom_minus.png +zoom_back = images/mag_zoom_back.png +pan = images/hand.png askThemeRemove = Sind Sie sicher, dass sie die gew\u00e4hlten / das gew\u00e4lte Thema l\u00f6eschen wollen? discharge_curve = Abflusskurven an Pegeln @@ -291,14 +291,14 @@ ring_dike = Ringdeich selectFeature = images/selectFeature.png removeFeature = images/removeFeature.png -getFeatureInfo = images/getFeatureInfo.png +getFeatureInfo = images/info.png getFeatureInfoTooltip = Informationswerkzeug getFeatureInfoWindowTitle = Informationen zu Kartenebenen addWMS = images/addWMS.png addWMSTooltip = Laden von Kartenebenen eines externen WMS Dienstes. adjustElevation = images/adjustElevation.png -measureLine = images/measureLine.png -measurePolygon = images/measurePolygon.png +measureLine = images/measure_line.png +measurePolygon = images/measure_plane.png step = Schritt calculationStarted = Berechnung wurde gestarted. zoomMaxExtent = Gesamtausschnitt
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Mon Apr 02 08:41:09 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Wed Apr 04 07:20:08 2012 +0000 @@ -87,16 +87,16 @@ bfgLogo = images/bfg_logo.gif # Images -downloadPNG = images/downloadPNG.png -downloadPDF = images/downloadPDF.png -downloadSVG = images/downloadSVG.png -downloadCSV = images/save.gif +downloadPNG = images/png_export.png +downloadPDF = images/pdf_export.png +downloadSVG = images/svg_export.png +downloadCSV = images/save.png loadingImg = images/loading.gif cancelCalculation = images/cancelCalculation.png markerRed = images/marker_red.png markerGreen = images/marker_green.png riverMap = images/gewkarte.png -properties_ico = images/properties.gif +properties_ico = images/properties.png dpLabelFrom = From dpUnitFrom = km @@ -160,16 +160,16 @@ buttonNext = Next imageBack = images/back_en.png -imageSave = images/save.gif -theme_top = images/theme_top.png -theme_up = images/theme_up.png -theme_down = images/theme_down.png -theme_bottom = images/theme_bottom.png -zoom_all = images/zoom-1.png -zoom_in = images/zoom-in.png -zoom_out = images/zoom-out.png -zoom_back = images/zoom-back.png -pan = images/pan.png +imageSave = images/save.png +theme_top = images/arrow_first.png +theme_up = images/arrow_up.png +theme_down = images/arrow_down.png +theme_bottom = images/arrow_last.png +zoom_all = images/mag_100.png +zoom_in = images/mag_zoom_box.png +zoom_out = images/mag_zoom_minus.png +zoom_back = images/mag_zoom_back.png +pan = images/hand.png askThemeRemove = Are you sure that you want to remove the selected theme / themes? discharge_curve = Discharge Curves at Gauges @@ -289,14 +289,14 @@ ring_dike = Ringdike selectFeature = images/selectFeature.png removeFeature = images/removeFeature.png -getFeatureInfo = images/getFeatureInfo.png +getFeatureInfo = images/info.png getFeatureInfoTooltip = Information Tool getFeatureInfoWindowTitle = Informations for Map Layers. addWMS = images/addWMS.png addWMSTooltip = Load layers from external WMS service. adjustElevation = images/adjustElevation.png -measureLine = images/measureLine.png -measurePolygon = images/measurePolygon.png +measureLine = images/measure_line.png +measurePolygon = images/measure_plane.png step = Step calculationStarted = Calculation started. zoomMaxExtent = Max extent
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java Mon Apr 02 08:41:09 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/chart/ChartToolbar.java Wed Apr 04 07:20:08 2012 +0000 @@ -180,6 +180,7 @@ imgButton.setHeight(20); imgButton.setShowDown(false); imgButton.setShowRollOver(false); + imgButton.setShowRollOverIcon(false); imgButton.setShowDisabled(false); imgButton.setShowDisabledIcon(true); imgButton.setShowDownIcon(false);
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java Mon Apr 02 08:41:09 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MapToolbar.java Wed Apr 04 07:20:08 2012 +0000 @@ -228,6 +228,7 @@ btn.setHeight(20); btn.setShowDown(false); btn.setShowRollOver(false); + btn.setShowRollOverIcon(false); btn.setShowDisabled(false); btn.setShowDisabledIcon(true); btn.setShowDownIcon(false); @@ -252,6 +253,7 @@ btn.setActionType(SelectionType.CHECKBOX); btn.setSize(20); btn.setShowRollOver(false); + btn.setShowRollOverIcon(false); btn.setSelected(false); btn.addClickHandler(new ClickHandler() { public void onClick(ClickEvent e) {
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MeasureControl.java Mon Apr 02 08:41:09 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/map/MeasureControl.java Wed Apr 04 07:20:08 2012 +0000 @@ -91,6 +91,7 @@ btn.setActionType(SelectionType.CHECKBOX); btn.setSize(20); btn.setShowRollOver(false); + btn.setShowRollOverIcon(false); btn.setSelected(false); btn.setTooltip(MSG.measureDistance()); btn.addClickHandler(new ClickHandler() { @@ -133,6 +134,7 @@ btn.setActionType(SelectionType.CHECKBOX); btn.setSize(20); btn.setShowRollOver(false); + btn.setShowRollOverIcon(false); btn.setSelected(false); btn.setTooltip(MSG.measureArea()); btn.addClickHandler(new ClickHandler() {