From db8177ec1fa3683fdf9b1c459be57df21edd3fce Mon Sep 17 00:00:00 2001
From: git-vdr <herrlado@gmail.com>
Date: Tue, 4 Oct 2011 01:56:35 +0200
Subject: new icons, layout changes, etc

---
 vdrmanager/res/layout/epg_detail.xml             | 108 ++++++++++++++++++++---
 vdrmanager/res/layout/epg_event_item.xml         |  52 +++++++++++
 vdrmanager/res/layout/epg_list.xml               |  19 ++++
 vdrmanager/res/layout/event_epg_list.xml         |  49 ++++++++++
 vdrmanager/res/layout/event_item.xml             |  40 ---------
 vdrmanager/res/layout/recording_detail.xml       |  99 +++++++++++++++++++++
 vdrmanager/res/layout/recording_list.xml         |  31 +++++++
 vdrmanager/res/layout/time_epg_list.xml          |  63 +++++++++++++
 vdrmanager/res/layout/timer_list.xml             |  40 ++++++---
 vdrmanager/res/menu/channel_list_group_menu.xml  |  11 +++
 vdrmanager/res/menu/channel_list_item_menu.xml   |  14 ++-
 vdrmanager/res/menu/epg_list_item_menu.xml       |  19 ++--
 vdrmanager/res/menu/recording_list_item_menu.xml |   7 ++
 vdrmanager/res/values/action_menu.xml            |   1 +
 vdrmanager/res/values/channel_list.xml           |  17 ++++
 vdrmanager/res/values/channel_list_menu.xml      |   7 --
 vdrmanager/res/values/common.xml                 |   3 +
 vdrmanager/res/values/epg.xml                    |   5 +-
 vdrmanager/res/values/epg_list_menu.xml          |   1 +
 vdrmanager/res/values/errors.xml                 |   2 +-
 vdrmanager/res/values/livetv.xml                 |  24 +++++
 vdrmanager/res/values/progress.xml               |   5 ++
 vdrmanager/res/values/recording_list_menu.xml    |   5 ++
 23 files changed, 537 insertions(+), 85 deletions(-)
 create mode 100644 vdrmanager/res/layout/epg_event_item.xml
 create mode 100644 vdrmanager/res/layout/event_epg_list.xml
 delete mode 100644 vdrmanager/res/layout/event_item.xml
 create mode 100644 vdrmanager/res/layout/recording_detail.xml
 create mode 100644 vdrmanager/res/layout/recording_list.xml
 create mode 100644 vdrmanager/res/layout/time_epg_list.xml
 create mode 100644 vdrmanager/res/menu/channel_list_group_menu.xml
 create mode 100644 vdrmanager/res/menu/recording_list_item_menu.xml
 create mode 100644 vdrmanager/res/values/channel_list.xml
 delete mode 100644 vdrmanager/res/values/channel_list_menu.xml
 create mode 100644 vdrmanager/res/values/livetv.xml
 create mode 100644 vdrmanager/res/values/recording_list_menu.xml

(limited to 'vdrmanager')

diff --git a/vdrmanager/res/layout/epg_detail.xml b/vdrmanager/res/layout/epg_detail.xml
index 7752819..2e18937 100644
--- a/vdrmanager/res/layout/epg_detail.xml
+++ b/vdrmanager/res/layout/epg_detail.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
+    android:layout_width="fill_parent" 
     android:layout_height="fill_parent"
     android:orientation="vertical">
     
@@ -9,7 +9,9 @@
         android:id="@+id/epg_detail_title"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
-        android:textStyle="bold"/>
+        android:textStyle="bold"
+        android:textSize="15dip"
+        android:text="Unterwegs nach Cold Mountain"/>
 
     <LinearLayout
         android:id="@+id/epg_detail_time_channel"
@@ -22,32 +24,58 @@
 		        android:layout_width="wrap_content"
 		        android:layout_height="wrap_content"
 		        android:gravity="left"
