Changeset 6114 in josm for trunk/data

Timestamp:

2013-08-06T23:48:20+02:00 (11 years ago)

Author:

Don-vip

Message:

fix #8735 - Presets: add new checkgroup item to specify group of checkboxes on multiple columns

Location:

trunk/data

Files:

• defaultpresets.xml (modified) (2 diffs)
• tagging-preset.xsd (modified) (2 diffs)

trunk/data/defaultpresets.xml

@@ -89 +89 @@
   match: none/key/key!/keyvalue (default is "none", see below for more information)
 
+checkgroup: group of checks
+  columns: number of columns
+
 check: checkbox
   key: key to set
@@ -2427 +2430 @@
                 <combo key="shop" text="With shop" values="yes,convenience,kiosk,no" />
                 <label text="Fuel types:" />
-                <check key="fuel:diesel" text="Diesel" default="off" />
-                <check key="fuel:biodiesel" text="Bio Diesel" default="off" />
-                <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" />
-                <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" />
-                <check key="fuel:octane_80" text="Octane 80" default="off" />
-                <check key="fuel:octane_91" text="Octane 91" default="off" />
-                <check key="fuel:octane_92" text="Octane 92" default="off" />
-                <check key="fuel:octane_95" text="Octane 95" default="off" />
-                <check key="fuel:octane_98" text="Octane 98" default="off" />
-                <check key="fuel:octane_100" text="Octane 100" default="off" />
-                <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" />
-                <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" />
-                <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" default="off" />
-                <check key="fuel:cng" text="CNG (Compressed Natural Gas)" default="off" />
-                <check key="fuel:1_25" text="1/25 mix (mofa/moped)" default="off" />
-                <check key="fuel:1_50" text="1/50 mix (mofa/moped)" default="off" />
+                <checkgroup columns="2">
+                    <check key="fuel:diesel" text="Diesel" default="off" />
+                    <check key="fuel:biodiesel" text="Bio Diesel" default="off" />
+                    <check key="fuel:GTL_diesel" text="Diesel (Gas To Liquid - ultimate diesel)" default="off" />
+                    <check key="fuel:HGV_diesel" text="Diesel for Heavy Good Vehicles" default="off" />
+                    <check key="fuel:octane_80" text="Octane 80" default="off" />
+                    <check key="fuel:octane_91" text="Octane 91" default="off" />
+                    <check key="fuel:octane_92" text="Octane 92" default="off" />
+                    <check key="fuel:octane_95" text="Octane 95" default="off" />
+                    <check key="fuel:octane_98" text="Octane 98" default="off" />
+                    <check key="fuel:octane_100" text="Octane 100" default="off" />
+                    <check key="fuel:e10" text="E10 (10% Ethanol mix)" default="off" />
+                    <check key="fuel:e85" text="E85 (85% Ethanol mix)" default="off" />
+                    <check key="fuel:lpg" text="LPG (Liquefied petroleum gas)" default="off" />
+                    <check key="fuel:cng" text="CNG (Compressed Natural Gas)" default="off" />
+                    <check key="fuel:1_25" text="1/25 mix (mofa/moped)" default="off" />
+                    <check key="fuel:1_50" text="1/50 mix (mofa/moped)" default="off" />
+                </checkgroup>
             </optional>
         </item>

trunk/data/tagging-preset.xsd

@@ -81 +81 @@
                         <element name="combo" type="tns:combo" />
                         <element name="multiselect" type="tns:multiselect" />
+            <element name="checkgroup" type="tns:checkgroup" />
                         <element name="check" type="tns:check" />
                 </choice>
@@ -189 +190 @@
         </complexType>
 
+    <complexType name="checkgroup">
+        <sequence>
+            <choice minOccurs="1" maxOccurs="unbounded">
+                <element name="check" type="tns:check" />
+            </choice>
+        </sequence>
+        <attribute name="columns" type="positiveInteger" />
+        <anyAttribute processContents="skip" />
+    </complexType>
+
         <complexType name="check">
                 <attribute name="key" type="string" use="required" />