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

12 files changed, 48 insertions, 27 deletions

diff --git a/vdrmanager/res/drawable/channels.gif b/vdrmanager/res/drawable/channels.gif
deleted file mode 100644
index f9874ff..0000000
--- a/vdrmanager/res/drawable/channels.gif
+++ /dev/null
diff --git a/vdrmanager/res/drawable/settings.gif b/vdrmanager/res/drawable/settings.gif
deleted file mode 100644
index 5d36e7c..0000000
--- a/vdrmanager/res/drawable/settings.gif
+++ /dev/null
diff --git a/vdrmanager/res/drawable/timer_inactive.png b/vdrmanager/res/drawable/timer_inactive.png
index c7a75c4..5f657a2 100644
--- a/vdrmanager/res/drawable/timer_inactive.png
+++ b/vdrmanager/res/drawable/timer_inactive.png
diff --git a/vdrmanager/res/drawable/timer_none.png b/vdrmanager/res/drawable/timer_none.png
index dbf17ad..a81516d 100644
--- a/vdrmanager/res/drawable/timer_none.png
+++ b/vdrmanager/res/drawable/timer_none.png
diff --git a/vdrmanager/res/drawable/timers.gif b/vdrmanager/res/drawable/timers.gif
deleted file mode 100644
index 3577dab..0000000
--- a/vdrmanager/res/drawable/timers.gif
+++ /dev/null
diff --git a/vdrmanager/res/drawable/whatson.gif b/vdrmanager/res/drawable/whatson.gif
deleted file mode 100644
index 5a35904..0000000
--- a/vdrmanager/res/drawable/whatson.gif
+++ /dev/null
diff --git a/vdrmanager/res/layout/epg_event_item.xml b/vdrmanager/res/layout/epg_event_item.xml
index bf54b10..e4fd6a6 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="5dp"
+	android:layout_height="fill_parent" android:padding="5dp" android:paddingBottom="2dp"
 	android:orientation="vertical">
 	
 <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical"
@@ -31,20 +31,21 @@
 			
 	</LinearLayout>
 
-	<LinearLayout android:layout_width="fill_parent" 		android:padding="3dip"
+	<LinearLayout android:layout_width="fill_parent" android:padding="3dip" android:paddingBottom="1dip"
 		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"
+		<ImageView android:id="@+id/timer_item_state" android:layout_marginRight="5dip"
+			android:layout_width="wrap_content" android:layout_height="fill_parent"
 			android:layout_centerVertical="true" android:visibility="gone" />
 
 		<TextView android:id="@+id/timer_item_shorttext" android:textAppearance="?android:textAppearanceSmall"
-			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:text="timer_short_text" 
+			android:ellipsize="end"
+			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"
+		<TextView android:id="@+id/timer_item_duration"
 			android:ellipsize="end" android:layout_width="wrap_content" android:gravity="right" 	android:textSize="13dip"
 			android:layout_height="wrap_content" android:text="89min"/>
 			
diff --git a/vdrmanager/res/layout/header_item.xml b/vdrmanager/res/layout/header_item.xml
new file mode 100644
index 0000000..0ca07d6
--- /dev/null
+++ b/vdrmanager/res/layout/header_item.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<TextView xmlns:android="http://schemas.android.com/apk/res/android"
+android:text="Header" 
+android:layout_margin="2dip" android:paddingLeft="4dip" android:paddingRight="4dip"
+android:background="#444444"
+android:textAppearance="?android:textAppearanceMedium"
+android:layout_width="fill_parent" android:layout_height="wrap_content" android:id="@+id/header_item"/>
+	
diff --git a/vdrmanager/res/layout/timer_detail.xml b/vdrmanager/res/layout/timer_detail.xml
index 0aa5da7..1374e68 100644
--- a/vdrmanager/res/layout/timer_detail.xml
+++ b/vdrmanager/res/layout/timer_detail.xml
@@ -3,6 +3,7 @@
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
+    android:paddingLeft="10.0dip" android:paddingRight="10.0dip"
     android:orientation="vertical">
     
     <ScrollView