-		        android:layout_weight="1"/>
+		        android:text="20:10-20-15"
+		        />
+	   
+	       <TextView
+		        android:id="@+id/epg_detail_duration"
+		        android:layout_width="wrap_content"
+		        android:layout_height="wrap_content"
+		        android:gravity="right" android:layout_weight="1"
+		        android:paddingLeft="10dip"
+		        android:text="2/123min"
+		        />
+	
 		
 		    <TextView
 		        android:id="@+id/epg_detail_channel"
 		        android:layout_width="wrap_content"
 		        android:layout_height="wrap_content"
+		        android:layout_weight="1"
+		        android:text="Sky Cinema"
+		        android:visibility="gone"
 		        android:gravity="right"/>
 		        
     </LinearLayout>
+   
+   
         
     <TextView
-        android:id="@+id/epg_detail_date"
+        android:id="@+id/epg_detail_shorttext"
         android:layout_width="fill_parent"
         android:layout_height="wrap_content"
         android:gravity="left"
+        android:text="Krimikömedie"
         android:layout_below="@id/epg_detail_time"/>
+       
+   
+
 
     <TextView
         android:id="@+id/epg_detail_separator_0"
         android:layout_width="fill_parent"
         android:layout_height="2sp"/>
         
-    <TextView
-        android:id="@+id/epg_detail_separator_1"
-        android:layout_width="fill_parent"
-        android:layout_height="1sp"/>
+ 
+	
+
+		<ProgressBar
+       		    android:id="@+id/epg_detail_progress"
+       			android:layout_width="fill_parent"
+       			android:indeterminate="false"
+       			android:layout_height="2dip"
+       			android:progress="40"
+       			style="?android:attr/progressBarStyleHorizontal"/>
 
     <ScrollView
         android:id="@+id/epg_detail_description_scroll"
@@ -56,6 +84,7 @@
         android:layout_weight="1">
 
         <TextView
+        	android:textSize="15dip"
             android:id="@+id/epg_detail_description"
             android:layout_width="fill_parent"
             android:layout_height="fill_parent">
@@ -72,13 +101,72 @@
         android:id="@+id/epg_detail_separator_3"
         android:layout_width="fill_parent"
         android:layout_height="4sp"/>
+	
+<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" android:gravity="center">
 
-    <Button
-      android:id="@+id/epg_event_create_timer"
+<!-- 
+    <ImageButton
+      android:id="@+id/epg_event_left"
+      android:src="@drawable/left"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:gravity="left"
+      style="?android:attr/buttonStyleSmall"
+      android:layout_marginRight="40dip" 
+      android:background="@android:drawable/list_selector_background"/>
+    
+   -->
+    
+    
+    <ImageButton
+      android:id="@+id/epg_event_livetv"
+      android:src="@drawable/tv"
       android:layout_width="wrap_content"
       android:layout_height="wrap_content"
       android:layout_gravity="center_horizontal"
       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"/>
+      
+     <ImageButton
+      android:id="@+id/epg_event_create_timer"
+      android:src="@drawable/timer"
+      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_create_timer_text"/>
+      
+     <!-- 
+     <ImageButton
+      android:id="@+id/epg_event_epg"
+      android:src="@drawable/epg"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="center_horizontal"
+      android:layout_centerHorizontal="true"  android:layout_weight="1" 
+      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_right"
+      android:src="@drawable/right"
+      android:layout_width="wrap_content"
+      android:layout_height="wrap_content"
+      android:layout_gravity="right"
+      android:layout_centerHorizontal="true"  
+      style="?android:attr/buttonStyleSmall"
+      android:layout_marginLeft="40dip"
+      android:background="@android:drawable/list_selector_background"/>
+-->
+      
+      
+                  </LinearLayout>
+                  
                   
 </LinearLayout>
