implemented search (not yet 100% clean) and time search not know if

works, not yet tested. 
Added imdb support

7 files changed, 85 insertions, 23 deletions

diff --git a/vdrmanager/res/layout/epg_detail.xml b/vdrmanager/res/layout/epg_detail.xml
index 41305a2..bc64690 100644
--- a/vdrmanager/res/layout/epg_detail.xml
+++ b/vdrmanager/res/layout/epg_detail.xml
@@ -129,7 +129,7 @@
       android:layout_centerHorizontal="true"
       style="?android:attr/buttonStyleSmall" android:layout_marginLeft="20dip" android:layout_marginRight="20dip"
       android:background="@android:drawable/list_selector_background"
-      android:text="@string/epg_event_create_timer_text"/>
+      android:text="@string/epg_eent_livetv_text"/>
       
      <ImageButton
       android:id="@+id/epg_event_create_timer"
@@ -141,6 +141,18 @@
       android:background="@android:drawable/list_selector_background"
       style="?android:attr/buttonStyleSmall"
       android:text="@string/epg_event_create_timer_text"/>
+     
+     <ImageButton
+      android:id="@+id/epg_event_imdb"
+      android:src="@drawable/imdb"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content" android:layout_marginLeft="20dip" android:layout_marginRight="20dip"
+      android:layout_gravity="center_horizontal"
+      android:layout_centerHorizontal="true" 
+      android:background="@android:drawable/list_selector_background"
+      style="?android:attr/buttonStyleSmall"
+      android:text="@string/epg_event_imdb_text"/>
+     
       
      <!-- 
      <ImageButton
diff --git a/vdrmanager/res/layout/epg_event_item.xml b/vdrmanager/res/layout/epg_event_item.xml
index c1ce677..bf54b10 100644
--- a/vdrmanager/res/layout/epg_event_item.xml
+++ b/vdrmanager/res/layout/epg_event_item.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
 	android:id="@+id/timer_item" android:layout_width="fill_parent"
-	android:layout_height="fill_parent" android:padding="4dp"
+	android:layout_height="fill_parent" android:padding="5dp"
 	android:orientation="vertical">
 	
 <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical"
@@ -31,7 +31,7 @@
 			
 	</LinearLayout>
 
-	<LinearLayout android:layout_width="fill_parent"
+	<LinearLayout android:layout_width="fill_parent" 		android:padding="3dip"
 		android:layout_height="wrap_content" android:layout_marginTop="0dip"
 		android:orientation="horizontal">
 
@@ -49,5 +49,13 @@
 			android:layout_height="wrap_content" android:text="89min"/>
 			
 	</LinearLayout>
+	
+	<TextView android:id="@+id/event_item_description"
+			android:layout_width="wrap_content"
+			android:textAppearance="?android:textAppearanceSmall"
+			android:visibility="gone"
+			android:textSize="12dip"
+			android:padding="3dip"
+			android:layout_height="wrap_content" />
 </LinearLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/epg_list_menu.xml b/vdrmanager/res/menu/epg_list_menu.xml
index cb5e4cf..44ae64d 100644
--- a/vdrmanager/res/menu/epg_list_menu.xml
+++ b/vdrmanager/res/menu/epg_list_menu.xml
@@ -3,9 +3,11 @@
 
 	<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"/>
     
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/values/channel_list.xml b/vdrmanager/res/values/channel_list.xml
index 8c3bd89..2a15cc9 100644
--- a/vdrmanager/res/values/channel_list.xml
+++ b/vdrmanager/res/values/channel_list.xml
@@ -9,6 +9,7 @@
   <string name="channel_group_menu_hide">Hide</string>
   <string name="channel_group_menu_hide_permanent">Hide permanent</string>
   
+  <string name="menu_groupby">Group by</string>
   <string name="groupby_group">Group</string>
   <string name="groupby_provider">Provider</string>
   <string name="groupby_name">Name</string>
diff --git a/vdrmanager/res/values/epg.xml b/vdrmanager/res/values/epg.xml
index a5e32fe..db84fdd 100644
--- a/vdrmanager/res/values/epg.xml
+++ b/vdrmanager/res/values/epg.xml
@@ -9,6 +9,8 @@
   <string name="epg_list_search_label">Search results</string>
   
   <!-- create timer -->
+  <string name="epg_event_imdb_text">IMDB Search</string>
+  <string name="epg_eent_livetv_text">Stream</string>
   <string name="epg_event_create_timer_text">Add timer</string>
   <string name="epg_event_modify_timer_text">Modify timer</string>
   
@@ -18,8 +20,10 @@
   <string name="epg_duration_template_live">%1$s/%2$s min</string>
   <string name="epg_of_a_channel">EPG -> %1$s</string>
   <string name="epg_by_channel">EPG by channel</string>
+  <string name="epg_by_search">EPG Search</string>
+  <string name="epg_by_search_param">EPG Search: \'%1$s\'</string>
   <string name="epg_by_time">EPG by time</string>  
   <string name="search_epg_hint">Search EPG</string>
-  <string name="epg_search_settings_description">Searcg VDR EPG</string>
+  <string name="epg_search_settings_description">Search VDR EPG</string>
 
 </resources>
