Feature #864

19 files changed, 13 insertions, 286 deletions

diff --git a/vdrmanager/res/menu-v11/channellist.xml b/vdrmanager/res/menu-v11/channellist.xml
deleted file mode 100644
index 2ca3884..0000000
--- a/vdrmanager/res/menu-v11/channellist.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/channels_recent_channels" android:alphabeticShortcut="r"
-        android:icon="@drawable/ic_menu_recent_history"
-        android:showAsAction="ifRoom"
-        android:title="@string/recent_channels"/>
-
-    <item
-        android:id="@+id/channels_groupby" android:alphabeticShortcut="g"
-        android:icon="@android:drawable/ic_menu_sort_alphabetically"
-        android:showAsAction="ifRoom"
-        android:title="@string/menu_groupby"/>
-
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu-v11/epg_details.xml b/vdrmanager/res/menu-v11/epg_details.xml
deleted file mode 100644
index 4458f09..0000000
--- a/vdrmanager/res/menu-v11/epg_details.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/epg_details_menu_search_repeat"
-        android:showAsAction="ifRoom"
-        android:icon="@drawable/ic_menu_view"
-        android:title="@string/search_reapt"/>
-
-    <item
-        android:showAsAction="ifRoom|withText"
-        android:id="@+id/epg_details_menu_share"
-        android:icon="@android:drawable/ic_menu_share"
-        android:title="@string/share"/>
- 	
- 	<item
-        android:id="@+id/epg_details_menu_switch"
-        android:icon="@drawable/ic_menu_goto"
-        android:title="@string/switch_to_channel"/>
-</menu>
diff --git a/vdrmanager/res/menu-v11/epg_list_item_menu.xml b/vdrmanager/res/menu-v11/epg_list_item_menu.xml
deleted file mode 100644
index 93ccb68..0000000
--- a/vdrmanager/res/menu-v11/epg_list_item_menu.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/epg_item_menu_timer_toggle"
-        android:title="@string/epg_item_menu_timer_enable"
-        android:visible="false"/>
-
-    <item
-        android:id="@+id/epg_item_menu_timer_add"
-        android:title="@string/epg_item_menu_timer_add"/>
-
-    <item
-        android:id="@+id/epg_item_menu_timer_delete"
-        android:title="@string/epg_item_menu_timer_delete"
-        android:visible="false"/>
-
-    <item
-        android:id="@+id/epg_item_menu_timer_modify"
-        android:title="@string/epg_item_menu_timer_modify"
-        android:visible="false"/>
-
-    <item
-        android:id="@+id/epg_item_menu_live_tv"
-        android:title="@string/livetv"
-        android:visible="false"/>
-	
-	<item android:id="@+id/epg_item_menu_switchto" 	   android:title="@string/switch_to_channel" android:visible="true" />
-    
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu-v11/epg_list_menu.xml b/vdrmanager/res/menu-v11/epg_list_menu.xml
deleted file mode 100644
index ea31378..0000000
--- a/vdrmanager/res/menu-v11/epg_list_menu.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!-- 
-	<item
-	  android:id="@+id/epg_menu_search"
-	  android:icon="@android:drawable/ic_menu_search"
-	  android:title="@string/epg_menu_search"/>
--->
-<!-- 
-	<item
-	  android:id="@+id/epg_menu_times"
-	  android:icon="@android:drawable/ic_menu_search"
-	  android:title="@string/epg_menu_times"/>
-    -->
-    	<item
-	  android:id="@+id/epg_list_menu_channels"
-	  android:icon="@drawable/ic_menu_moreoverflow"
-	  android:showAsAction="ifRoom"
-	  android:title="@string/action_menu_channels"/>
-    	
-	<item
-	  android:showAsAction="ifRoom"
-	  android:id="@+id/epg_list_sort_menu"
-	  android:icon="@android:drawable/ic_menu_sort_alphabetically"
-	  android:title="@string/sort"/>
-	
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu-v11/epg_search_time_item_menu.xml b/vdrmanager/res/menu-v11/epg_search_time_item_menu.xml
deleted file mode 100644
index a54abf0..0000000
--- a/vdrmanager/res/menu-v11/epg_search_time_item_menu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<item
-	  android:id="@+id/epg_search_time_delete"
-	  android:title="@string/common_delete"/>
-    
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu-v11/recording_list_menu.xml b/vdrmanager/res/menu-v11/recording_list_menu.xml
deleted file mode 100644
index 2edc02b..0000000
--- a/vdrmanager/res/menu-v11/recording_list_menu.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!-- 
-	<item
-	  android:id="@+id/epg_menu_search"
-	  android:icon="@android:drawable/ic_menu_search"
-	  android:title="@string/epg_menu_search"/>
--->
-<!-- 
-	<item
-	  android:id="@+id/epg_menu_times"
-	  android:icon="@android:drawable/ic_menu_search"
-	  android:title="@string/epg_menu_times"/>
-    -->
-    
-    <item
-        android:id="@+id/menu_groupby" android:alphabeticShortcut="g"
-        android:icon="@android:drawable/ic_menu_sort_alphabetically"
-        android:showAsAction="ifRoom"
-        android:title="@string/menu_groupby"/>
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu-v11/refresh_menu.xml b/vdrmanager/res/menu-v11/refresh_menu.xml
deleted file mode 100644
index 9c31b62..0000000
--- a/vdrmanager/res/menu-v11/refresh_menu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/list_refresh"
-        android:alphabeticShortcut="r"
-        android:icon="@drawable/ic_menu_refresh"
-        android:showAsAction="ifRoom"
-        android:title="@string/refresh"/>
-
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu-v11/timer_list_menu.xml b/vdrmanager/res/menu-v11/timer_list_menu.xml
deleted file mode 100644
index fa00a26..0000000
--- a/vdrmanager/res/menu-v11/timer_list_menu.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!-- 
-	<item
-	  android:id="@+id/epg_menu_search"
-	  android:icon="@android:drawable/ic_menu_search"
-	  android:title="@string/epg_menu_search"/>
--->
-<!-- -->
-	<item
-	  android:id="@+id/timer_menu_add"
-	  android:icon="@android:drawable/ic_menu_add"
-	  android:alphabeticShortcut="a"
-	  android:title="@string/epg_item_menu_timer_add"/>
-
-    	<item
-	  android:id="@+id/epg_list_menu_channels"
-	  android:icon="@drawable/ic_menu_moreoverflow"
-	  android:showAsAction="ifRoom"
-	  android:title="@string/action_menu_channels"/>
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/channellist.xml b/vdrmanager/res/menu/channellist.xml
deleted file mode 100644
index c62dd18..0000000
--- a/vdrmanager/res/menu/channellist.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/channels_recent_channels" android:alphabeticShortcut="r"
-        android:icon="@drawable/ic_menu_recent_history"
-        android:title="@string/recent_channels"/>
-
-    <item
-        android:id="@+id/channels_groupby" android:alphabeticShortcut="g"
-        android:icon="@android:drawable/ic_menu_sort_alphabetically"
-        android:title="@string/menu_groupby"/>
-
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/epg_details.xml b/vdrmanager/res/menu/epg_details.xml
deleted file mode 100644
index df19218..0000000
--- a/vdrmanager/res/menu/epg_details.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/epg_details_menu_search_repeat"
-        android:icon="@drawable/ic_menu_view"
-        android:title="@string/search_reapt"/>
-
-    <item
-        android:id="@+id/epg_details_menu_share"
-        android:icon="@android:drawable/ic_menu_share"
-        android:title="@string/share"/>
-    
- 	
- 	<item
-        android:id="@+id/epg_details_menu_switch"
-        android:icon="@drawable/ic_menu_goto"
-        android:title="@string/switch_to_channel"/>
-
-</menu>
diff --git a/vdrmanager/res/menu/epg_list_item_menu.xml b/vdrmanager/res/menu/epg_list_item_menu.xml
deleted file mode 100644
index cc6ed44..0000000
--- a/vdrmanager/res/menu/epg_list_item_menu.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<item android:id="@+id/epg_item_menu_timer_toggle" android:title="@string/epg_item_menu_timer_enable"  android:visible="false"/>
-	<item android:id="@+id/epg_item_menu_timer_add"    android:title="@string/epg_item_menu_timer_add" />
-	<item android:id="@+id/epg_item_menu_timer_delete" android:title="@string/epg_item_menu_timer_delete"   android:visible="false"/>
-	<item android:id="@+id/epg_item_menu_timer_modify" android:title="@string/epg_item_menu_timer_modify"  android:visible="false" />
-	<item android:id="@+id/epg_item_menu_live_tv" 	   android:title="@string/livetv" android:visible="false" />
-	<item android:id="@+id/epg_item_menu_switchto" 	   android:title="@string/switch_to_channel" android:visible="true" />
-
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/epg_list_menu.xml b/vdrmanager/res/menu/epg_list_menu.xml
deleted file mode 100644
index 2335101..0000000
--- a/vdrmanager/res/menu/epg_list_menu.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!-- 
-	<item
-	  android:id="@+id/epg_menu_search"
-	  android:icon="@android:drawable/ic_menu_search"
-	  android:title="@string/epg_menu_search"/>
--->
-<!--  -->
-	<item
-	  android:id="@+id/epg_list_menu_channels"
-	  android:icon="@android:drawable/ic_menu_agenda"
-	  android:title="@string/action_menu_channels"/>
-
-	<item
-	  android:id="@+id/epg_list_sort_menu"
-	  android:icon="@android:drawable/ic_menu_sort_alphabetically"
-	  android:title="@string/sort"/>
-	
-	
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/epg_search_time_item_menu.xml b/vdrmanager/res/menu/epg_search_time_item_menu.xml
deleted file mode 100644
index a54abf0..0000000
--- a/vdrmanager/res/menu/epg_search_time_item_menu.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-
-	<item
-	  android:id="@+id/epg_search_time_delete"
-	  android:title="@string/common_delete"/>
-    
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/recording_list_menu.xml b/vdrmanager/res/menu/recording_list_menu.xml
deleted file mode 100644
index 8b3e72d..0000000
--- a/vdrmanager/res/menu/recording_list_menu.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!-- 
-	<item
-	  android:id="@+id/epg_menu_search"
-	  android:icon="@android:drawable/ic_menu_search"
-	  android:title="@string/epg_menu_search"/>
--->
-<!-- 
-	<item
-	  android:id="@+id/epg_menu_times"
-	  android:icon="@android:drawable/ic_menu_search"
-	  android:title="@string/epg_menu_times"/>
-    -->
-    
-    <item
-        android:id="@+id/menu_groupby" android:alphabeticShortcut="g"
-        android:icon="@android:drawable/ic_menu_sort_alphabetically"
-        android:title="@string/menu_groupby"/>
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/refresh_menu.xml b/vdrmanager/res/menu/refresh_menu.xml
deleted file mode 100644
index 8bfe27d..0000000
--- a/vdrmanager/res/menu/refresh_menu.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
-
-    <item
-        android:id="@+id/list_refresh"
-        android:alphabeticShortcut="r"
-        android:icon="@drawable/ic_menu_refresh"
-        android:title="@string/refresh"/>
-
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/timer_list_menu.xml b/vdrmanager/res/menu/timer_list_menu.xml
deleted file mode 100644
index 93509ec..0000000
--- a/vdrmanager/res/menu/timer_list_menu.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!-- 
-	<item
-	  android:id="@+id/epg_menu_search"
-	  android:icon="@android:drawable/ic_menu_search"
-	  android:title="@string/epg_menu_search"/>
--->
-<!--  -->
-	<item
-	  android:id="@+id/timer_menu_add"
-	  android:icon="@android:drawable/ic_menu_add"
-	  android:alphabeticShortcut="a"
-	  android:title="@string/epg_item_menu_timer_add"/>
-	<item
-	  android:id="@+id/epg_list_menu_channels"
-	  android:icon="@android:drawable/ic_menu_agenda"
-	  android:title="@string/action_menu_channels"/>
-
-</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/values/arrays.xml b/vdrmanager/res/values/arrays.xml
index 73baaf7..33e08ac 100644
--- a/vdrmanager/res/values/arrays.xml
+++ b/vdrmanager/res/values/arrays.xml
@@ -11,12 +11,12 @@
         <item>it</item>
         <item>uk</item>
     </string-array>