diff --git a/vdrmanager/res/layout/epg_event_item.xml b/vdrmanager/res/layout/epg_event_item.xml
new file mode 100644
index 0000000..3001d43
--- /dev/null
+++ b/vdrmanager/res/layout/epg_event_item.xml
@@ -0,0 +1,52 @@
+<?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="3dp" android:paddingTop="5dp" android:paddingBottom="8dp"
+	android:orientation="vertical">
+	
+<LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical"
+  android:background="@android:drawable/list_selector_background"
+>
+<TextView
+    android:id="@+id/timer_item_channel"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content" android:text="Sky Film" android:textSize="17dip"/> 
+
+	<ProgressBar
+		android:id="@+id/timer_progress" android:layout_width="fill_parent"
+		android:indeterminate="false" android:layout_height="3dip" android:layout_marginTop="3dip"
+		style="?android:attr/progressBarStyleHorizontal" android:visibility="gone" />
+
+	<LinearLayout android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:layout_marginTop="0dip">
+
+		<TextView android:id="@+id/timer_item_time"  	android:textSize="17dip"
+			android:layout_width="wrap_content" android:layout_height="wrap_content"  android:background="@android:drawable/list_selector_background"
+			android:gravity="left" android:text="22:33" android:paddingRight="5dip" />
+
+		<TextView android:id="@+id/timer_item_title" android:text="timer_item_title" android:layout_weight="1" android:textStyle="bold"
+			android:ellipsize="end" android:layout_width="wrap_content"  	android:textSize="17dip"  android:background="@android:drawable/list_selector_background"
+			android:layout_height="wrap_content" />
+			
+	</LinearLayout>
+
+	<LinearLayout android:layout_width="fill_parent"
+		android:layout_height="wrap_content" android:layout_marginTop="0dip"
+		android:orientation="horizontal">
+
+		<ImageView android:id="@+id/timer_item_state" android:layout_marginRight="5dip" android:layout_marginBottom="2dip"
+			android:layout_width="wrap_content" android:layout_height="fill_parent" android:background="@android:drawable/list_selector_background"
+			android:layout_centerVertical="true" android:visibility="gone" />
+
+		<TextView android:id="@+id/timer_item_shorttext" android:textSize="15dip"
+			android:text="timer_short_text" android:ellipsize="end" android:background="@android:drawable/list_selector_background"
+			android:layout_alignLeft="@id/timer_item_title" android:layout_width="wrap_content" android:layout_weight="1"
+			android:layout_height="wrap_content" />
+					
+		<TextView android:id="@+id/timer_item_duration" android:background="@android:drawable/list_selector_background"
+			android:ellipsize="end" android:layout_width="wrap_content" android:gravity="right" 	android:textSize="13dip"
+			android:layout_height="wrap_content" android:text="89min"/>
+			
+	</LinearLayout>
+</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/vdrmanager/res/layout/epg_list.xml b/vdrmanager/res/layout/epg_list.xml
index dd44a8b..205dce0 100644
--- a/vdrmanager/res/layout/epg_list.xml
+++ b/vdrmanager/res/layout/epg_list.xml
@@ -46,5 +46,24 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/epg_list_search_label"/>
+
+	<LinearLayout android:orientation="vertical"
+		android:id="@+id/no_connection_layout" android:layout_width="fill_parent"
+		android:layout_height="fill_parent" android:visibility="gone">
+		<LinearLayout android:layout_height="fill_parent"
+			android:gravity="center" android:layout_width="fill_parent"
+			android:orientation="horizontal">
+			<TextView android:text="@string/no_connection"
+				android:layout_height="wrap_content" android:layout_width="wrap_content"
+				android:textSize="18dip" />
+			<ImageView android:src="@drawable/sad"
+				android:layout_height="wrap_content" android:layout_width="wrap_content" />
+			<Button android:text="@string/no_connection_retry"
+				android:textSize="18dip" android:layout_height="wrap_content"
+				android:layout_width="wrap_content" android:id="@+id/retry_button" />
+
+		</LinearLayout>
+	</LinearLayout>            
+
      
 </LinearLayout>