@@ -18,23 +19,18 @@
         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:paddingLeft="4.0dip" android:paddingBottom="2.0dip" android:layout_width="fill_parent"	android:layout_height="wrap_content" android:layout_marginTop="2.0dip"
 			        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"/>
+			        android:enabled="false"
+			       />
 			            				            
 			    <TextView
-			        android:id="@+id/timer_detail_title_title"
-			        android:layout_width="wrap_content"
-			        android:layout_height="wrap_content"
-			        android:textStyle="bold"
+			    android:paddingLeft="4.0dip" android:paddingBottom="2.0dip" android:layout_width="fill_parent"	android:layout_height="wrap_content" android:layout_marginTop="2.0dip"
 			        android:text="@string/timer_detail_title_title"/>
 			
 			    <EditText
@@ -43,9 +39,7 @@
 			        android:layout_height="wrap_content"/>
 			            
 			    <TextView
-			         android:id="@+id/timer_detail_start_title"
-			         android:layout_width="wrap_content"
-			         android:layout_height="wrap_content"
+			    android:paddingLeft="4.0dip" android:paddingBottom="2.0dip" android:layout_width="fill_parent"	android:layout_height="wrap_content" android:layout_marginTop="2.0dip"
 			         android:text="@string/timer_detail_start_title"/>
 			         
 			    <LinearLayout
@@ -68,10 +62,8 @@
 					 </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"/>
+			     android:paddingLeft="4.0dip" android:paddingBottom="2.0dip" android:layout_width="fill_parent"	android:layout_height="wrap_content" android:layout_marginTop="2.0dip"
+				         android:text="@string/timer_detail_end_title"/>
 			
 			     <EditText
 			         android:id="@+id/timer_detail_end"
@@ -89,11 +81,28 @@
         
     </ScrollView>
 
+<LinearLayout android:orientation="horizontal" android:layout_width="fill_parent" android:layout_height="wrap_content" >
+
+    <Button
+        android:id="@+id/timer_details_cancel"
+       	android:layout_width="0dip" android:layout_height="fill_parent"
+				android:layout_weight="1"
+        android:text="@android:string/cancel"/>
+
+	<Button
+        android:id="@+id/timer_details_modify"
+		android:layout_width="0dip" android:layout_height="fill_parent"
+		android:layout_weight="1"
+		android:visibility="gone"
+        android:text="@string/timer_details_save_title"/>
+    
+
     <Button
         android:id="@+id/timer_details_save"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
+		android:layout_width="0dip" android:layout_height="fill_parent"
+				android:layout_weight="1"
         android:text="@string/timer_details_create_title"/>
+        
+        </LinearLayout>
 		                          
 </LinearLayout>
diff --git a/vdrmanager/res/values/common.xml b/vdrmanager/res/values/common.xml
index 8fbde34..340b42b 100644
--- a/vdrmanager/res/values/common.xml
+++ b/vdrmanager/res/values/common.xml
@@ -6,4 +6,5 @@
   <string name="no_connection">No connection</string>
   <string name="no_connection_retry">Retry</string>
   <string name="refresh">Refresh</string>
+  <string name="done">Done</string>
 </resources>
diff --git a/vdrmanager/res/values/epg_list_menu.xml b/vdrmanager/res/values/epg_list_menu.xml
index 7176f28..29a9efb 100644
--- a/vdrmanager/res/values/epg_list_menu.xml
+++ b/vdrmanager/res/values/epg_list_menu.xml
@@ -9,6 +9,7 @@
   <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>
+  <string name="epg_no_items">Nothing found…</string>
+  <string name="epg_client_errors">An error occurred, check logs…</string>
   
 </resources>
diff --git a/vdrmanager/res/values/progress.xml b/vdrmanager/res/values/progress.xml
index 7c25559..8007725 100644
--- a/vdrmanager/res/values/progress.xml
+++ b/vdrmanager/res/values/progress.xml
@@ -17,6 +17,7 @@
   <string name="progress_timer_save">Saving timer …</string>
   <string name="progress_timer_delete">Deleting timer …</string>
   <string name="progress_timer_enable">Enabling timer …</string>
+  <string name="progress_timer_modify">Updating 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>