-    
+
     <string-array name="remux_entry_values">
         <item>EXT</item>
         <item>EXTERN</item>
     </string-array>
-    
+
     <string-array name="imdb_urls_velues">
         <item>akas.imdb.com</item>
         <item>imdb.com</item>
@@ -27,11 +27,12 @@
         <item>imdb.it</item>
         <item>imdb.pt</item>
     </string-array>
-    
-    
+
+
     <string-array name="recstream_entry_values">
         <item>vdr-live</item>
+        <item>vdr-streamdev</item>
     </string-array>
-    
+
 
 </resources>
\ No newline at end of file
diff --git a/vdrmanager/res/values/strings.xml b/vdrmanager/res/values/strings.xml
index 5796515..9812c55 100644
--- a/vdrmanager/res/values/strings.xml
+++ b/vdrmanager/res/values/strings.xml
@@ -32,6 +32,7 @@
     <string name="refresh">Refresh</string>
     <string name="done">Done</string>
     <string name="share">Share</string>
+    <string name="addtocal">Add to calendar</string>
     <string name="search_reapt">Reruns</string>
     <string name="share_chooser">Share EPG Entry</string>
     <string name="about_text">
@@ -274,10 +275,11 @@
 
     <string-array name="recstream_entries">
         <item>VDR live plugin</item>