diff --git a/vdrmanager/res/layout/event_epg_list.xml b/vdrmanager/res/layout/event_epg_list.xml
new file mode 100644
index 0000000..aadb591
--- /dev/null
+++ b/vdrmanager/res/layout/event_epg_list.xml
@@ -0,0 +1,49 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+    <Spinner
+        android:id="@+id/epg_list_channel_spinner"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:prompt="@string/epg_list_channel_spinner"/>
+    
+    <ListView
+        android:id="@+id/whatson_list"        
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@id/epg_list_time_spinner"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:cacheColorHint="?android:attr/colorBackground"/>
+        
+     <TextView
+            android:id="@+id/epg_list_search_label"      
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/epg_list_search_label"/>
+
+	<LinearLayout android:orientation="vertical"
+		android:id="@+id/no_connection_layout" android:layout_width="fill_parent"
+		android:layout_height="fill_parent" android:visibility="gone">
+		<LinearLayout android:layout_height="fill_parent"
+			android:gravity="center" android:layout_width="fill_parent"
+			android:orientation="horizontal">
+			<TextView android:text="@string/no_connection"
+				android:layout_height="wrap_content" android:layout_width="wrap_content"
+				android:textSize="18dip" />
+			<ImageView android:src="@drawable/sad"
+				android:layout_height="wrap_content" android:layout_width="wrap_content" />
+			<Button android:text="@string/no_connection_retry"
+				android:textSize="18dip" android:layout_height="wrap_content"
+				android:layout_width="wrap_content" android:id="@+id/retry_button" />
+
+		</LinearLayout>
+	</LinearLayout>            
+
+     
+</LinearLayout>
diff --git a/vdrmanager/res/layout/event_item.xml b/vdrmanager/res/layout/event_item.xml
deleted file mode 100644
index aab354a..0000000
--- a/vdrmanager/res/layout/event_item.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout
-    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="5dp">
-
-  <ImageView
-    android:id="@+id/timer_item_state"
-    android:layout_width="wrap_content"
-    android:layout_height="fill_parent"
-    android:layout_alignParentLeft="true"
-    android:layout_centerVertical="true"/>
-      
-  <TextView
-    android:id="@+id/timer_item_time"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_toRightOf="@id/timer_item_state"
-    android:gravity="left"/>
-
-  <TextView
-    android:id="@+id/timer_item_channel"
-    android:layout_width="wrap_content"
-    android:layout_height="wrap_content"
-    android:layout_alignParentRight="true"
-    android:layout_toRightOf="@id/timer_item_time"
-    android:gravity="right"/>
-
-  <TextView
-    android:id="@+id/timer_item_title"
-    android:ellipsize="end"
-    android:gravity="left"
-    android:layout_toRightOf="@id/timer_item_state"
-    android:layout_below="@id/timer_item_time"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"/>
-              
-</RelativeLayout>
\ No newline at end of file
diff --git a/vdrmanager/res/layout/recording_detail.xml b/vdrmanager/res/layout/recording_detail.xml
new file mode 100644
index 0000000..0aa5da7
--- /dev/null
+++ b/vdrmanager/res/layout/recording_detail.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+    
+    <ScrollView
+        android:id="@+id/timer_detail_scroll"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_weight="0.5">
+
+    <LinearLayout
+        android:id="@+id/timer_detail_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="vertical">
+                
+			    <TextView
+			        android:id="@+id/timer_detail_channel_title"
+			        android:layout_width="wrap_content"
+			        android:layout_height="wrap_content"
+			        android:textStyle="bold"
+			        android:text="@string/timer_detail_channel_title"/>
+			      
+			    <EditText
+			        android:id="@+id/timer_detail_channel"
+			        android:layout_width="fill_parent"
+			        android:layout_height="wrap_content"
+			        android:editable="false"/>
+			            				            
+			    <TextView
+			        android:id="@+id/timer_detail_title_title"
+			        android:layout_width="wrap_content"
+			        android:layout_height="wrap_content"
+			        android:textStyle="bold"
+			        android:text="@string/timer_detail_title_title"/>
+			
+			    <EditText
+			        android:id="@+id/timer_detail_title"
+			        android:layout_width="fill_parent"
+			        android:layout_height="wrap_content"/>
+			            
+			    <TextView
+			         android:id="@+id/timer_detail_start_title"
+			         android:layout_width="wrap_content"
+			         android:layout_height="wrap_content"
+			         android:text="@string/timer_detail_start_title"/>
+			         
+			    <LinearLayout
+			         android:id="@+id/timer_detail_start_daytime"
+			         android:layout_width="fill_parent"
+			         android:layout_height="wrap_content">
+			         
+					     <EditText
+					         android:id="@+id/timer_detail_start"
+					         android:layout_width="wrap_content"
+					         android:layout_height="wrap_content"
+					         android:editable="false"/>
+					         
+               <EditText
+                   android:id="@+id/timer_detail_day"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:editable="false"/>          
+					         
+					 </LinearLayout>
+			                
+			     <TextView
+			         android:id="@+id/timer_detail_end_title"
+			         android:layout_width="wrap_content"
+			         android:layout_height="wrap_content"
+			         android:text="@string/timer_detail_end_title"/>
+			
+			     <EditText
+			         android:id="@+id/timer_detail_end"
+			         android:layout_width="wrap_content"
+			         android:layout_height="wrap_content"
+			         android:editable="false"/>
+		
+		 	     <TextView
+			         android:id="@+id/timer_detail_fill"
+			         android:layout_width="fill_parent"
+			         android:layout_height="fill_parent"
+			         android:layout_weight="0.5"/>
+			                            
+        </LinearLayout>
+        
+    </ScrollView>
+
+    <Button
+        android:id="@+id/timer_details_save"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center_horizontal"
+        android:text="@string/timer_details_create_title"/>
+		                          
+</LinearLayout>
diff --git a/vdrmanager/res/layout/recording_list.xml b/vdrmanager/res/layout/recording_list.xml
new file mode 100644
index 0000000..1dabd2c
--- /dev/null
+++ b/vdrmanager/res/layout/recording_list.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical">
+	<LinearLayout android:layout_height="fill_parent"
+		android:layout_width="fill_parent" android:id="@+id/main_content">
+		<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+			android:id="@+id/recording_list" android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:layout_alignWithParentIfMissing="true"
+			android:layout_alignParentTop="true" android:layout_centerHorizontal="true"
+			android:cacheColorHint="?android:attr/colorBackground" />
+	</LinearLayout>
+	<LinearLayout android:orientation="vertical"
+		android:id="@+id/no_connection_layout" android:layout_width="fill_parent"
+		android:layout_height="fill_parent" android:visibility="gone">
+		<LinearLayout android:layout_height="fill_parent"
+			android:gravity="center" android:layout_width="fill_parent"
+			android:orientation="horizontal">
+			<TextView android:text="@string/no_connection"
+				android:layout_height="wrap_content" android:layout_width="wrap_content"
+				android:textSize="18dip" />
+			<ImageView android:src="@drawable/sad"
+				android:layout_height="wrap_content" android:layout_width="wrap_content" />
+			<Button android:text="@string/no_connection_retry"
+				android:textSize="18dip" android:layout_height="wrap_content"
+				android:layout_width="wrap_content" android:id="@+id/retry_button" />
+
+		</LinearLayout>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/vdrmanager/res/layout/time_epg_list.xml b/vdrmanager/res/layout/time_epg_list.xml
new file mode 100644
index 0000000..c45f9ba
--- /dev/null
+++ b/vdrmanager/res/layout/time_epg_list.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:layout_height="fill_parent"
+    android:orientation="vertical">
+
+   <LinearLayout
+        android:id="@+id/whatson_time"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:orientation="horizontal">
+        	
+         <TextView
+            android:id="@+id/epg_list_time_label"      
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/epg_list_time_label"/>
+
+			   <Spinner
+			       android:id="@+id/epg_list_time_spinner"
+			       android:layout_width="fill_parent"
+			       android:layout_height="wrap_content"
+			       android:prompt="@string/epg_list_time_label"/>
+    
+    </LinearLayout>
+    
+    <ListView
+        android:id="@+id/whatson_list"        
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:layout_below="@id/epg_list_time_spinner"
+        android:layout_alignWithParentIfMissing="true"
+        android:layout_alignParentTop="true"
+        android:layout_centerHorizontal="true"
+        android:cacheColorHint="?android:attr/colorBackground"/>
+        
+     <TextView
+            android:id="@+id/epg_list_search_label"      
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/epg_list_search_label"/>
+
+	<LinearLayout android:orientation="vertical"
+		android:id="@+id/no_connection_layout" android:layout_width="fill_parent"
+		android:layout_height="fill_parent" android:visibility="gone">
+		<LinearLayout android:layout_height="fill_parent"
+			android:gravity="center" android:layout_width="fill_parent"
+			android:orientation="horizontal">
+			<TextView android:text="@string/no_connection"
+				android:layout_height="wrap_content" android:layout_width="wrap_content"
+				android:textSize="18dip" />
+			<ImageView android:src="@drawable/sad"
+				android:layout_height="wrap_content" android:layout_width="wrap_content" />
+			<Button android:text="@string/no_connection_retry"
+				android:textSize="18dip" android:layout_height="wrap_content"
+				android:layout_width="wrap_content" android:id="@+id/retry_button" />
+
+		</LinearLayout>
+	</LinearLayout>            
+
+     
+</LinearLayout>
diff --git a/vdrmanager/res/layout/timer_list.xml b/vdrmanager/res/layout/timer_list.xml
index 13cff32..2416767 100644
--- a/vdrmanager/res/layout/timer_list.xml
+++ b/vdrmanager/res/layout/timer_list.xml
@@ -1,11 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
-<ListView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/timer_list"        
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:layout_alignWithParentIfMissing="true"
-    android:layout_alignParentTop="true"
-    android:layout_centerHorizontal="true"
-    android:cacheColorHint="?android:attr/colorBackground"
-/>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_width="fill_parent" android:layout_height="fill_parent"
+	android:orientation="vertical">
+	<LinearLayout android:layout_height="fill_parent"
+		android:layout_width="fill_parent" android:id="@+id/main_content">
+		<ListView xmlns:android="http://schemas.android.com/apk/res/android"
+			android:id="@+id/timer_list" android:layout_width="fill_parent"
+			android:layout_height="fill_parent"
+			android:layout_alignWithParentIfMissing="true"
+			android:layout_alignParentTop="true" android:layout_centerHorizontal="true"
+			android:cacheColorHint="?android:attr/colorBackground" />
+	</LinearLayout>
+	<LinearLayout android:orientation="vertical"
+		android:id="@+id/no_connection_layout" android:layout_width="fill_parent"
+		android:layout_height="fill_parent" android:visibility="gone">
+		<LinearLayout android:layout_height="fill_parent"
+			android:gravity="center" android:layout_width="fill_parent"
+			android:orientation="horizontal">
+			<TextView android:text="@string/no_connection"
+				android:layout_height="wrap_content" android:layout_width="wrap_content"
+				android:textSize="18dip" />
+			<ImageView android:src="@drawable/sad"
+				android:layout_height="wrap_content" android:layout_width="wrap_content" />
+			<Button android:text="@string/no_connection_retry"
+				android:textSize="18dip" android:layout_height="wrap_content"
+				android:layout_width="wrap_content" android:id="@+id/retry_button" />
+
+		</LinearLayout>
+	</LinearLayout>
+</LinearLayout>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/channel_list_group_menu.xml b/vdrmanager/res/menu/channel_list_group_menu.xml
new file mode 100644
index 0000000..d3f7b5f
--- /dev/null
+++ b/vdrmanager/res/menu/channel_list_group_menu.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+  <item
+    android:id="@+id/channel_group_menu_hide"
+    android:title="@string/channel_group_menu_hide"/>
+  <item
+    android:id="@+id/channel_group_menu_hide_permanent"
+    android:title="@string/channel_group_menu_hide_permanent"/>
+
+</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/channel_list_item_menu.xml b/vdrmanager/res/menu/channel_list_item_menu.xml
index 7e4915c..dfaa346 100644
--- a/vdrmanager/res/menu/channel_list_item_menu.xml
+++ b/vdrmanager/res/menu/channel_list_item_menu.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 
+<item
+  android:id="@+id/channel_item_menu_stream"
+  android:title="@string/channel_item_menu_stream"/>
+
   <item
     android:id="@+id/channel_item_menu_epg"
     android:title="@string/channel_item_menu_epg"/>
