From 421a5adede3d223019d27bd20460a7e9eca296fb Mon Sep 17 00:00:00 2001
From: lado <herrlado@gmail.com>
Date: Fri, 23 Mar 2012 09:18:44 +0100
Subject: http://projects.vdr-developer.org/issues/913
 http://projects.vdr-developer.org/issues/873
 http://projects.vdr-developer.org/issues/866

---
 vdrmanager/res/layout/timer_detail.xml | 103 ++++++++++++++++++++++++++-------
 1 file changed, 81 insertions(+), 22 deletions(-)

(limited to 'vdrmanager/res/layout')

diff --git a/vdrmanager/res/layout/timer_detail.xml b/vdrmanager/res/layout/timer_detail.xml
index 21432eb..d86d9ef 100644
--- a/vdrmanager/res/layout/timer_detail.xml
+++ b/vdrmanager/res/layout/timer_detail.xml
@@ -33,34 +33,69 @@
 			    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
 			        android:id="@+id/timer_detail_title"
 			        android:layout_width="fill_parent"
 			        android:layout_height="wrap_content"/>
 			            
+			    
+			    
+			    <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal">
+			    
+			    <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical">
+			           
 			    <TextView
+			    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_day_title"/>
+			    
+			    		         
+               <Button
+                   android:id="@+id/timer_detail_day"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:editable="false"/>        
+			    
+               </LinearLayout>
+               
+			<LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical"> 
+			   <TextView
+			    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_repeat_title"/>
+			    
+			    		         
+               <Button
+                   android:id="@+id/timer_detail_repeat"
+                   android:layout_width="wrap_content"
+                   android:layout_height="wrap_content"
+                   android:text="@string/never"
+                   android:editable="false"/>        
+			    
+               </LinearLayout>
+               
+			    
+			    </LinearLayout>
+			    
+			     
+			    <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal">
+			    
+			    <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical">
+			    
+		
+ 			    <TextView
 			    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
-			         android:id="@+id/timer_detail_start_daytime"
-			         android:layout_width="fill_parent"
-			         android:layout_height="wrap_content">
-			         
+			        			         
 					     <Button
 					         android:id="@+id/timer_detail_start"
 					         android:layout_width="wrap_content"
 					         android:layout_height="wrap_content"
+					         android:text="20:34"
 					         android:editable="false"/>
-					         
-               <Button
-                   android:id="@+id/timer_detail_day"
-                   android:layout_width="wrap_content"
-                   android:layout_height="wrap_content"
-                   android:editable="false"/>          
-					         
-					 </LinearLayout>
-			                
+	
+					     </LinearLayout>
+					     
+			     <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="vertical">
 			     <TextView
 			     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"/>
@@ -71,13 +106,37 @@
 			         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>
+			     
+			</LinearLayout>
+			</LinearLayout>
+			
+			 <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal">
+			      <TextView android:width="80dp" android:text="@string/timer_detail_use_vps" android:layout_width="wrap_content" android:layout_height="wrap_content" />
+			      <CheckBox android:id="@+id/timer_detail_vps" android:layout_height="wrap_content" android:layout_width="wrap_content"/>
+			 </LinearLayout>
+			 
+		 
+			 
+		    
+		 <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal">
+		     
+		    <TextView android:width="80dp" android:text="@string/timer_detail_priority" android:layout_width="wrap_content" android:layout_height="wrap_content" />
+		     
+		    <EditText android:layout_height="wrap_content" android:numeric="integer" android:id="@+id/timer_detail_priority"  android:layout_width="wrap_content" android:hint="@string/timer_detail_priority"/>
+		    
+		    
+		    </LinearLayout>
+		    
+		 	 <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal">
+		     
+		    <TextView android:width="80dp" android:text="@string/timer_detail_lifetime" android:layout_width="wrap_content" android:layout_height="wrap_content" />
+		     
+		    <EditText android:layout_height="wrap_content"  android:numeric="integer" android:id="@+id/timer_detail_lifetime"  android:layout_width="wrap_content" android:hint="@string/timer_detail_lifetime_hint"/>
+		    
+		    
+		    </LinearLayout>
+		 
+         </LinearLayout>
         
     </ScrollView>
 
-- 
cgit v1.2.3