summaryrefslogtreecommitdiff
path: root/vdrmanager/de.bjusystems.vdrmanager/src/main/res/xml
diff options
context:
space:
mode:
authorlado <herrlado@gmail.com>2019-10-10 23:02:42 +0200
committerlado <herrlado@gmail.com>2019-10-10 23:02:42 +0200
commit3a8b944ee18ae2db7e60bce1fb600d2b0ce6428c (patch)
tree221a9b2a925c1df63eb6ad83461fbf810cc55cf1 /vdrmanager/de.bjusystems.vdrmanager/src/main/res/xml
parentc2ce599d38e1ea8027df0fb7b5b76d0d42432db5 (diff)
parent0398f105bcc166d2695f3b8b2f91327c04acca48 (diff)
downloadvdr-manager-master.tar.gz
vdr-manager-master.tar.bz2
Merge branch 'master' of ssh://projects.vdr-developer.org/vdr-managerHEADmaster
Diffstat (limited to 'vdrmanager/de.bjusystems.vdrmanager/src/main/res/xml')
-rw-r--r--vdrmanager/de.bjusystems.vdrmanager/src/main/res/xml/vdr_prefs.xml21
1 files changed, 18 insertions, 3 deletions
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/xml/vdr_prefs.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/xml/vdr_prefs.xml
index 5c6e8b1..b221b3f 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/xml/vdr_prefs.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/xml/vdr_prefs.xml
@@ -32,6 +32,15 @@
android:enabled="true"
android:summary="@string/vdr_ssl_summary"
android:title="@string/vdr_ssl_title" />
+
+ <ListPreference
+ android:entries="@array/vdr_ip46_mode"
+ android:entryValues="@array/vdr_ip46_mode_values"
+ android:defaultValue="ip4_only"
+ android:key="vdr_ip46_mode"
+ android:title="@string/vdr_ip46_mode_title"
+ android:summary="@string/vdr_ip46_mode_summary"/>
+
</PreferenceCategory>
<PreferenceCategory
android:key="filter_preferences"
@@ -202,15 +211,21 @@
android:key="key_remote_enable"
android:summary="@string/remote_enable_summary"
android:title="@string/remote_enable_title" />
-
- <EditTextPreference
+
+ <EditTextPreference
+ android:inputType="text"
+ android:dependency="key_remote_enable"
+ android:key="key_svdrp_host"
+ android:summary="@string/svdrp_host_summary"
+ android:title="@string/svdrp_host_title"/>
+ <EditTextPreference
android:inputType="number"
android:key="key_svdrp_port"
android:dependency="key_remote_enable"
android:summary="@string/svdrp_port_summary"
android:defaultValue="@integer/svdrp_default_port"
android:title="@string/svdrp_port_title" />
-
+
</PreferenceCategory>
<PreferenceScreen android:title="Advanced" >