-	<item
-	  android:id="@+id/channel_item_menu_stream"
-	  android:title="@string/channel_item_menu_stream"/>
+	  
+  <item
+    android:id="@+id/channel_item_menu_hide"
+    android:title="@string/channel_item_menu_hide"/>
+  <item
+    android:id="@+id/channel_item_menu_hide_permanent"
+    android:title="@string/channel_item_menu_hide_permanent"/>
     
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/epg_list_item_menu.xml b/vdrmanager/res/menu/epg_list_item_menu.xml
index 6a38f26..ae7149e 100644
--- a/vdrmanager/res/menu/epg_list_item_menu.xml
+++ b/vdrmanager/res/menu/epg_list_item_menu.xml
@@ -1,17 +1,10 @@
 <?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"/>
-	<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"/>
-  <item
-    android:id="@+id/epg_item_menu_timer_modify"
-    android:title="@string/epg_item_menu_timer_modify"/>
-    
+	<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" />
+
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/recording_list_item_menu.xml b/vdrmanager/res/menu/recording_list_item_menu.xml
new file mode 100644
index 0000000..4c664ea
--- /dev/null
+++ b/vdrmanager/res/menu/recording_list_item_menu.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+	<item android:id="@+id/recording_item_menu_delete" android:title="@string/recording_item_menu_delete"/>
+	<item android:id="@+id/recording_item_menu_stream"    android:title="@string/recording_item_menu_stream"/>
+
+</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/values/action_menu.xml b/vdrmanager/res/values/action_menu.xml
index 68d11a3..1e1e148 100644
--- a/vdrmanager/res/values/action_menu.xml
+++ b/vdrmanager/res/values/action_menu.xml
@@ -3,6 +3,7 @@
 
   <string name="action_menu_channels">Channels</string>   
   <string name="action_menu_timers">Timers</string>