+        <item>VDR streamdev plugin</item>
     </string-array>
 
     <string name="recstream_method_title">Streaming method</string>
-    <string name="recstream_method_summary">Currently Streaming over VDR live plugin is supported</string>
+    <string name="recstream_method_summary">Currently Streaming over VDR live and or streamdev plugin is supported</string>
     <string name="settings_live_port">VDR live plugin port</string>
     <string name="settings_live_port_summary">VDR live plugin has default port 8008.</string>
 
@@ -347,4 +349,6 @@
     <string name="sortby_alphabet">Alphabet</string>
     <string name="sortby_channellist">Chanellist</string>
     <string name="main_menu_clear_search">Clear Search History</string>
+    <string name="vdr_host_not_defined">VDR host not defined</string>
+    <string name="processing">Processing…</string>
 </resources>
\ No newline at end of file
diff --git a/vdrmanager/res/xml/vdr_prefs.xml b/vdrmanager/res/xml/vdr_prefs.xml
index c83f014..20d9823 100644
--- a/vdrmanager/res/xml/vdr_prefs.xml
+++ b/vdrmanager/res/xml/vdr_prefs.xml
@@ -68,7 +68,7 @@
 			android:key="@string/wakeup_password_key" android:password="true"
 			android:summary="@string/wakeup_password_summary" android:title="@string/wakeup_password_title" />
 
-		<EditTextPreference android:dependency="@string/wakeup_enabled_key"
+		<de.bjusystems.vdrmanager.data.MacFetchEditTextPreference android:dependency="@string/wakeup_enabled_key"
 			android:key="@string/wakeup_wol_mac_key" android:summary="@string/wakeup_wol_mac_summary"
 			android:title="@string/wakeup_wol_mac_title" />
 
@@ -129,7 +129,7 @@
 			android:summary="@string/remux_parameter_summary" android:title="@string/remux_parameter_title" />
 	</PreferenceCategory>
 
-	<PreferenceCategory android:title="@string/recstream">
+	<PreferenceCategory android:title="@string/recstream" android:key="key_streaming_category">
 
 		<CheckBoxPreference android:key="key_rec_stream_enable"
 			android:defaultValue="false" android:summary="@string/recstream_enable_summary"