Skip to content

Commit 4feb58c

Browse files
AlwinEschAlwinEsch
committed
fix settings.xml entry hide in condition type disabled and region changed
1 parent 4e18e36 commit 4feb58c

File tree

1 file changed

+50
-36
lines changed

1 file changed

+50
-36
lines changed

‎pvr.rtlradio/resources/settings.xml.in

+50-36
Original file line numberDiff line numberDiff line change
@@ -205,12 +205,14 @@
205205
<setting id="hdradio_prepend_channel_numbers" type="boolean" label="30117" help="30517">
206206
<dependencies>
207207
<dependency type="enable">
208-
<or>
209-
<condition setting="region_regioncode" operator="is">0</condition>
210-
<condition setting="region_regioncode" operator="is">2</condition>
211-
</or>
208+
<and>
209+
<or>
210+
<condition setting="region_regioncode" operator="is">0</condition>
211+
<condition setting="region_regioncode" operator="is">2</condition>
212+
</or>
213+
<condition setting="hdradio_enable" operator="is">true</condition>
214+
</and>
212215
</dependency>
213-
<dependency type="enable" setting="hdradio_enable">true</dependency>
214216
</dependencies>
215217
<level>0</level>
216218
<default>false</default>
@@ -220,12 +222,14 @@
220222
<setting id="hdradio_output_gain" type="number" label="30109" help="30509">
221223
<dependencies>
222224
<dependency type="enable">
223-
<or>
224-
<condition setting="region_regioncode" operator="is">0</condition>
225-
<condition setting="region_regioncode" operator="is">2</condition>
226-
</or>
225+
<and>
226+
<or>
227+
<condition setting="region_regioncode" operator="is">0</condition>
228+
<condition setting="region_regioncode" operator="is">2</condition>
229+
</or>
230+
<condition setting="hdradio_enable" operator="is">true</condition>
231+
</and>
227232
</dependency>
228-
<dependency type="enable" setting="hdradio_enable">true</dependency>
229233
</dependencies>
230234
<level>0</level>
231235
<default>-3.0</default>
@@ -284,11 +288,13 @@
284288
<setting id="dabradio_coarse_corrector" type="boolean" label="30104" help="30204">
285289
<dependencies>
286290
<dependency type="enable">
287-
<or>
288-
<condition setting="region_regioncode" operator="is">0</condition>
289-
<condition setting="region_regioncode" operator="is">3</condition>
290-
</or>
291-
<dependency type="enable" setting="dabradio_enable">true</dependency>
291+
<and>
292+
<or>
293+
<condition setting="region_regioncode" operator="is">0</condition>
294+
<condition setting="region_regioncode" operator="is">3</condition>
295+
</or>
296+
<condition setting="dabradio_enable" operator="is">true</condition>
297+
</and>
292298
</dependency>
293299
</dependencies>
294300
<level>0</level>
@@ -299,12 +305,14 @@
299305
<setting id="dabradio_coarse_corrector_type" type="integer" label="30113" help="30203">
300306
<dependencies>
301307
<dependency type="enable">
302-
<or>
303-
<condition setting="region_regioncode" operator="is">0</condition>
304-
<condition setting="region_regioncode" operator="is">3</condition>
305-
</or>
306-
<dependency type="enable" setting="dabradio_enable">true</dependency>
307-
<dependency type="enable" setting="dabradio_coarse_corrector">true</dependency>
308+
<and>
309+
<or>
310+
<condition setting="region_regioncode" operator="is">0</condition>
311+
<condition setting="region_regioncode" operator="is">3</condition>
312+
</or>
313+
<condition setting="dabradio_enable" operator="is">true</condition>
314+
<condition setting="dabradio_coarse_corrector" operator="is">true</condition>
315+
</and>
308316
</dependency>
309317
</dependencies>
310318
<level>0</level>
@@ -342,12 +350,14 @@
342350
<setting id="wxradio_sample_rate" type="integer" label="30110" help="30510">
343351
<dependencies>
344352
<dependency type="enable">
345-
<or>
346-
<condition setting="region_regioncode" operator="is">0</condition>
347-
<condition setting="region_regioncode" operator="is">2</condition>
348-
</or>
353+
<and>
354+
<or>
355+
<condition setting="region_regioncode" operator="is">0</condition>
356+
<condition setting="region_regioncode" operator="is">2</condition>
357+
</or>
358+
<condition setting="wxradio_enable" operator="is">true</condition>
359+
</and>
349360
</dependency>
350-
<dependency type="enable" setting="wxradio_enable">true</dependency>
351361
</dependencies>
352362
<level>0</level>
353363
<default>1600000</default>
@@ -369,12 +379,14 @@
369379
<setting id="wxradio_output_samplerate" type="integer" label="30105" help="30505">
370380
<dependencies>
371381
<dependency type="enable">
372-
<or>
373-
<condition setting="region_regioncode" operator="is">0</condition>
374-
<condition setting="region_regioncode" operator="is">2</condition>
375-
</or>
382+
<and>
383+
<or>
384+
<condition setting="region_regioncode" operator="is">0</condition>
385+
<condition setting="region_regioncode" operator="is">2</condition>
386+
</or>
387+
<condition setting="wxradio_enable" operator="is">true</condition>
388+
</and>
376389
</dependency>
377-
<dependency type="enable" setting="wxradio_enable">true</dependency>
378390
</dependencies>
379391
<level>0</level>
380392
<default>48000</default>
@@ -390,12 +402,14 @@
390402
<setting id="wxradio_output_gain" type="number" label="30109" help="30509">
391403
<dependencies>
392404
<dependency type="enable">
393-
<or>
394-
<condition setting="region_regioncode" operator="is">0</condition>
395-
<condition setting="region_regioncode" operator="is">2</condition>
396-
</or>
405+
<and>
406+
<or>
407+
<condition setting="region_regioncode" operator="is">0</condition>
408+
<condition setting="region_regioncode" operator="is">2</condition>
409+
</or>
410+
<condition setting="wxradio_enable" operator="is">true</condition>
411+
</and>
397412
</dependency>
398-
<dependency type="enable" setting="wxradio_enable">true</dependency>
399413
</dependencies>
400414
<level>0</level>
401415
<default>-3.0</default>

0 commit comments

Comments
 (0)