+  <string name="action_menu_recordings">Recordings</string>
   <string name="action_menu_epg">EPG list</string>
   <string name="action_menu_search">EPG search</string>
   <string name="action_menu_wakeup">Wakeup</string>
diff --git a/vdrmanager/res/values/channel_list.xml b/vdrmanager/res/values/channel_list.xml
new file mode 100644
index 0000000..8c3bd89
--- /dev/null
+++ b/vdrmanager/res/values/channel_list.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+
+  <string name="channel_item_menu_epg">Show EPG</string>
+  <string name="channel_item_menu_stream">Show live stream</string>
+  <string name="channel_item_menu_hide">Hide</string>
+  <string name="channel_item_menu_hide_permanent">Hide permanent</string>
+  
+  <string name="channel_group_menu_hide">Hide</string>
+  <string name="channel_group_menu_hide_permanent">Hide permanent</string>
+  
+  <string name="groupby_group">Group</string>
+  <string name="groupby_provider">Provider</string>
+  <string name="groupby_name">Name</string>
+  <string name="groupby_name_all_channels_group">All Channels</string>
+  <string name="groupby_window_title_templte">Group by %1$s</string>
+</resources>
diff --git a/vdrmanager/res/values/channel_list_menu.xml b/vdrmanager/res/values/channel_list_menu.xml
deleted file mode 100644
index 7d88621..0000000
--- a/vdrmanager/res/values/channel_list_menu.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-  <string name="channel_item_menu_epg">Show EPG</string>
-  <string name="channel_item_menu_stream">Show live stream</string>
-  
-</resources>
diff --git a/vdrmanager/res/values/common.xml b/vdrmanager/res/values/common.xml
index 50c6ffd..8fbde34 100644
--- a/vdrmanager/res/values/common.xml
+++ b/vdrmanager/res/values/common.xml
@@ -3,4 +3,7 @@
   <string name="common_delete">Delete</string>
   <string name="prefs_current_value">Current:</string>
   <string name="prefs_current_value_template">Current: %1$s</string>
