Mercurial > dive4elements > river
changeset 3543:14774fb42054
Issue 808.
Updated wq input in winfo module.
flys-client/trunk@5356 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Tue, 04 Sep 2012 12:10:01 +0000 |
| parents | 9647a6548320 |
| children | 3a2ea5e14c76 |
| files | flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/QDTable.java |
| diffstat | 4 files changed, 38 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/flys-client/ChangeLog Tue Sep 04 11:08:15 2012 +0000 +++ b/flys-client/ChangeLog Tue Sep 04 12:10:01 2012 +0000 @@ -1,3 +1,16 @@ +2012-09-04 Raimund Renkert <raimund.renkert@intevation.de> + + Issue 808. + + * src/main/java/de/intevation/flys/client/client/ui/wq/QDTable.java: + Added new row for single selection and set field titles. + + * src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java: + Show the single selection row on init. + + * src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties: + Updated i18n strings. + 2012-09-04 Raimund Renkert <raimund.renkert@intevation.de> Issue 664.
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Tue Sep 04 11:08:15 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties Tue Sep 04 12:10:01 2012 +0000 @@ -495,7 +495,7 @@ editpoints = Eintr\u00e4ge editieren addWSP = Neues WSP Thema anlegen addWSPButton = WSP Thema -selection = Selektion +selection = Auswahl # Reference Curves reference_curve = Bezugslinie
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java Tue Sep 04 11:08:15 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/WQInputPanel.java Tue Sep 04 12:10:01 2012 +0000 @@ -282,6 +282,7 @@ Tab wTab = new Tab(MESSAGE.wq_table_w()); Tab qTab = new Tab(MESSAGE.wq_table_q()); + qdTable.showSelect(); wTab.setPane(wTable); qTab.setPane(qdTable); @@ -1294,6 +1295,13 @@ qdTable.showIconFields(); } + if (!isRange) { + qdTable.showSelect(); + } + else { + qdTable.showIconFields(); + } + updatePanels(isQ, isFree, isRange); }
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/QDTable.java Tue Sep 04 11:08:15 2012 +0000 +++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/wq/QDTable.java Tue Sep 04 12:10:01 2012 +0000 @@ -36,16 +36,21 @@ setShowRecordComponentsByCell(true); setEmptyMessage(MESSAGE.empty_table()); - ListGridField addMax = new ListGridField("max", ""); + ListGridField addMax = new ListGridField("max", MESSAGE.from()); addMax.setType(ListGridFieldType.ICON); addMax.setWidth(30); addMax.setCellIcon(baseUrl + MESSAGE.markerRed()); - ListGridField addMin = new ListGridField("min", ""); + ListGridField addMin = new ListGridField("min", MESSAGE.to()); addMin.setType(ListGridFieldType.ICON); addMin.setWidth(30); addMin.setCellIcon(baseUrl + MESSAGE.markerGreen()); + ListGridField select = new ListGridField("select", MESSAGE.selection()); + select.setType(ListGridFieldType.ICON); + select.setWidth(70); + select.setCellIcon(baseUrl + MESSAGE.markerGreen()); + ListGridField name = new ListGridField("name", MESSAGE.discharge()); name.setType(ListGridFieldType.TEXT); name.setWidth("*"); @@ -76,12 +81,13 @@ }); value.setWidth("20%"); - setFields(addMax, addMin, name, type, value); + setFields(addMax, addMin, select, name, type, value); } public void hideIconFields () { hideField("max"); hideField("min"); + hideField("select"); lockClick = true; } @@ -89,9 +95,16 @@ public void showIconFields() { showField("max"); showField("min"); + hideField("select"); lockClick = false; } + public void showSelect() { + showField("select"); + hideField("max"); + hideField("min"); + } + public boolean isLocked() { return lockClick; }