diff options
| -rw-r--r-- | vdrmanager/lint.xml | 5 | ||||
| -rw-r--r-- | vdrmanager/res/layout-land-v11/vdrmanager.xml | 18 | ||||
| -rw-r--r-- | vdrmanager/res/layout-land/vdrmanager.xml | 2 | ||||
| -rw-r--r-- | vdrmanager/res/layout-v11/vdrmanager.xml | 24 | ||||
| -rw-r--r-- | vdrmanager/res/layout/channel_list.xml | 109 | ||||
| -rw-r--r-- | vdrmanager/res/layout/timer_list.xml | 4 | ||||
| -rw-r--r-- | vdrmanager/res/menu/vdrlist.xml | 5 | ||||
| -rw-r--r-- | vdrmanager/res/values/strings.xml | 7 |
8 files changed, 105 insertions, 69 deletions
diff --git a/vdrmanager/lint.xml b/vdrmanager/lint.xml new file mode 100644 index 0000000..b32a162 --- /dev/null +++ b/vdrmanager/lint.xml @@ -0,0 +1,5 @@ +<?xml version="1.0" encoding="UTF-8"?> +<lint> + <issue id="ExtraTranslation" severity="warning" /> + <issue id="MissingTranslation" severity="warning" /> +</lint>
\ No newline at end of file diff --git a/vdrmanager/res/layout-land-v11/vdrmanager.xml b/vdrmanager/res/layout-land-v11/vdrmanager.xml index a2728f0..a32f302 100644 --- a/vdrmanager/res/layout-land-v11/vdrmanager.xml +++ b/vdrmanager/res/layout-land-v11/vdrmanager.xml @@ -8,13 +8,12 @@ <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 +22,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 android:text="@string/action_menu_timers" - xmlns:android="http://schemas.android.com/apk/res/android" android:padding="3dip" + android:padding="3dip" 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" @@ -41,10 +40,9 @@ android:background="@android:drawable/list_selector_background" 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" @@ -54,7 +52,7 @@ 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="3dip" android:drawableTop="@drawable/btn_wakeup" android:layout_width="wrap_content" android:id="@+id/action_menu_wakeup" android:layout_height="wrap_content" @@ -62,6 +60,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-land/vdrmanager.xml b/vdrmanager/res/layout-land/vdrmanager.xml index 8f5b86e..22f777d 100644 --- a/vdrmanager/res/layout-land/vdrmanager.xml +++ b/vdrmanager/res/layout-land/vdrmanager.xml @@ -50,7 +50,7 @@ android:layout_height="wrap_content" android:orientation="horizontal"> <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="3dip" android:drawableTop="@drawable/btn_wakeup" android:layout_width="wrap_content" android:id="@+id/action_menu_wakeup" android:layout_height="wrap_content" diff --git a/vdrmanager/res/layout-v11/vdrmanager.xml b/vdrmanager/res/layout-v11/vdrmanager.xml index 40367c8..9992e77 100644 --- a/vdrmanager/res/layout-v11/vdrmanager.xml +++ b/vdrmanager/res/layout-v11/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,18 +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_wakeup" - xmlns:android="http://schemas.android.com/apk/res/android" 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 diff --git a/vdrmanager/res/layout/channel_list.xml b/vdrmanager/res/layout/channel_list.xml index e73eea6..3ff4c1e 100644 --- a/vdrmanager/res/layout/channel_list.xml +++ b/vdrmanager/res/layout/channel_list.xml @@ -1,39 +1,70 @@ -<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/flipper" - android:layout_width="fill_parent" android:layout_height="fill_parent" - android:orientation="vertical"> - - <LinearLayout android:layout_height="fill_parent" - android:layout_width="fill_parent" android:id="@+id/main_content"> - <EditText android:id="@+id/search_box" android:layout_width="fill_parent" - android:layout_height="wrap_content" android:hint="type to filter" - android:inputType="text" android:maxLines="1" android:visibility="gone" /> - - <ExpandableListView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/channel_list" android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:layout_alignWithParentIfMissing="true" - android:layout_alignParentTop="true" android:layout_centerHorizontal="true" - android:cacheColorHint="?android:attr/colorBackground" /> - - <TextView android:id="@android:id/empty" android:layout_width="wrap_content" - android:layout_height="wrap_content" android:text="Empty set" /> - - </LinearLayout> - <LinearLayout android:orientation="vertical" - android:id="@+id/no_connection_layout" android:layout_width="fill_parent" - android:layout_height="fill_parent"> - <LinearLayout android:layout_height="fill_parent" - android:gravity="center" android:layout_width="fill_parent" - android:orientation="horizontal"> - <TextView android:text="@string/no_connection" - android:layout_height="wrap_content" android:layout_width="wrap_content" - android:textSize="18dip" /> - <ImageView android:src="@drawable/sad" - android:layout_height="wrap_content" android:layout_width="wrap_content" /> - <Button android:text="@string/no_connection_retry" - android:textSize="18dip" android:layout_height="wrap_content" - android:layout_width="wrap_content" android:id="@+id/retry_button" /> - - </LinearLayout> - </LinearLayout> -</ViewFlipper> +<ViewFlipper xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/flipper" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout + android:id="@+id/main_content" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <EditText + android:id="@+id/search_box" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:hint="@string/type_to_filter" + android:inputType="text" + android:maxLines="1" + android:visibility="gone" /> + + <ExpandableListView + android:id="@+id/channel_list" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:layout_alignParentTop="true" + android:layout_alignWithParentIfMissing="true" + android:layout_centerHorizontal="true" + android:cacheColorHint="?android:attr/colorBackground" /> + + <TextView + android:id="@android:id/empty" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Empty set" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/no_connection_layout" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:orientation="vertical" > + + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:gravity="center" + android:orientation="horizontal" > + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_connection" + android:textSize="18dip" /> + + <ImageView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/sad" /> + + <Button + android:id="@+id/retry_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/no_connection_retry" + android:textSize="18dip" /> + </LinearLayout> + </LinearLayout> + +</ViewFlipper>
\ No newline at end of file diff --git a/vdrmanager/res/layout/timer_list.xml b/vdrmanager/res/layout/timer_list.xml index 5e01c4a..ccb4be1 100644 --- a/vdrmanager/res/layout/timer_list.xml +++ b/vdrmanager/res/layout/timer_list.xml @@ -6,14 +6,14 @@ android:orientation="vertical" > <LinearLayout android:layout_height="fill_parent" android:layout_width="fill_parent" android:id="@+id/main_content"> - <ListView xmlns:android="http://schemas.android.com/apk/res/android" + <ListView android:id="@+id/timer_list" android:layout_width="fill_parent" android:layout_height="fill_parent" android:layout_alignWithParentIfMissing="true" android:layout_alignParentTop="true" android:layout_centerHorizontal="true" android:cacheColorHint="?android:attr/colorBackground" /> </LinearLayout> - + <LinearLayout android:orientation="vertical" android:id="@+id/no_connection_layout" android:layout_width="fill_parent" android:layout_height="fill_parent"> diff --git a/vdrmanager/res/menu/vdrlist.xml b/vdrmanager/res/menu/vdrlist.xml index 9db6588..70d670d 100644 --- a/vdrmanager/res/menu/vdrlist.xml +++ b/vdrmanager/res/menu/vdrlist.xml @@ -2,6 +2,11 @@ <menu xmlns:android="http://schemas.android.com/apk/res/android" > <item + android:id="@+id/main_menu_vdrlist_add" + android:icon="@android:drawable/ic_menu_add" + android:showAsAction="always" + android:title="@string/new_vdr"/> + <item android:id="@+id/main_menu_vdrlist_restore" android:title="@string/settings_backup_restore"/> diff --git a/vdrmanager/res/values/strings.xml b/vdrmanager/res/values/strings.xml index fb84155..2f3bd79 100644 --- a/vdrmanager/res/values/strings.xml +++ b/vdrmanager/res/values/strings.xml @@ -404,11 +404,11 @@ <string name="certificate_problem_message_text" formatted="false"> The server certificate was not accepted:\n\n Hostname:\n - %s\n + %1$s\n Valid from:\n - %s\n + %2$s\n Valid until:\n - %s\n\n + %3$s\n\n What do you want to do? </string> <string name="certificate_accept_once">Accept once</string> @@ -497,6 +497,7 @@ What do you want to do? <string name="Content$Live_Broadcast">Live Broadcas</string> <string name="Content$Unknown"></string> <!-- EPG Content END --> +<string name="type_to_filter">type to filter</string> </resources>
\ No newline at end of file |