summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--vdrmanager/res/layout/epg_detail.xml154
-rw-r--r--vdrmanager/res/menu-v11/epg_details.xml6
-rw-r--r--vdrmanager/res/menu-v11/epg_list_item_menu.xml4
-rw-r--r--vdrmanager/res/menu/epg_list_item_menu.xml1
-rw-r--r--vdrmanager/res/menu/recording_list_item_menu.xml1
-rw-r--r--vdrmanager/res/values/strings.xml1
6 files changed, 99 insertions, 68 deletions
diff --git a/vdrmanager/res/layout/epg_detail.xml b/vdrmanager/res/layout/epg_detail.xml
index 3100f28..a564c15 100644
--- a/vdrmanager/res/layout/epg_detail.xml
+++ b/vdrmanager/res/layout/epg_detail.xml
@@ -110,73 +110,96 @@
android:id="@+id/epg_detail_separator_3"
android:layout_width="fill_parent"
android:layout_height="4sp" />
- <TableLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:id="@+id/root"
- android:stretchColumns="*"
- style="@android:style/ButtonBar">
-
- <TableRow android:layout_margin="0dip"
- android:id="@+id/first_row">
- <ImageButton
- android:id="@+id/epg_event_livetv"
- style="?android:attr/buttonStyleSmall"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:layout_gravity="center_horizontal"
- android:layout_weight="1"
- android:background="@android:drawable/list_selector_background"
- android:src="@drawable/tv"
- android:text="@string/epg_eent_livetv_text" />
-
- <ImageButton
- android:id="@+id/epg_event_imdb"
- style="?android:attr/buttonStyleSmall"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:background="@android:drawable/list_selector_background"
- android:src="@drawable/imdb"
- android:text="@string/epg_event_imdb_text" />
-
- <ImageButton
- android:id="@+id/epg_event_omdb"
- style="?android:attr/buttonStyleSmall"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:background="@android:drawable/list_selector_background"
- android:src="@drawable/omdb"
- android:text="@string/epg_event_omdb_text" />
-
-
- <ImageButton
- android:id="@+id/epg_event_tmdb"
- style="?android:attr/buttonStyleSmall"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:background="@android:drawable/list_selector_background"
- android:src="@drawable/tmdb"
- android:text="@string/epg_event_tmdb_text" />
-
- <ImageButton
- android:id="@+id/epg_event_create_timer"
- style="?android:attr/buttonStyleSmall"
- android:layout_width="0dip"
- android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
- android:layout_gravity="center_horizontal"
- android:layout_weight="1"
- android:background="@android:drawable/list_selector_background"
- android:src="@drawable/timer"
- android:text="@string/epg_event_create_timer_text" />
-</TableRow>
- </TableLayout>
+ <HorizontalScrollView
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content" >
+ <TableLayout android:layout_weight="1"
+ android:id="@+id/root"
+ style="@android:style/ButtonBar"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:stretchColumns="*" >
+
+ <TableRow android:layout_weight="1"
+ android:id="@+id/first_row"
+ android:layout_margin="0dip" >
+
+ <ImageButton
+ android:id="@+id/epg_event_livetv"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
+ android:layout_weight="1"
+ android:background="@android:drawable/list_selector_background"
+ android:src="@drawable/tv"
+ android:text="@string/epg_eent_livetv_text" />
+
+ <ImageButton
+ android:id="@+id/epg_event_imdb"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
+ android:background="@android:drawable/list_selector_background"
+ android:src="@drawable/imdb"
+ android:text="@string/epg_event_imdb_text" />
+
+ <ImageButton
+ android:id="@+id/epg_event_omdb"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@android:drawable/list_selector_background"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
+ android:src="@drawable/omdb"
+ android:text="@string/epg_event_omdb_text" />
+
+ <ImageButton
+ android:id="@+id/epg_event_tmdb"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@android:drawable/list_selector_background"
+ android:src="@drawable/tmdb"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
+ android:text="@string/epg_event_tmdb_text" />
+<!--
+ <ImageButton
+ android:id="@+id/epg_event_switch"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
+ android:background="@android:drawable/list_selector_background"
+ android:src="@drawable/switchto"
+ android:text="@string/switch_to_channel" />
+-->
+ <ImageButton
+ android:id="@+id/epg_event_create_timer"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="0dip"
+ android:layout_height="wrap_content"
+ android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
+ android:layout_weight="1"
+ android:background="@android:drawable/list_selector_background"
+ android:src="@drawable/timer"
+ android:text="@string/epg_event_create_timer_text" />
+ </TableRow>
+ </TableLayout>
+ </HorizontalScrollView>
<!--
<ImageButton
android:id="@+id/epg_event_share"
@@ -211,6 +234,5 @@
android:layout_height="wrap_content"
android:background="@android:drawable/list_selector_background"/>
-->
-
</LinearLayout> \ No newline at end of file
diff --git a/vdrmanager/res/menu-v11/epg_details.xml b/vdrmanager/res/menu-v11/epg_details.xml
index 339d423..4458f09 100644
--- a/vdrmanager/res/menu-v11/epg_details.xml
+++ b/vdrmanager/res/menu-v11/epg_details.xml
@@ -12,5 +12,9 @@
android:id="@+id/epg_details_menu_share"
android:icon="@android:drawable/ic_menu_share"
android:title="@string/share"/>
-
+
+ <item
+ android:id="@+id/epg_details_menu_switch"
+ android:icon="@drawable/ic_menu_goto"
+ android:title="@string/switch_to_channel"/>
</menu>
diff --git a/vdrmanager/res/menu-v11/epg_list_item_menu.xml b/vdrmanager/res/menu-v11/epg_list_item_menu.xml
index 6aacf4d..93ccb68 100644
--- a/vdrmanager/res/menu-v11/epg_list_item_menu.xml
+++ b/vdrmanager/res/menu-v11/epg_list_item_menu.xml
@@ -24,5 +24,7 @@
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/epg_list_item_menu.xml b/vdrmanager/res/menu/epg_list_item_menu.xml
index ae7149e..cc6ed44 100644
--- a/vdrmanager/res/menu/epg_list_item_menu.xml
+++ b/vdrmanager/res/menu/epg_list_item_menu.xml
@@ -6,5 +6,6 @@
<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" />
</menu> \ No newline at end of file
diff --git a/vdrmanager/res/menu/recording_list_item_menu.xml b/vdrmanager/res/menu/recording_list_item_menu.xml
index c94161a..b375ba0 100644
--- a/vdrmanager/res/menu/recording_list_item_menu.xml
+++ b/vdrmanager/res/menu/recording_list_item_menu.xml
@@ -4,4 +4,5 @@
<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/values/strings.xml b/vdrmanager/res/values/strings.xml
index 652f0e8..100239a 100644
--- a/vdrmanager/res/values/strings.xml
+++ b/vdrmanager/res/values/strings.xml
@@ -339,4 +339,5 @@
<string name="channel_item_menu_switch">Switch to</string>
<string name="switching_success">Switched to %s</string>
<string name="switching_failed">Switching to %1$s failed: %2$s</string>
+ <string name="switch_to_channel">Switch to</string>
</resources> \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 22:05:14 +0000