+  <string name="no_connection">No connection</string>
+  <string name="no_connection_retry">Retry</string>
+  <string name="refresh">Refresh</string>
 </resources>
diff --git a/vdrmanager/res/values/epg.xml b/vdrmanager/res/values/epg.xml
index a1fd152..ee5ae48 100644
--- a/vdrmanager/res/values/epg.xml
+++ b/vdrmanager/res/values/epg.xml
@@ -14,5 +14,8 @@
   
   <!-- search -->
   <string name="epg_search_button">Search</string>
-  
+  <string name="epg_duration_template">%1$s min</string>
+  <string name="epg_duration_template_live">%1$s/%2$s min</string>
+  <string name="epg_of_a_channel">EPG -> %1$s</string>
+
 </resources>
diff --git a/vdrmanager/res/values/epg_list_menu.xml b/vdrmanager/res/values/epg_list_menu.xml
index bde8085..7176f28 100644
--- a/vdrmanager/res/values/epg_list_menu.xml
+++ b/vdrmanager/res/values/epg_list_menu.xml
@@ -9,5 +9,6 @@
   <string name="epg_item_menu_timer_modify">Modify timer</string>
   <string name="epg_item_menu_timer_enable">Enable timer</string>
   <string name="epg_item_menu_timer_disable">Disable timer</string>
