Feature #1321

5 files changed, 41 insertions, 53 deletions

diff --git a/vdrmanager/res/drawable/folder.png b/vdrmanager/res/drawable/folder.png
new file mode 100644
index 0000000..5b3fcec
--- /dev/null
+++ b/vdrmanager/res/drawable/folder.png
diff --git a/vdrmanager/res/layout-land/vdrmanager.xml b/vdrmanager/res/layout-land/vdrmanager.xml
index 52cc9c6..8f5b86e 100644
--- a/vdrmanager/res/layout-land/vdrmanager.xml
+++ b/vdrmanager/res/layout-land/vdrmanager.xml
@@ -8,13 +8,13 @@
 	<ImageView android:id="@+id/main_logo" android:layout_width="fill_parent"
 		android:layout_height="80dip" android:src="@drawable/vdr_logo" android:paddingBottom="5dip" />
 
-	<!-- <ListView android:id="@+id/vdrmanager_menu" android:layout_width="fill_parent" 
+	<!-- <ListView android:id="@+id/vdrmanager_menu" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:layout_below="@id/main_logo"/> -->
 
 		<LinearLayout android:layout_width="fill_parent"
 			android:layout_height="wrap_content" android:orientation="horizontal" android:padding="3dip">
 			<Button android:text="@string/action_menu_channels"
-				xmlns:android="http://schemas.android.com/apk/res/android"
+
 				android:drawableTop="@drawable/btn_channels" android:layout_width="wrap_content"
 				android:id="@+id/action_menu_channels" android:layout_height="wrap_content"
 				android:textColor="#FFF" android:layout_weight="1"
@@ -23,17 +23,17 @@
 
 
 			<Button android:text="@string/action_menu_recordings"
-				xmlns:android="http://schemas.android.com/apk/res/android"  android:padding="3dip"
+		 android:padding="3dip"
 				android:drawableTop="@drawable/btn_recordings" android:layout_width="wrap_content"
 				android:id="@+id/action_menu_recordings" android:layout_height="wrap_content"
 				android:layout_weight="1"
 				android:cacheColorHint="?android:attr/colorBackground"
 				android:background="@android:drawable/list_selector_background"
-				 android:textColor="#FFF" 
+				 android:textColor="#FFF"
 				/>
 
 			<Button
-			    xmlns:android="http://schemas.android.com/apk/res/android"
+
 			    android:id="@+id/action_menu_timers"
 			    android:layout_width="wrap_content"
 			    android:layout_height="wrap_content"
@@ -46,27 +46,8 @@
 			    android:textColor="#FFF" />
 
 		</LinearLayout>
-		<LinearLayout android:layout_width="fill_parent" 
+		<LinearLayout android:layout_width="fill_parent"
 			android:layout_height="wrap_content" android:orientation="horizontal">
-			<Button android:text="@string/action_menu_epg"
-				xmlns:android="http://schemas.android.com/apk/res/android"
-				android:drawableTop="@drawable/btn_epglist" android:layout_width="wrap_content"
-				android:id="@+id/action_menu_epg" android:layout_height="wrap_content"
-				 android:layout_weight="1"
-				android:cacheColorHint="?android:attr/colorBackground"
-				android:padding="3dip"
-				android:background="@android:drawable/list_selector_background"
-				android:textColor="#FFF" />
-
-			<Button android:text="@string/action_menu_search"
-				xmlns:android="http://schemas.android.com/apk/res/android"
-				android:drawableTop="@drawable/btn_search" android:layout_width="wrap_content"
-				android:id="@+id/action_menu_search" android:layout_height="wrap_content"
-				android:layout_weight="1"
-				android:cacheColorHint="?android:attr/colorBackground"
-				android:background="@android:drawable/list_selector_background"
-				android:padding="3dip"
-				android:textColor="#FFF" />
 
 			<Button android:text="@string/action_menu_wakeup"
 				xmlns:android="http://schemas.android.com/apk/res/android" android:layout_weight="1"
@@ -77,6 +58,6 @@
 				android:background="@android:drawable/list_selector_background"
 				android:textColor="#FFF" />
 		</LinearLayout>
-	
+
 </LinearLayout>
 	</ScrollView>
