Index: trunk/data/defaultpresets.xml
===================================================================
--- trunk/data/defaultpresets.xml	(revision 5157)
+++ trunk/data/defaultpresets.xml	(revision 5158)
@@ -40,11 +40,9 @@
   display_values: comma separated list of values to be displayed instead of the
                   database values, order and number must be equal to values
-  short_description: comma separated list of texts to be displayed below each
-                    display_value. (Only if it is not possible to describe 
-                    the entry in 2-3 words.) Instead of comma separeted list, you can
-                    also write it in the following form: 
-                        <short_description>first description</short_description>
-                                ...
-                        <short_description>last description</short_description>
+  short_descriptions: comma separated list of texts to be displayed below each
+                      display_value. (Only if it is not possible to describe
+                      the entry in 2-3 words.) Instead of comma separeted list
+  instead using values, display_values and short_descriptions, the following form is also supported:
+    <list_item value="" display_value="' short_description="" icon=""/>
   default: default string to display (defaults to "")
   use_last_as_default: true/false/force (default is "false")
@@ -60,11 +58,9 @@
   display_values: delimiter-separated list of values to be displayed instead of the
                   database values, order and number must be equal to values
-  short_description: delimiter-separated list of texts to be displayed below each
-                    display_value. (Only if it is not possible to describe 
-                    the entry in 2-3 words.) Instead of a separated list, you can
-                    also write it in the following form: 
-                        <short_description>first description</short_description>
-                                ...
-                        <short_description>last description</short_description>
+  short_descriptions: delimiter-separated list of texts to be displayed below each
+                     display_value. (Only if it is not possible to describe
+                     the entry in 2-3 words.) Instead of a separated list
+  instead using values, display_values and short_descriptions, the following form is also supported:
+    <list_item value="" display_value="' short_description="" icon=""/>
   default: default string to display (defaults to "")
   use_last_as_default: true/false/force (default is "false")
@@ -700,11 +696,11 @@
             <optional>
                 <text key="name" text="Name" />
-                <combo key="sac_scale" text="SAC Scale" values="hiking,mountain_hiking,demanding_mountain_hiking,alpine_hiking,demanding_alpine_hiking,difficult_alpine_hiking" display_values="T1 - hiking trail,T2 - mountain hiking trail,T3 - difficult\, exposed hiking trail,T4 - difficult\, exposed\, steep alpine trail,T5 - difficult alpine trail with climbing,T6 - hazardous alpine trail with climbing">
-                    <short_description>Trail well cleared. Area flat or slightly sloped, no fall hazard</short_description>
-                    <short_description>Trail with continuous line and balanced ascent. Terrain partially steep, fall hazard possible</short_description>
-                    <short_description>exposed sites may be secured with ropes or chains, possible need to use hands for balance. Partly exposed sites with fall hazard, scree, pathless jagged rocks</short_description>
-                    <short_description>sometimes need for hand use to get ahead. Terrain quite exposed, precarious grassy acclivities, jagged rocks, facile snow-free glaciers.</short_description>
-                    <short_description>single plainly climbing up to second grade. Exposed, demanding terrain, jagged rocks, few dangerous glacier and snow</short_description>
-                    <short_description>climbing up to second grade. Often very exposed, precarious jagged rocks, glacier with danger to slip and fall</short_description>
+                <combo key="sac_scale" text="SAC Scale">
+                    <list_entry value="hiking" display_value="T1 - hiking trail" short_description="Trail well cleared. Area flat or slightly sloped, no fall hazard" />
+                    <list_entry value="mountain_hiking" display_value="T2 - mountain hiking trail" short_description="Trail with continuous line and balanced ascent. Terrain partially steep, fall hazard possible" />
+                    <list_entry value="demanding_mountain_hiking" display_value="T3 - difficult, exposed hiking trail" short_description="exposed sites may be secured with ropes or chains, possible need to use hands for balance. Partly exposed sites with fall hazard, scree, pathless jagged rocks" />
+                    <list_entry value="alpine_hiking" display_value="T4 - difficult, exposed, steep alpine trail" short_description="sometimes need for hand use to get ahead. Terrain quite exposed, precarious grassy acclivities, jagged rocks, facile snow-free glaciers" />
+                    <list_entry value="demanding_alpine_hiking" display_value="T5 - difficult alpine trail with climbing" short_description="single plainly climbing up to second grade. Exposed, demanding terrain, jagged rocks, few dangerous glacier and snow" />
+                    <list_entry value="difficult_alpine_hiking" display_value="T6 - hazardous alpine trail with climbing" short_description="climbing up to second grade. Often very exposed, precarious jagged rocks, glacier with danger to slip and fall" />
                 </combo>
                 <combo key="mtb:scale" text="MTB Scale" values="0,1,2,3,4,5" />
Index: trunk/data/tagging-preset.xsd
===================================================================
--- trunk/data/tagging-preset.xsd	(revision 5157)
+++ trunk/data/tagging-preset.xsd	(revision 5158)
@@ -126,13 +126,20 @@
 	</complexType>
 
+        <complexType name="list_entry">
+		<attribute name="value" type="string" use="required" />
+		<attribute name="display_value" type="string" />
+		<attribute name="short_description" type="string" />
+		<attribute name="icon" type="string" />
+	</complexType>
+
 	<complexType name="combo">
-		<sequence>
-			<element name="short_description" type="string" minOccurs="0"
-				maxOccurs="unbounded" />
-		</sequence>
-		<attribute name="key" type="string" use="required" />
-		<attribute name="text" type="string" />
-		<attribute name="text_context" type="string" />
-		<attribute name="values" type="string" use="required" />
+		<!-- use either list_entry's or a combination of values/display_values -->
+		<sequence>
+			<element name="list_entry" type="tns:list_entry" minOccurs="0" maxOccurs="unbounded" />
+		</sequence>
+		<attribute name="key" type="string" use="required" />
+		<attribute name="text" type="string" />
+		<attribute name="text_context" type="string" />
+		<attribute name="values" type="string" />
 		<attribute name="values_context" type="string" />
 		<attribute name="display_values" type="string" />