+  <string name="epg_no_items">Nothing there…</string>
   
 </resources>
diff --git a/vdrmanager/res/values/errors.xml b/vdrmanager/res/values/errors.xml
index e954a26..9e0aa78 100644
--- a/vdrmanager/res/values/errors.xml
+++ b/vdrmanager/res/values/errors.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-  <string name="vdr_error_text">The communication with VDR has caused some error.</string>
+  <string name="vdr_error_text">The communication with VDR has caused an error: %1$s</string>
   
 </resources>
diff --git a/vdrmanager/res/values/livetv.xml b/vdrmanager/res/values/livetv.xml
new file mode 100644
index 0000000..266f862
--- /dev/null
+++ b/vdrmanager/res/values/livetv.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+	<string name="livetv">Live TV</string>
+	<string name="settings_livetv_summary">Needs streamdev-server on VDR and an external
+		player such as VPlayer</string>
+	<string name="settings_livetv_streamformat">Streamformat</string>
+	<string name="settings_livetv_port">Streaming Port</string>
+	<string name="settings_livetv_port_summary">Default 3000. The access must be enabled in
+		streamdevhosts.conf.</string>
+	<string-array name="livetv_streamformat">
+		<item>TS</item>
+		<item>PES</item>
+		<item>ES</item>
+		<item>PS</item>
+		<item>External</item>
+	</string-array>
+	<string-array name="livetv_streamformat_values">
+		<item>TS</item>
+		<item>PES</item>
+		<item>ES</item>
+		<item>PS</item>
+		<item>EXT</item>
+	</string-array>
+</resources>
diff --git a/vdrmanager/res/values/progress.xml b/vdrmanager/res/values/progress.xml
index 2fb5580..7c25559 100644
--- a/vdrmanager/res/values/progress.xml
+++ b/vdrmanager/res/values/progress.xml
@@ -3,10 +3,12 @@
   
   <!--  progress -->
   <string name="progress_connect">Connecting …</string>
+  <string name="progress_connect_error">Connection failed</string>
   <string name="progress_login">Login …</string>
   <string name="progress_login_error">Login failed</string>
   <string name="progress_whatson_loading">Loading EPG …</string>
   <string name="progress_timers_loading">Loading timers …</string>
+  <string name="progress_recordings_loading">Loading recordings …</string>
   <string name="progress_channels_loading">Loading channels …</string>
   <string name="progress_disconnect">Disconnecting …</string>
   <string name="progress_wakeup_sending">Initiating wakeup request …</string>
@@ -16,5 +18,8 @@
   <string name="progress_timer_delete">Deleting timer …</string>
   <string name="progress_timer_enable">Enabling timer …</string>
   <string name="progress_timer_disable">Disabling timer …</string>
+  <string name="progress_connect_finished_abnormal">Connection finished abnormal …</string>
+  <string name="progress_connect_finished_abnormal_arg">Connection finished abnormal: %1$s</string>
+  <string name="progress_cache_hit">Loading from cache …</string>
   
 </resources>
diff --git a/vdrmanager/res/values/recording_list_menu.xml b/vdrmanager/res/values/recording_list_menu.xml
new file mode 100644
index 0000000..58ac2d3
--- /dev/null
+++ b/vdrmanager/res/values/recording_list_menu.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <string name="recording_item_menu_delete">Delete</string>
+  <string name="recording_item_menu_stream">Stream</string>
+</resources>
-- 
cgit v1.2.3