Mercurial > dive4elements > river

changeset 3700:dbcd14c27c8d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Transparency attribute theme fixes flys-client/trunk@5413 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author Christian Lins <christian.lins@intevation.de>
date Sun, 09 Sep 2012 21:02:54 +0000
parents 42cd7df8d989
children 6288056e2673
files flys-client/ChangeLog flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java
diffstat 6 files changed, 28 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/flys-client/ChangeLog	Sun Sep 09 10:53:17 2012 +0000
+++ b/flys-client/ChangeLog	Sun Sep 09 21:02:54 2012 +0000
@@ -1,3 +1,14 @@
+2012-09-09	Christian Lins	<christian.lins@intevation.de>
+
+	* src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants.java,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants.properties,
+	  src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java,
+	  src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties:
+	  Rename attribute 'alpha' to 'transparency' which now represents the 
+	  transparency percentage instead raw rgba alpha value. StyledEditorWindow
+	  can now handle this transparency attribute.
+
 2012-09-09	Christian Lins	<christian.lins@intevation.de>
 
 	* src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties,
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Sun Sep 09 10:53:17 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.java	Sun Sep 09 21:02:54 2012 +0000
@@ -931,7 +931,7 @@
 
     String transparent();
 
-    String alpha();
+    String transparency();
 
     String showarea();
 
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Sun Sep 09 10:53:17 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants.properties	Sun Sep 09 21:02:54 2012 +0000
@@ -476,7 +476,7 @@
 showmaximum = Show maximum
 showborder = Show line
 transparent = Transparency
-alpha = Transparency Alpha
+transparency = Transparency
 showarea = Show Area
 showmiddleheight = Show middle depth
 fillcolor = Fill Color
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Sun Sep 09 10:53:17 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_de.properties	Sun Sep 09 21:02:54 2012 +0000
@@ -475,8 +475,8 @@
 showminimum = Minimum anzeigen
 showmaximum = Maximum anzeigen
 showborder = Linie anzeigen
-transparent = Transparenz
-alpha = Alpha-Transparenzwert
+transparent = Transparent
+transparency = Transparenz
 showarea = Fl\u00e4che beschriften
 showmiddleheight = Mittlere Tiefe anzeigen
 fillcolor = F\u00fcllfarbe
--- a/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Sun Sep 09 10:53:17 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/FLYSConstants_en.properties	Sun Sep 09 21:02:54 2012 +0000
@@ -477,7 +477,7 @@
 showmaximum = Show maximum
 showborder = Show line
 transparent = Transparency
-alpha = Transparency Alpha
+transparency = Transparency
 showarea = Show Area
 showmiddleheight = Show middle depth
 fillcolor = Fill Color
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java	Sun Sep 09 10:53:17 2012 +0000
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/StyleEditorWindow.java	Sun Sep 09 21:02:54 2012 +0000
@@ -366,6 +366,7 @@
             f = new SelectItem(name, MSG.getString(name));
             if (name.equals("linesize")) {
                 f = createLineSizeUI(f);
+                f.setValue(value);
             }
             else if (name.equals("labelfontsize")) {
                 LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>();
@@ -378,6 +379,7 @@
                 valueMap.put("18", "18");
                 valueMap.put("24", "24");
                 f.setValueMap(valueMap);
+                f.setValue(value);
             }
             else if (name.equals("bandwidth")) {
                 LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>();
@@ -394,6 +396,7 @@
                 valueMap.put("10", "10");
                 valueMap.put("11", "11");
                 f.setValueMap(valueMap);
+                f.setValue(value);
             }
             else if (name.equals("pointsize")) {
                 LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>();
@@ -405,8 +408,16 @@
                 valueMap.put("6", "6");
                 valueMap.put("7", "7");
                 f.setValueMap(valueMap);
+                f.setValue(value);
             }
-            f.setValue(value);
+            else if (name.equals("transparency")) {
+                LinkedHashMap<String, String> valueMap = new LinkedHashMap<String, String>();
+                for (int n = 10; n < 100; n += 10) {
+                    valueMap.put(Integer.toString(n), n + "%");
+                }
+                f.setValueMap(valueMap);
+                f.setValue(value + "%");
+            }
         }
         else if (type.equals("boolean")) {
             if(name.equals("textorientation")) {
http://dive4elements.wald.intevation.org