\ No newline at end of file
diff --git a/vdrmanager/res/layout/folder_item.xml b/vdrmanager/res/layout/folder_item.xml
new file mode 100644
index 0000000..fa2f8ab
--- /dev/null
+++ b/vdrmanager/res/layout/folder_item.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="fill_parent"
+    android:orientation="horizontal"
+    android:padding="5dip"
+    android:layout_height="wrap_content" >
+
+    <ImageView
+        android:layout_width="24dp"
+        android:layout_height="24dp"
+        android:src="@drawable/folder" />
+
+    <TextView
+        android:id="@+id/header_item"
+        android:textAppearance="?android:textAppearanceMedium"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:paddingLeft="5dip"
+        android:layout_gravity="center_vertical"
+        android:text="House of Cards" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/vdrmanager/res/layout/header_item.xml b/vdrmanager/res/layout/header_item.xml
index 0ca07d6..0821980 100644
--- a/vdrmanager/res/layout/header_item.xml
+++ b/vdrmanager/res/layout/header_item.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <TextView xmlns:android="http://schemas.android.com/apk/res/android"
-android:text="Header" 
+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/vdrmanager.xml b/vdrmanager/res/layout/vdrmanager.xml
index d963d70..8fdf062 100644
--- a/vdrmanager/res/layout/vdrmanager.xml
+++ b/vdrmanager/res/layout/vdrmanager.xml
@@ -6,7 +6,7 @@
         android:layout_height="wrap_content"
 
         >
-        
+
 <LinearLayout
 	android:layout_width="fill_parent" android:layout_height="fill_parent"
 	android:orientation="vertical" android:padding="10dip">
@@ -15,7 +15,7 @@
 	    android:clickable="true"
 		android:layout_height="80dip" android:src="@drawable/vdr_logo" android:padding="10dip" />
 
-	<!-- <ListView android:id="@+id/vdrmanager_menu" android:layout_width="fill_parent" 
+	<!-- <ListView android:id="@+id/vdrmanager_menu" android:layout_width="fill_parent"
 		android:layout_height="wrap_content" android:layout_below="@id/main_logo"/> -->
 
 		<LinearLayout android:layout_width="fill_parent"
@@ -26,9 +26,8 @@
 				android:textColor="#FFF" android:layout_weight="1"
 				android:cacheColorHint="?android:attr/colorBackground"
 				android:background="@android:drawable/list_selector_background"/>
-		
+
 			<Button android:text="@string/action_menu_epg"
-				xmlns:android="http://schemas.android.com/apk/res/android"
 				android:drawableTop="@drawable/btn_epglist" android:layout_width="wrap_content"
 				android:id="@+id/action_menu_epg" android:layout_height="wrap_content"
 				android:layout_weight="1"
@@ -37,22 +36,20 @@
 				android:textColor="#FFF" />
 
 		</LinearLayout>
-		
+
 		<LinearLayout android:layout_width="fill_parent" android:padding="10dip"
 			android:layout_height="wrap_content" android:orientation="horizontal">
-		
+
 			<Button android:text="@string/action_menu_recordings"
-				xmlns:android="http://schemas.android.com/apk/res/android"  
 				android:drawableTop="@drawable/btn_recordings" android:layout_width="wrap_content"
 				android:id="@+id/action_menu_recordings" android:layout_height="wrap_content"
 				android:layout_weight="1"
 				android:cacheColorHint="?android:attr/colorBackground"
 				android:background="@android:drawable/list_selector_background"
-				android:textColor="#FFF" 
+				android:textColor="#FFF"
 				/>
-				
+
 			<Button android:text="@string/action_menu_timers"
-				xmlns:android="http://schemas.android.com/apk/res/android" 
 				android:drawableTop="@drawable/btn_timer" android:layout_width="wrap_content"
 				android:id="@+id/action_menu_timers" android:layout_height="wrap_content"
 				android:layout_weight="1"
@@ -63,29 +60,17 @@
 
 		<LinearLayout android:layout_width="fill_parent" android:padding="10dip"
 			android:layout_height="wrap_content" android:orientation="horizontal">
-			
-	
-
-			<Button android:text="@string/action_menu_search"
-				xmlns:android="http://schemas.android.com/apk/res/android"
-				android:drawableTop="@drawable/btn_search" android:layout_width="wrap_content"
-				android:id="@+id/action_menu_search" android:layout_height="wrap_content"
-			 android:layout_weight="1"
-				android:cacheColorHint="?android:attr/colorBackground"
-				android:background="@android:drawable/list_selector_background"
-		
-				android:textColor="#FFF" />
 
 			<Button android:text="@string/action_menu_wakeup"
-				xmlns:android="http://schemas.android.com/apk/res/android" android:layout_weight="1"
+				android:layout_weight="1"
 				android:padding="5dip"
 				android:drawableTop="@drawable/btn_wakeup" android:layout_width="wrap_content"
 				android:id="@+id/action_menu_wakeup" android:layout_height="wrap_content"
-			
+
 				android:cacheColorHint="?android:attr/colorBackground"
 				android:background="@android:drawable/list_selector_background"
 				android:textColor="#FFF" />
 		</LinearLayout>
-		
+
 </LinearLayout>
 </ScrollView>
\ No newline at end of file