Merge branch 'master' of ssh://projects.vdr-developer.org/vdr-managerHEADmaster

8 files changed, 58 insertions, 12 deletions

diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-de/strings.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-de/strings.xml
index 3ba27fa..7a7d365 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-de/strings.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-de/strings.xml
@@ -137,6 +137,8 @@ herrlado&lt;herrlado@gmail.com&gt;</string>
   <string name="vdr_password_summary">Passwort für das VDR Plugin</string>
   <string name="vdr_ssl_title">Sichere Verbindung</string>
   <string name="vdr_ssl_summary">Verwende SSL für Verbindungen (aktuell nicht implementiert)</string>
+  <string name="vdr_ip46_mode_title">IPv4/6 Auswahl</string>
+  <string name="vdr_ip46_mode_summary">IPv4/6 Auswahl-Modus</string>
   <!-- channel filter preferences -->
   <string name="channel_filter_preferences">Kanaleinstellungen</string>
   <string name="channel_filter_filter_title">Begrenze Kanäle</string>
@@ -493,8 +495,10 @@ Wie soll verfahren werden?</string>
   <string name="remote">Remote Control</string>
   <string name="remote_enable_summary">Shows the remote control view if enabled</string>
   <string name="remote_enable_title">Enable VDR remote control</string>
+  <string name="svdrp_host_title">SVDRP Hostname</string>
+  <string name="svdrp_host_summary">Standard ist der VDR Host</string>
   <string name="svdrp_port_title">SVDRP Port</string>
-  <string name="svdrp_port_summary">Default is 6419</string>
+  <string name="svdrp_port_summary">Standard ist 6419</string>
   <string name="label">Label</string>
   <string name="hitkcommand">HITK Command</string>
   <string name="menu_reset">Reset</string>
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-fr/strings.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-fr/strings.xml
index f7087cb..1816cef 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-fr/strings.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-fr/strings.xml
@@ -493,7 +493,9 @@ Que voulez-vous faire?</string>
   <string name="remote">Télécommande</string>
   <string name="remote_enable_summary">Afficher la télécommande si activée</string>
   <string name="remote_enable_title">Activer la télécommande de VDR</string>
-  <string name="svdrp_port_title">Port DVDRP</string>
+  <string name="svdrp_host_title">Hôte SVDRP</string>
+  <string name="svdrp_host_summary">Hôte SVDRP</string>
+  <string name="svdrp_port_title">Port SVDRP</string>
   <string name="svdrp_port_summary">Par défaut le 6419</string>
   <string name="label">Label</string>
   <string name="hitkcommand">HITK Command</string>
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-it/strings.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-it/strings.xml
index 01575cb..b815bda 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-it/strings.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-it/strings.xml
@@ -493,6 +493,8 @@ What do you want to do?</string>
   <string name="remote">Remote Control</string>
   <string name="remote_enable_summary">Shows the remote control view if enabled</string>
   <string name="remote_enable_title">Enable VDR remote control</string>
+  <string name="svdrp_host_title">SVDRP Nome sistema/IP</string>
+  <string name="svdrp_host_summary">Default is VDR host</string>
   <string name="svdrp_port_title">SVDRP Port</string>
   <string name="svdrp_port_summary">Default is 6419</string>
   <string name="label">Label</string>
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-pl/strings.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-pl/strings.xml
index a4338a4..e71e1a7 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-pl/strings.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-pl/strings.xml
@@ -489,6 +489,8 @@ What do you want to do?</string>
   <string name="remote">Remote Control</string>
   <string name="remote_enable_summary">Shows the remote control view if enabled</string>
   <string name="remote_enable_title">Enable VDR remote control</string>
+  <string name="svdrp_host_title">Nazwa hosta SVDRP</string>
+  <string name="svdrp_host_summary">Default is VDR host</string>
   <string name="svdrp_port_title">SVDRP Port</string>
   <string name="svdrp_port_summary">Default is 6419</string>
 </resources>
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-uk/strings.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-uk/strings.xml
index 46dc34f..bf88f86 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-uk/strings.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values-uk/strings.xml
@@ -491,6 +491,8 @@ What do you want to do?</string>
   <string name="remote">Remote Control</string>
   <string name="remote_enable_summary">Shows the remote control view if enabled</string>
   <string name="remote_enable_title">Enable VDR remote control</string>
+  <string name="svdrp_host_title">SVDRP Host</string>
+  <string name="svdrp_host_summary">Default is vdr host</string>
   <string name="svdrp_port_title">SVDRP Port</string>
   <string name="svdrp_port_summary">Default is 6419</string>
   <string name="label">Label</string>
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml
index 94d1831..e43e39e 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/arrays.xml
@@ -37,16 +37,23 @@
         <item>vdr-smarttvweb</item>
     </string-array>
 
-    <string-array name="recent_channels_order_entry_values">
-        <item>most</item>
-        <item>last</item>
-    </string-array>
-    <array name="recstream_smarttvweb_entry_values">
-        <item>progressive</item>
+  <string-array name="recent_channels_order_entry_values">
+    <item>most</item>
+    <item>last</item>
+  </string-array>
+  <array name="recstream_smarttvweb_entry_values">
+      	<item>progressive</item>
         <item>has</item>
         <item>hls</item>
-    </array>
+      </array>
+  
 
+    <string-array name="vdr_ip46_mode_values">
+        <item>ip4</item>
+        <item>ip6</item>
+        <item>ip46</item>
+        <item>ip64</item>
+    </string-array>
     <string-array name="font">
         <item> 500px </item>
         <item> address-book </item>
@@ -836,4 +843,5 @@
         <item> youtube-square </item>
     </string-array>
 
+
 </resources>
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml
index 433f581..0ff0cd0 100644
--- a/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml
+++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/res/values/strings.xml
@@ -148,6 +148,15 @@
     <string name="vdr_password_summary">Password for the VDR plugin</string>
     <string name="vdr_ssl_title">Secure connect</string>
     <string name="vdr_ssl_summary">Use SSL for connections</string>
+    <string name="vdr_ip46_mode_title">IPv4/6 selection</string>
+    <string name="vdr_ip46_mode_summary">IPv4/6 selection mode</string>
+
+    <string-array name="vdr_ip46_mode">
+        <item>Use only IPv4</item>
+        <item>Use only IPv6</item>
+        <item>Prefer IPv4 over IPv6</item>
+        <item>Prefer IPv6 over IPv4</item>
+    </string-array>
 
     <!-- channel filter preferences -->
     <string name="channel_filter_preferences">Channel settings</string>
@@ -547,6 +556,8 @@
     <string name="remote_enable_title">Enable VDR remote control</string>
     <string name="svdrp_port_title">SVDRP Port</string>
     <string name="svdrp_port_summary">Default is 6419</string>
+    <string name="svdrp_host_title">SVDRP Host</string>
+    <string name="svdrp_host_summary">Default is vdr host</string>
     <string name="label">Label</string>
     <string name="hitkcommand">HITK Command</string>
     <string name="menu_reset">Reset</string>
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" >