new prefs, wol, wol mac, etc

2 files changed, 167 insertions, 181 deletions

diff --git a/vdrmanager/res/values/preferences.xml b/vdrmanager/res/values/preferences.xml
index 36a5e1a..3a3402f 100644
--- a/vdrmanager/res/values/preferences.xml
+++ b/vdrmanager/res/values/preferences.xml
@@ -1,47 +1,81 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-  
-  <!-- VDR plugin preferences -->
-  <string name="vdr_preferences">Network settings</string>
-  <string name="vdr_host_title">VDR host</string>
-  <string name="vdr_host_summary">Host running VDR</string>
-  <string name="vdr_port_title">VDR plugin port </string>
-  <string name="vdr_port_summary">Port for connections to VDR plugin</string>
-  <string name="vdr_port_default">6420</string>
-  <string name="vdr_password_title">VDR plugin password</string>
-  <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>
-  
-  <!-- channel filter preferences -->
-  <string name="channel_filter_preferences">Channel settings</string>
-  <string name="channel_filter_filter_title">Limit channels</string>
-  <string name="channel_filter_filter_summary">Use only given channels</string>
-  <string name="channel_filter_last_title">Channels</string>
-  <string name="channel_filter_last_summary">Channels to use</string>
-  
-  <!-- wakeup -->
-  <string name="wakeup_preferences">Remote VDR host wakeup</string>
-  <string name="wakeup_enabled_title">Can remote wakeup VDR</string>
-  <string name="wakeup_enabled_summary">Enables to remote wakeup the VDR host</string>
-  <string name="wakeup_url_title">URL for remote wakeup</string>
-  <string name="wakeup_url_summary">URL for a request doing the wakeup</string>
-  <string name="wakeup_user_title">Wakeup user</string>
-  <string name="wakeup_user_summary">User for remote wakeup</string>
-  <string name="wakeup_password_title">Wakeup password</string>
-  <string name="wakeup_password_summary">Password for remote wakeup</string>
-  
-  <!--  timer -->
-  <string name="timer_preferences">Timer defaults</string>
-  <string name="timer_pre_start_buffer_title">Margin at start</string>
-  <string name="timer_pre_start_buffer_summary">Minutes recording starts before the beginning of the broadcast</string>
-  <string name="timer_post_end_buffer_title">Margin at stop</string>
-  <string name="timer_post_end_buffer_summary">Minutes recording stops after the end of the broadcast</string>
-  <string name="timer_default_priority_title">Default priority</string>
-  <string name="timer_default_priority_summary">Default priority</string>
-  <string name="timer_default_primary_limit_title">Default primary limit</string>
-  <string name="timer_default_primary_limit_summary">Default primary limit</string>
-  <string name="timer_default_lifetime_title">Default lifetime</string>
-  <string name="timer_default_lifetime_summary">Default lifetime</string>
-  
+
+	<!-- VDR plugin preferences -->
+	<string name="vdr_preferences">Network settings</string>
+	<string name="vdr_host_title">VDR host</string>
+	<string name="vdr_host_summary">Host running VDR</string>
+	<string name="vdr_port_title">VDR plugin port </string>
+	<string name="vdr_port_summary">Port for connections to VDR plugin</string>
+	<string name="vdr_port_default">6420</string>
+	<string name="vdr_password_title">VDR plugin password</string>
+	<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>
+
+	<!-- channel filter preferences -->
+	<string name="channel_filter_preferences">Channel settings</string>
+	<string name="channel_filter_filter_title">Limit channels</string>
+	<string name="channel_filter_filter_summary">Use only given channels</string>
+	<string name="channel_filter_last_title">Channels</string>
+	<string name="channel_filter_last_summary">Channels to use</string>
+
+	<!-- wakeup -->
+	<string name="wakeup_preferences">Remote VDR host wakeup</string>
+	<string name="wakeup_enabled_title">Can remote wakeup VDR</string>
+	<string name="wakeup_enabled_summary">Enables to remote wakeup the VDR host</string>
+	<string name="wakeup_url_title">URL for remote wakeup</string>
+	<string name="wakeup_url_summary">URL for a request doing the wakeup</string>
+	<string name="wakeup_user_title">Wakeup user</string>
+	<string name="wakeup_user_summary">User for remote wakeup</string>
+	<string name="wakeup_password_title">Wakeup password</string>
+	<string name="wakeup_password_summary">Password for remote wakeup</string>
+	<string name="wakeup_method_key">key_wakeup_method</string>
+	<string name="wakeup_method_title">Wakeup method</string>
+	<string name="wakeup_method_summary">Choose a method to wakeup the vdr host</string>
+	<string-array name="wakeup_methods">
+		<item>Call a URL</item>
+		<item>WOL</item>
+	</string-array>
+	<string-array name="wakeup_methods_values">
+		<item>url</item>
+		<item>wol</item>
+	</string-array>
+	<string name="default_wakeup_method">url</string>
+	<string name="wakeup_wol_custom_broadcast_key">key_wol_custom_broadcast</string>
+    <string name="wakeup_wol_custom_boradcast_title">Custom broadcast address</string>
+    <string name="wakeup_wol_custom_boradcast_summary">Enter custom broadcast address rather then 255.255.255.255. Useful for VPN connection as example.</string>
+    <string name="wakeup_wol_custom_boradcast_summary_on">Broadcast </string>
+	
+	
+	<string name="wakeup_wol_mac_key">key_wakeup_wol_mac</string>
+    <string name="wakeup_wol_mac_title">MAC-Address</string>
+    <string name="wakeup_wol_mac_summary">MAC-Address of the VDR host. User \':\' or \'-\' or a space as separator.</string>
+
+	<!-- timer -->
+	<string name="timer_preferences">Timer defaults</string>
+	<string name="timer_pre_start_buffer_title">Margin at start</string>
+	<string name="timer_pre_start_buffer_summary">Minutes recording starts before the beginning of
+		the broadcast</string>
+	<string name="timer_post_end_buffer_title">Margin at stop</string>
+	<string name="timer_post_end_buffer_summary">Minutes recording stops after the end of the
+		broadcast</string>
+	<string name="timer_default_priority_title">Default priority</string>
+	<string name="timer_default_priority_summary">Default priority</string>
+	<string name="timer_default_primary_limit_title">Default primary limit</string>
+	<string name="timer_default_primary_limit_summary">Default primary limit</string>
+	<string name="timer_default_lifetime_title">Default lifetime</string>
+	<string name="timer_default_lifetime_summary">Default lifetime</string>
+
+	<!-- GUI -->
+	<string name="gui_preferences">GUI Settings</string>
+	<string name="gui_enable_24h_format_key">key_enable_24h</string>
+	<string name="gui_enable_24h_format_title">Use 24-hour format</string>
+	<string name="gui_enable_24h_format_summary_on">13:00</string>
+	<string name="gui_enable_24h_format_summary_off">1:00 PM</string>
+	<string name="gui_channels_show_channel_numbers_key">key_channels_show_channel_numbers</string>
+	<string name="gui_channels_show_channel_numbers_title">Show channel numbers</string>
+    <string name="gui_channels_show_channel_numbers_summary">Show channel numbers in the channel list.</string>
+	
+
 </resources>
