# HG changeset patch # User Raimund Renkert # Date 1362066016 -3600 # Node ID 2c31625d4e6afb047cda8b9bab0ecbe8d22c961b # Parent d25eebfc5cee063a62dbc40f31348d471d8ab898 New icons! Use the new icons in project list and for export buttons. diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Thu Feb 28 16:16:04 2013 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java Thu Feb 28 16:40:16 2013 +0100 @@ -286,6 +286,10 @@ String footerImpressum(); + String projectListMin(); + + String projectListAdd(); + String buttonNext(); String imageBack(); @@ -326,6 +330,10 @@ String downloadCSV(); + String downloadAT(); + + String downloadWST(); + String loadingImg(); String cancelCalculation(); diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Thu Feb 28 16:16:04 2013 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties Thu Feb 28 16:40:16 2013 +0100 @@ -98,7 +98,10 @@ downloadPNG = images/png_export.png downloadPDF = images/pdf_export.png downloadSVG = images/svg_export.png -downloadCSV = images/save.png +downloadCSV = images/save_csv.png +downloadAT = images/save_at.png +downloadWST = images/save_wst.png +loadingImg = images/loading.gif loadingImg = images/loading.gif cancelCalculation = images/cancelCalculation.png markerRed = images/marker_red.png @@ -186,13 +189,15 @@ footerContact = Contact footerImpressum = Legal info +projectListMin = format-indent-less.png +projectListAdd = list-add.png buttonNext = Next imageBack = images/back_en.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 +theme_top = images/go-first.png +theme_up = images/go-up.png +theme_down = images/go-down.png +theme_bottom = images/go-bottom.png zoom_all = images/mag_100.png zoom_in = images/mag_zoom_box.png zoom_out = images/mag_zoom_minus.png diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Thu Feb 28 16:16:04 2013 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Thu Feb 28 16:40:16 2013 +0100 @@ -99,7 +99,9 @@ downloadPNG = images/png_export.png downloadPDF = images/pdf_export.png downloadSVG = images/svg_export.png -downloadCSV = images/save.png +downloadCSV = images/save_csv.png +downloadAT = images/save_at.png +downloadWST = images/save_wst.png loadingImg = images/loading.gif cancelCalculation = images/cancelCalculation.png markerRed = images/marker_red.png @@ -174,13 +176,15 @@ footerContact = Kontakt footerImpressum = Impressum +projectListMin = format-indent-less.png +projectListAdd = list-add.png buttonNext = \u00dcbernehmen imageBack = images/back_de.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 +theme_top = images/go-first.png +theme_up = images/go-up.png +theme_down = images/go-down.png +theme_bottom = images/go-bottom.png zoom_all = images/mag_100.png zoom_in = images/mag_zoom_box.png zoom_out = images/mag_zoom_minus.png diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties --- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Thu Feb 28 16:16:04 2013 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties Thu Feb 28 16:40:16 2013 +0100 @@ -100,6 +100,9 @@ downloadPDF = images/pdf_export.png downloadSVG = images/svg_export.png downloadCSV = images/save.png +downloadAT = images/save_at.png +downloadWST = images/save_wst.png +loadingImg = images/loading.gif loadingImg = images/loading.gif cancelCalculation = images/cancelCalculation.png markerRed = images/marker_red.png @@ -187,13 +190,15 @@ footerContact = Contact footerImpressum = Legal info +projectListMin = format-indent-less.png +projectListAdd = list-add.png buttonNext = Next imageBack = images/back_en.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 +theme_top = images/go-first.png +theme_up = images/go-up.png +theme_down = images/go-down.png +theme_bottom = images/go-bottom.png zoom_all = images/mag_100.png zoom_in = images/mag_zoom_box.png zoom_out = images/mag_zoom_minus.png diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/java/de/intevation/flys/client/client/ui/ExportPanel.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ExportPanel.java Thu Feb 28 16:16:04 2013 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ExportPanel.java Thu Feb 28 16:40:16 2013 +0100 @@ -101,9 +101,23 @@ String filename ) { String url = getExportUrl(name, facet, filename); - String iUrl = GWT.getHostPageBaseURL() + MSG.imageSave(); - - ImgLink link = new ImgLink(iUrl, url, 30, 30); + String imgUrl = GWT.getHostPageBaseURL(); + if (facet.equals("pdf")) { + imgUrl += MSG.downloadPDF(); + } + else if (facet.equals("at")) { + imgUrl += MSG.downloadAT(); + } + else if (facet.equals("wst")) { + imgUrl += MSG.downloadWST(); + } + else if (facet.equals("csv")) { + imgUrl += MSG.downloadCSV(); + } + else { + imgUrl += MSG.imageSave(); + } + ImgLink link = new ImgLink(imgUrl, url, 30, 30); link.setTooltip(getTooltipText(name, facet)); return link; diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java --- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java Thu Feb 28 16:16:04 2013 +0100 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ProjectList.java Thu Feb 28 16:40:16 2013 +0100 @@ -1,11 +1,9 @@ package de.intevation.flys.client.client.ui; import com.google.gwt.core.client.GWT; -import com.google.gwt.event.dom.client.ClickEvent; import com.google.gwt.i18n.client.DateTimeFormat; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; -import com.google.gwt.user.client.ui.Button; import com.smartgwt.client.types.Alignment; import com.smartgwt.client.types.Autofit; @@ -19,7 +17,10 @@ import com.smartgwt.client.util.BooleanCallback; import com.smartgwt.client.util.SC; import com.smartgwt.client.widgets.Canvas; +import com.smartgwt.client.widgets.IconButton; +import com.smartgwt.client.widgets.ImgButton; import com.smartgwt.client.widgets.Label; +import com.smartgwt.client.widgets.events.ClickEvent; import com.smartgwt.client.widgets.events.VisibilityChangedEvent; import com.smartgwt.client.widgets.events.VisibilityChangedHandler; import com.smartgwt.client.widgets.grid.CellFormatter; @@ -383,14 +384,14 @@ HLayout buttonWrapper = new HLayout(); - Button addButton = new Button("+"); - addButton.setStyleName("projectsAddButton"); - addButton.setTitle(messages.new_project()); + IconButton addButton = new IconButton(""); + addButton.setIcon(messages.projectListAdd()); + addButton.setTooltip(messages.new_project()); addButton.setWidth("30px"); - Button closeButton = new Button("X"); - closeButton.setStyleName("projectsCloseButton"); - closeButton.setTitle(messages.projectlist_close()); + IconButton closeButton = new IconButton(""); + closeButton.setIcon(messages.projectListMin()); + closeButton.setTooltip(messages.projectlist_close()); closeButton.setWidth("30px"); buttonWrapper.addMember(addButton); @@ -420,7 +421,7 @@ addMember(filterpanel); addButton.addClickHandler( - new com.google.gwt.event.dom.client.ClickHandler() { + new com.smartgwt.client.widgets.events.ClickHandler() { @Override public void onClick(ClickEvent ev) { @@ -429,7 +430,7 @@ }); closeButton.addClickHandler( - new com.google.gwt.event.dom.client.ClickHandler() { + new com.smartgwt.client.widgets.events.ClickHandler() { @Override public void onClick(ClickEvent ev) { diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/arrow_down.png Binary file flys-client/src/main/webapp/images/arrow_down.png has changed diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/arrow_first.png Binary file flys-client/src/main/webapp/images/arrow_first.png has changed diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/arrow_last.png Binary file flys-client/src/main/webapp/images/arrow_last.png has changed diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/arrow_up.png Binary file flys-client/src/main/webapp/images/arrow_up.png has changed diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/format-indent-less.png Binary file flys-client/src/main/webapp/images/format-indent-less.png has changed diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/go-bottom.png Binary file flys-client/src/main/webapp/images/go-bottom.png has changed diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/go-down.png Binary file flys-client/src/main/webapp/images/go-down.png has changed diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/go-first.png Binary file flys-client/src/main/webapp/images/go-first.png has changed diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/go-up.png Binary file flys-client/src/main/webapp/images/go-up.png has changed diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/list-add.png Binary file flys-client/src/main/webapp/images/list-add.png has changed diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/save_at.png Binary file flys-client/src/main/webapp/images/save_at.png has changed diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/save_csv.png Binary file flys-client/src/main/webapp/images/save_csv.png has changed diff -r d25eebfc5cee -r 2c31625d4e6a flys-client/src/main/webapp/images/save_wst.png Binary file flys-client/src/main/webapp/images/save_wst.png has changed