diff --git a/vdrmanager/res/values/preferences.xml b/vdrmanager/res/values/preferences.xml
index 16737ef..a1d3f81 100644
--- a/vdrmanager/res/values/preferences.xml
+++ b/vdrmanager/res/values/preferences.xml
@@ -17,8 +17,8 @@
 	<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>
+	<string name="channel_filter_last_title">Channel filter</string>
+	<string name="channel_filter_last_summary">Comma separated channelnumbers or ranges (separator \'-\'). A.e. 1,2,4-10</string>
 
 	<!-- wakeup -->
 	<string name="wakeup_preferences">Remote VDR host wakeup</string>
@@ -76,9 +76,30 @@
 	<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>
+	
 	<string name="qui_quit_on_back_key">key_gui_quit_on_back</string>
 	<string name="gui_quit_on_back_title">Quit on back button</string>
 	<string name="gui_quit_on_back_summary_on">Back button quits the VDR-Manager</string>
 	<string name="gui_quit_on_back_summary_off">Back button does not quit VDR-Manager</string>	
+	
+	<string name="qui_show_imdb_button_key">key_qui_show_imdb_button</string>
+	<string name="qui_show_imdb_button_title">Show IMDB Button</string>
+	<string name="qui_show_imdb_button_summary_on">IMDB Button is shown</string>
+	<string name="qui_show_imdb_button_summary_off">IMDB Button is not shown</string>	
+	
+	<string name="qui_imdb_url_key">key_qui_imdb_url</string>
+	<string name="qui_imdb_url_title">IMDb Site</string>
+	<string name="qui_imdb_url_summary">Which IMDb site to search.</string>
+	
+	
+	<string-array name="imdb_urls">
+		<item>imdb.com</item>
+		<item>uk.imdb.com</item>
+		<item>imdb.de</item>
+		<item>imdb.es</item>
+		<item>imdb.fr</item>
+		<item>imdb.it</item>
+		<item>imdb.pt</item>
+	</string-array>
 
 </resources>
diff --git a/vdrmanager/res/xml/preferences.xml b/vdrmanager/res/xml/preferences.xml
index 1f54c26..88c27d6 100644
--- a/vdrmanager/res/xml/preferences.xml
+++ b/vdrmanager/res/xml/preferences.xml
@@ -3,7 +3,7 @@
 
 	<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"
@@ -16,13 +16,14 @@
 			android:title="@string/vdr_ssl_title" android:summary="@string/vdr_ssl_summary" />
 	</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:dependency="@string/channel_filter_filter_key"
 			android:defaultValue="1" />
 	</PreferenceCategory>
 
@@ -78,35 +79,48 @@
 			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" />
-			
-		<CheckBoxPreference  android:key="@string/qui_quit_on_back_key"
+
+		<CheckBoxPreference android:key="@string/qui_show_imdb_button_key"
+			android:title="@string/qui_show_imdb_button_title" android:summaryOn="@string/qui_show_imdb_button_summary_on"
+			android:summaryOff="@string/qui_show_imdb_button_summary_off"
+			android:defaultValue="true" />
+
+		<ListPreference android:key="@string/qui_imdb_url_key"
+			android:title="@string/qui_imdb_url_title" android:summaryOn="@string/qui_imdb_url_summary"
+			android:entries="@array/imdb_urls" android:entryValues="@array/imdb_urls"
+			android:dependency="@string/qui_show_imdb_button_key"
+			android:defaultValue="imdb.de" />
+
+		<CheckBoxPreference android:key="@string/qui_quit_on_back_key"
 			android:title="@string/gui_quit_on_back_title"
 			android:summaryOn="@string/gui_quit_on_back_summary_on"
 			android:summaryOff="@string/gui_quit_on_back_summary_off"
 			android:defaultValue="true" />
 	</PreferenceCategory>
+	
 	<PreferenceCategory android:title="@string/livetv">
 		<EditTextPreference android:key="streamingport"
 			android:inputType="number" android:title="@string/settings_livetv_port"
 			android:summary="@string/settings_livetv_port_summary"
 			android:defaultValue="3000" />
-	
+
 		<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" />
-		
-		<CheckBoxPreference android:key="remux_enable" android:title="@string/remux_enable_title" android:summary="@string/remux_enable_summary"
-			
-		/>
-		<EditTextPreference android:dependency="remux_enable" android:key="remux_command" android:title="@string/remux_command_title"  android:defaultValue="EXT" android:summary="@string/remux_command_summary" 
-		/>
 
-		<EditTextPreference  android:dependency="remux_enable" android:key="remux_parameter" android:title="@string/remux_parameter_title" android:summary="@string/remux_parameter_summary" 
-		android:defaultValue="QUALITY=DSL1000"
-		/>
-			
-		
+		<CheckBoxPreference android:key="remux_enable"
+			android:title="@string/remux_enable_title" android:summary="@string/remux_enable_summary" />
+		<EditTextPreference android:dependency="remux_enable"
+			android:key="remux_command" android:title="@string/remux_command_title"
+			android:defaultValue="EXT" android:summary="@string/remux_command_summary" />
+
+		<EditTextPreference android:dependency="remux_enable"
+			android:key="remux_parameter" android:title="@string/remux_parameter_title"
+			android:summary="@string/remux_parameter_summary"
+			android:defaultValue="QUALITY=DSL1000" />
+
+
 	</PreferenceCategory>
-	
+
 </PreferenceScreen>