diff --git a/vdrmanager/res/xml/preferences.xml b/vdrmanager/res/xml/preferences.xml
index 81e25e3..10063b7 100644
--- a/vdrmanager/res/xml/preferences.xml
+++ b/vdrmanager/res/xml/preferences.xml
@@ -1,139 +1,91 @@
 <?xml version="1.0" encoding="utf-8"?>
-<PreferenceScreen
-  xmlns:android="http://schemas.android.com/apk/res/android">
-  
-  <PreferenceCategory android:title="@string/vdr_preferences" android:key="vdr_preferences">
-
-  <EditTextPreference
-    android:key="@string/vdr_host_key"
-    android:title="@string/vdr_host_title"
-    android:summary="@string/vdr_host_summary"/>
-
-  <EditTextPreference
-    android:key="@string/vdr_port_key"
-    android:title="@string/vdr_port_title"
-    android:summary="@string/vdr_port_summary"    
-    android:defaultValue="@string/vdr_port_default"/>
-
-  <EditTextPreference
-    android:key="@string/vdr_password_key"
-    android:title="@string/vdr_password_title"
-    android:summary="@string/vdr_password_summary"
-    android:password="true"/>
-
-  <CheckBoxPreference
-    android:key="@string/vdr_ssl_key"
-    android:title="@string/vdr_ssl_title"
-    android:summary="@string/vdr_ssl_summary"/>  
-
-  </PreferenceCategory>
-
-  <PreferenceCategory android:title="@string/livetv">
-  <ListPreference
-      android:key="livetv_streamformat"
-      android:title="@string/settings_livetv_streamformat"
-      android:defaultValue="TS"
-      android:entries="@array/livetv_streamformat"
-      android:entryValues="@array/livetv_streamformat_values" />
-
-  <EditTextPreference
-    android:key="streamingport"
-    android:inputType="number"
-    android:title="@string/settings_livetv_port"
-    android:summary="@string/settings_livetv_port_summary"
-    android:defaultValue="3000" />
-  </PreferenceCategory>
-
-  <PreferenceCategory android:title="@string/channel_filter_preferences" android:key="filter_preferences">
-  <CheckBoxPreference
-    android:key="@string/channel_filter_filter_key"
-    android:title="@string/channel_filter_filter_title"
-    android:summary="@string/channel_filter_filter_summary"/>  
-
-  <EditTextPreference
-    android:key="@string/channel_filter_last_key"
-    android:title="@string/channel_filter_last_title"
-    android:summary="@string/channel_filter_last_summary"
-    android:defaultValue="1"/>
-
-  </PreferenceCategory>
-       
-  <PreferenceCategory android:title="@string/wakeup_preferences" android:key="wakeup_preferences">
-  
-  <CheckBoxPreference
-    android:key="@string/wakeup_enabled_key"
-    android:title="@string/wakeup_enabled_title"
-    android:summary="@string/wakeup_enabled_summary"/>
-
-  <ListPreference
-     android:key="@string/wakeup_method_key"
-     android:title="@string/wakeup_method_title"
-     android:summary="@string/wakeup_method_summary"
-     android:entries="@array/wakeup_methods"
-     android:entryValues="@array/wakeup_methods_values"
-     android:defaultValue="@string/default_wakeup_method"
-     android:dependency="@string/wakeup_enabled_key"
-      />
-  
-
-  <EditTextPreference
-    android:key="@string/wakeup_url_key"
-    android:title="@string/wakeup_url_title"
-    android:summary="@string/wakeup_url_summary"
-    android:dependency="@string/wakeup_enabled_key"
-    />
-
-  <EditTextPreference
-    android:key="@string/wakeup_user_key"
-    android:title="@string/wakeup_user_title"
-    android:summary="@string/wakeup_user_summary"
-     android:dependency="@string/wakeup_enabled_key"
-    />
-
-  <EditTextPreference
-    android:key="@string/wakeup_password_key"
-    android:title="@string/wakeup_password_title"
-    android:summary="@string/wakeup_password_summary"
-     android:dependency="@string/wakeup_enabled_key"
-   />
-   
-   
-   <EditTextPreference 
-    android:key="@string/wakeup_wol_mac_key"
-    android:title="@string/wakeup_wol_mac_title"
-    android:summary="@string/wakeup_wol_mac_summary"
-    android:dependency="@string/wakeup_enabled_key"
-   />
-   
-
-  </PreferenceCategory>       
-  
-  <PreferenceCategory android:title="@string/timer_preferences" android:key="timer_preferences">
-
-  <EditTextPreference
-    android:key="@string/timer_pre_start_buffer_key"
-    android:title="@string/timer_pre_start_buffer_title"
-    android:summary="@string/timer_pre_start_buffer_summary"
-    android:defaultValue="5"/>
-
-  <EditTextPreference
-    android:key="@string/timer_post_end_buffer_key"
-    android:title="@string/timer_post_end_buffer_title"
-    android:summary="@string/timer_post_end_buffer_summary"
-    android:defaultValue="30"/>
-
-  <EditTextPreference
-    android:key="@string/timer_default_lifetime_key"
-    android:title="@string/timer_default_lifetime_title"
-    android:summary="@string/timer_default_lifetime_summary"
-    android:defaultValue="99"/>
-
-  <EditTextPreference
-    android:key="@string/timer_default_priority_key"
-    android:title="@string/timer_default_priority_title"
-    android:summary="@string/timer_default_priority_summary"
-    android:defaultValue="50"/>
-  
-  </PreferenceCategory>
-
+<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<PreferenceCategory android:title="@string/vdr_preferences"
+		android:key="vdr_preferences">
+		<EditTextPreference android:key="@string/vdr_host_key"
+			android:title="@string/vdr_host_title" android:summary="@string/vdr_host_summary" />
+		<EditTextPreference android:key="@string/vdr_port_key"
+			android:title="@string/vdr_port_title" android:summary="@string/vdr_port_summary"
+			android:defaultValue="@string/vdr_port_default" />
+		<EditTextPreference android:key="@string/vdr_password_key"
+			android:title="@string/vdr_password_title" android:summary="@string/vdr_password_summary"
+			android:password="true" />
+		<CheckBoxPreference android:key="@string/vdr_ssl_key"
+			android:title="@string/vdr_ssl_title" android:summary="@string/vdr_ssl_summary" />
+	</PreferenceCategory>
+
+	<PreferenceCategory android:title="@string/livetv">
+		<ListPreference android:key="livetv_streamformat"
+			android:title="@string/settings_livetv_streamformat"
+			android:defaultValue="TS" android:entries="@array/livetv_streamformat"
+			android:entryValues="@array/livetv_streamformat_values" />
+		<EditTextPreference android:key="streamingport"
+			android:inputType="number" android:title="@string/settings_livetv_port"
+			android:summary="@string/settings_livetv_port_summary"
+			android:defaultValue="3000" />
+	</PreferenceCategory>
+
+	<PreferenceCategory android:title="@string/channel_filter_preferences"
+		android:key="filter_preferences">
+		<CheckBoxPreference android:key="@string/channel_filter_filter_key"
+			android:title="@string/channel_filter_filter_title" android:summary="@string/channel_filter_filter_summary" />
+		<EditTextPreference android:key="@string/channel_filter_last_key"
+			android:title="@string/channel_filter_last_title" android:summary="@string/channel_filter_last_summary"
+			android:defaultValue="1" />
+	</PreferenceCategory>
+
+	<PreferenceCategory android:title="@string/wakeup_preferences"
+		android:key="wakeup_preferences">
+		<CheckBoxPreference android:key="@string/wakeup_enabled_key"
+			android:title="@string/wakeup_enabled_title" android:summary="@string/wakeup_enabled_summary" />
+		<ListPreference android:key="@string/wakeup_method_key"
+			android:title="@string/wakeup_method_title" android:summary="@string/wakeup_method_summary"
+			android:entries="@array/wakeup_methods" android:entryValues="@array/wakeup_methods_values"
+			android:defaultValue="@string/default_wakeup_method"
+			android:dependency="@string/wakeup_enabled_key" />
+		<EditTextPreference android:key="@string/wakeup_url_key"
+			android:title="@string/wakeup_url_title" android:summary="@string/wakeup_url_summary"
+			android:dependency="@string/wakeup_enabled_key" />
+		<EditTextPreference android:key="@string/wakeup_user_key"
+			android:title="@string/wakeup_user_title" android:summary="@string/wakeup_user_summary"
+			android:dependency="@string/wakeup_enabled_key" />
+		<EditTextPreference android:key="@string/wakeup_password_key"
+			android:title="@string/wakeup_password_title" android:summary="@string/wakeup_password_summary"
+			android:dependency="@string/wakeup_enabled_key" />
+		<EditTextPreference android:key="@string/wakeup_wol_mac_key"
+			android:title="@string/wakeup_wol_mac_title" android:summary="@string/wakeup_wol_mac_summary"
+			android:dependency="@string/wakeup_enabled_key" />
+		<EditTextPreference android:key="@string/wakeup_wol_custom_broadcast_key"
+			android:title="@string/wakeup_wol_custom_boradcast_title"
+			android:summaryOn="@string/wakeup_wol_custom_boradcast_summary"
+			android:dependency="@string/wakeup_enabled_key" android:defaultValue="" />
+	</PreferenceCategory>
+
+	<PreferenceCategory android:title="@string/timer_preferences"
+		android:key="timer_preferences">
+		<EditTextPreference android:key="@string/timer_pre_start_buffer_key"
+			android:title="@string/timer_pre_start_buffer_title" android:summary="@string/timer_pre_start_buffer_summary"
+			android:defaultValue="5" />
+		<EditTextPreference android:key="@string/timer_post_end_buffer_key"
+			android:title="@string/timer_post_end_buffer_title" android:summary="@string/timer_post_end_buffer_summary"
+			android:defaultValue="30" />
+		<EditTextPreference android:key="@string/timer_default_lifetime_key"
+			android:title="@string/timer_default_lifetime_title" android:summary="@string/timer_default_lifetime_summary"
+			android:defaultValue="99" />
+		<EditTextPreference android:key="@string/timer_default_priority_key"
+			android:title="@string/timer_default_priority_title" android:summary="@string/timer_default_priority_summary"
+			android:defaultValue="50" />
+	</PreferenceCategory>
+	<PreferenceCategory android:title="@string/gui_preferences"
+		android:key="gui_preferences">
+		<CheckBoxPreference android:key="@string/gui_channels_show_channel_numbers_key"
+			android:title="@string/gui_channels_show_channel_numbers_title"
+			android:summary="@string/gui_channels_show_channel_numbers_summary"
+			android:defaultValue="false" />
+		<CheckBoxPreference android:key="@string/gui_enable_24h_format_key"
+			android:title="@string/gui_enable_24h_format_title"
+			android:summaryOn="@string/gui_enable_24h_format_summary_on"
+			android:summaryOff="@string/gui_enable_24h_format_summary_off" />
+	</PreferenceCategory>
 </PreferenceScreen>