summaryrefslogtreecommitdiff
path: root/vdrmanager/res/menu
diff options
context:
space:
mode:
Diffstat (limited to 'vdrmanager/res/menu')
-rw-r--r--vdrmanager/res/menu/channellist.xml6
-rw-r--r--vdrmanager/res/menu/epg_details.xml9
-rw-r--r--vdrmanager/res/menu/epg_event_list_menu.xml4
-rw-r--r--vdrmanager/res/menu/epg_list_menu.xml4
-rw-r--r--vdrmanager/res/menu/epg_search_menu.xml4
-rw-r--r--vdrmanager/res/menu/main_menu.xml10
-rw-r--r--vdrmanager/res/menu/recording_list_item_menu.xml21
-rw-r--r--vdrmanager/res/menu/refresh_filter_menu.xml6
-rw-r--r--vdrmanager/res/menu/refresh_menu.xml4
-rw-r--r--vdrmanager/res/menu/vdrlist.xml4
10 files changed, 42 insertions, 30 deletions
diff --git a/vdrmanager/res/menu/channellist.xml b/vdrmanager/res/menu/channellist.xml
index 29cf2d8..4f2695a 100644
--- a/vdrmanager/res/menu/channellist.xml
+++ b/vdrmanager/res/menu/channellist.xml
@@ -1,16 +1,16 @@
<?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" xmlns:v7="http://schemas.android.com/apk/res-auto" >
<item
android:id="@+id/channels_recent_channels" android:alphabeticShortcut="r"
android:icon="@drawable/ic_menu_recent_history"
- android:showAsAction="ifRoom"
+ v7:showAsAction="ifRoom"
android:title="@string/recent_channels"/>
<item
android:id="@+id/channels_groupby" android:alphabeticShortcut="g"
android:icon="@android:drawable/ic_menu_sort_alphabetically"
- android:showAsAction="ifRoom"
+ v7:showAsAction="ifRoom"
android:title="@string/menu_groupby"/>
</menu> \ No newline at end of file
diff --git a/vdrmanager/res/menu/epg_details.xml b/vdrmanager/res/menu/epg_details.xml
index 4353b0b..6ce238a 100644
--- a/vdrmanager/res/menu/epg_details.xml
+++ b/vdrmanager/res/menu/epg_details.xml
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android" >
+<menu xmlns:v7="http://schemas.android.com/apk/res-auto" xmlns:android="http://schemas.android.com/apk/res/android" >
<item
android:id="@+id/epg_details_menu_search_repeat"
- android:showAsAction="ifRoom"
+ v7:showAsAction="ifRoom"
android:icon="@drawable/ic_menu_view"
android:title="@string/search_reapt"/>
<item
- android:showAsAction="ifRoom"
+ v7:showAsAction="ifRoom"
android:id="@+id/epg_details_menu_share"
android:icon="@android:drawable/ic_menu_share"
android:title="@string/share"/>
<item
- android:showAsAction="ifRoom"
+ v7:showAsAction="ifRoom"
android:id="@+id/epg_details_menu_add_to_cal"
android:icon="@android:drawable/ic_menu_month"
android:title="@string/addtocal"/>
<item
+ v7:showAsAction="ifRoom"
android:id="@+id/epg_details_menu_switch"
android:icon="@drawable/ic_menu_goto"
android:title="@string/switch_to_channel"/>
diff --git a/vdrmanager/res/menu/epg_event_list_menu.xml b/vdrmanager/res/menu/epg_event_list_menu.xml
index c0615e9..4796a13 100644
--- a/vdrmanager/res/menu/epg_event_list_menu.xml
+++ b/vdrmanager/res/menu/epg_event_list_menu.xml
@@ -1,5 +1,5 @@
<?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" xmlns:v7="http://schemas.android.com/apk/res-auto" >
<!--
<item
@@ -16,8 +16,8 @@
<!-- -->
<item
+ v7:showAsAction="ifRoom"
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_menu.xml b/vdrmanager/res/menu/epg_list_menu.xml
index ebbefa9..2e1b029 100644
--- a/vdrmanager/res/menu/epg_list_menu.xml
+++ b/vdrmanager/res/menu/epg_list_menu.xml
@@ -1,5 +1,5 @@
<?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" xmlns:v7="http://schemas.android.com/apk/res-auto" >
<!--
<item
@@ -18,7 +18,7 @@
<item
android:id="@+id/epg_list_sort_menu"
android:icon="@android:drawable/ic_menu_sort_alphabetically"
- android:showAsAction="ifRoom"
+ v7: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
index e4bf9d0..22a69ee 100644
--- a/vdrmanager/res/menu/epg_search_menu.xml
+++ b/vdrmanager/res/menu/epg_search_menu.xml
@@ -1,12 +1,12 @@
<?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" xmlns:v7="http://schemas.android.com/apk/res-auto" >
<!-- -->
<item
android:id="@+id/epg_search"
android:icon="@android:drawable/ic_menu_search"
android:alphabeticShortcut="s"
- android:showAsAction="always"
+ v7:showAsAction="always"
android:title="@string/action_menu_search"/>
</menu> \ No newline at end of file
diff --git a/vdrmanager/res/menu/main_menu.xml b/vdrmanager/res/menu/main_menu.xml
index 5e452cb..f08a1fd 100644
--- a/vdrmanager/res/menu/main_menu.xml
+++ b/vdrmanager/res/menu/main_menu.xml
@@ -1,21 +1,21 @@
<?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" xmlns:v7="http://schemas.android.com/apk/res-auto" >
<item
android:id="@+id/main_menu_goto"
android:icon="@drawable/ic_menu_goto"
- android:showAsAction="ifRoom"
+ v7:showAsAction="ifRoom"
android:title="@string/main_menu_goto"/>
<item
android:id="@+id/menu_search"
- android:actionViewClass="com.actionbarsherlock.widget.SearchView"
+ v7:actionViewClass="android.support.v7.widget.SearchView"
android:icon="@android:drawable/ic_menu_search"
- android:showAsAction="always"
+ v7:showAsAction="always"
android:title="@string/search"/>
<item
android:id="@+id/main_menu_preferences"
android:icon="@android:drawable/ic_menu_preferences"
- android:showAsAction="ifRoom"
+ v7:showAsAction="ifRoom"
android:title="@string/main_menu_preferences"/>
<item
android:id="@+id/main_menu_clear_search"
diff --git a/vdrmanager/res/menu/recording_list_item_menu.xml b/vdrmanager/res/menu/recording_list_item_menu.xml
index b375ba0..1da52d5 100644
--- a/vdrmanager/res/menu/recording_list_item_menu.xml
+++ b/vdrmanager/res/menu/recording_list_item_menu.xml
@@ -1,8 +1,19 @@
<?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/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"/>
+ <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/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"/>
- <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" />
</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
index a8065b5..0046707 100644
--- a/vdrmanager/res/menu/refresh_filter_menu.xml
+++ b/vdrmanager/res/menu/refresh_filter_menu.xml
@@ -1,17 +1,17 @@
<?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" xmlns:v7="http://schemas.android.com/apk/res-auto" >
<item
android:id="@+id/list_refresh"
android:alphabeticShortcut="r"
android:icon="@drawable/ic_menu_refresh"
- android:showAsAction="ifRoom"
+ v7:showAsAction="ifRoom"
android:title="@string/refresh"/>
<item
android:id="@+id/list_filter"
android:alphabeticShortcut="f"
android:icon="@drawable/ic_menu_filter"
- android:showAsAction="ifRoom"
+ v7: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 1d8dcad..79626b9 100644
--- a/vdrmanager/res/menu/refresh_menu.xml
+++ b/vdrmanager/res/menu/refresh_menu.xml
@@ -1,10 +1,10 @@
<?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" xmlns:v7="http://schemas.android.com/apk/res-auto" >
<item
android:id="@+id/list_refresh"
android:alphabeticShortcut="r"
- android:showAsAction="ifRoom"
+ v7:showAsAction="ifRoom"
android:icon="@drawable/ic_menu_refresh"
android:title="@string/refresh"/>
</menu> \ No newline at end of file
diff --git a/vdrmanager/res/menu/vdrlist.xml b/vdrmanager/res/menu/vdrlist.xml
index 70d670d..f156173 100644
--- a/vdrmanager/res/menu/vdrlist.xml
+++ b/vdrmanager/res/menu/vdrlist.xml
@@ -1,10 +1,10 @@
<?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" xmlns:v7="http://schemas.android.com/apk/res-auto" >
<item
android:id="@+id/main_menu_vdrlist_add"
android:icon="@android:drawable/ic_menu_add"
- android:showAsAction="always"
+ v7:showAsAction="always"
android:title="@string/new_vdr"/>
<item
android:id="@+id/main_menu_vdrlist_restore"