refactoring

9 files changed, 85 insertions, 29 deletions

diff --git a/vdrmanager/res/menu/channel_list_item_menu.xml b/vdrmanager/res/menu/channel_list_item_menu.xml
index aa953ac..c2fc9e0 100644
--- a/vdrmanager/res/menu/channel_list_item_menu.xml
+++ b/vdrmanager/res/menu/channel_list_item_menu.xml
@@ -5,21 +5,24 @@
   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 
+-->
+
+<item
 	android:id="@+id/channel_item_menu_switch"
     android:title="@string/channel_item_menu_switch"/>
-      
-  
+
+<!--
   <item android:visible="false"
     android:id="@+id/channel_item_menu_hide"
     android:title="@string/channel_item_menu_hide"/>
+
   <item  android:visible="false"
     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/channellist.xml b/vdrmanager/res/menu/channellist.xml
index 2ca3884..29cf2d8 100644
--- a/vdrmanager/res/menu/channellist.xml
+++ b/vdrmanager/res/menu/channellist.xml
@@ -10,7 +10,7 @@
     <item
         android:id="@+id/channels_groupby" android:alphabeticShortcut="g"
         android:icon="@android:drawable/ic_menu_sort_alphabetically"
-        android:showAsAction="ifRoom"
+		android:showAsAction="ifRoom"
         android:title="@string/menu_groupby"/>
 
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/epg_event_list_menu.xml b/vdrmanager/res/menu/epg_event_list_menu.xml
new file mode 100644
index 0000000..c0615e9
--- /dev/null
+++ b/vdrmanager/res/menu/epg_event_list_menu.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!--
+	<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"/>
+    -->
+    <!--  -->
+
+    <item
+        android:id="@+id/epg_list_stream"
+        android:icon="@drawable/ic_menu_play_clip"
+        android:showAsAction="ifRoom"
+        android:title="@string/livetv"/>
+</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 7bda366..15dbef8 100644
--- a/vdrmanager/res/menu/epg_list_item_menu.xml
+++ b/vdrmanager/res/menu/epg_list_item_menu.xml
@@ -1,29 +1,28 @@
 <?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"
+    <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"/>
-	
-	<item android:id="@+id/epg_item_menu_switchto" 	   android:title="@string/switch_to_channel" android:visible="true" />
-    
+    <item
+        android:id="@+id/epg_item_menu_switchto"
+        android:title="@string/switch_to_channel"
+        android:visible="true"/>
+
 </menu>
\ 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 8d1b0ba..ebbefa9 100644
--- a/vdrmanager/res/menu/epg_list_menu.xml
+++ b/vdrmanager/res/menu/epg_list_menu.xml
@@ -1,22 +1,24 @@
 <?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!--
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <!--
 	<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"/>
     -->
+    <!--  -->
 
-	<item
-	  android:showAsAction="ifRoom"
-	  android:id="@+id/epg_list_sort_menu"
-	  android:icon="@android:drawable/ic_menu_sort_alphabetically"
-	  android:title="@string/sort"/>
+    <item
+        android:id="@+id/epg_list_sort_menu"
+        android:icon="@android:drawable/ic_menu_sort_alphabetically"
+        android:showAsAction="ifRoom"
+        android:title="@string/sort"/>
 
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/epg_search_menu.xml b/vdrmanager/res/menu/epg_search_menu.xml
new file mode 100644
index 0000000..e4bf9d0
--- /dev/null
+++ b/vdrmanager/res/menu/epg_search_menu.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android">
+
+<!-- -->
+	<item
+	  android:id="@+id/epg_search"
+	  android:icon="@android:drawable/ic_menu_search"
+	  android:alphabeticShortcut="s"
+	  android:showAsAction="always"
+	  android:title="@string/action_menu_search"/>
+
+</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/recording_list_menu.xml b/vdrmanager/res/menu/recording_list_menu.xml
index 2edc02b..ddc32e7 100644
--- a/vdrmanager/res/menu/recording_list_menu.xml
+++ b/vdrmanager/res/menu/recording_list_menu.xml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
-<!-- 
+<!--
 	<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"/>
     -->
-    
+	<!--
     <item
         android:id="@+id/menu_groupby" android:alphabeticShortcut="g"
         android:icon="@android:drawable/ic_menu_sort_alphabetically"
         android:showAsAction="ifRoom"
         android:title="@string/menu_groupby"/>
+     -->
 </menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/refresh_filter_menu.xml b/vdrmanager/res/menu/refresh_filter_menu.xml
new file mode 100644
index 0000000..a8065b5
--- /dev/null
+++ b/vdrmanager/res/menu/refresh_filter_menu.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+
+    <item
+        android:id="@+id/list_refresh"
+        android:alphabeticShortcut="r"
+        android:icon="@drawable/ic_menu_refresh"
+        android:showAsAction="ifRoom"
+        android:title="@string/refresh"/>
+
+    <item
+        android:id="@+id/list_filter"
+        android:alphabeticShortcut="f"
+        android:icon="@drawable/ic_menu_filter"
+        android:showAsAction="ifRoom"
+        android:title="@string/filter"/>
+</menu>
\ No newline at end of file
diff --git a/vdrmanager/res/menu/refresh_menu.xml b/vdrmanager/res/menu/refresh_menu.xml
index 9c31b62..1d8dcad 100644
--- a/vdrmanager/res/menu/refresh_menu.xml
+++ b/vdrmanager/res/menu/refresh_menu.xml
@@ -4,8 +4,7 @@
     <item
         android:id="@+id/list_refresh"
         android:alphabeticShortcut="r"
-        android:icon="@drawable/ic_menu_refresh"
         android:showAsAction="ifRoom"
+        android:icon="@drawable/ic_menu_refresh"
         android:title="@string/refresh"/>
-
 </menu>
\ No newline at end of file