From 36a8723b654faea542da9b6ea7a4a3fe9c22da04 Mon Sep 17 00:00:00 2001
From: lado <herrlado@gmail.com>
Date: Sun, 22 Jan 2012 03:39:17 +0100
Subject: lots of bug fixing

---
 vdrmanager/res/layout/vdrmanager.xml    | 1 -
 vdrmanager/res/menu-v11/epg_details.xml | 1 -
 vdrmanager/res/values/preferences.xml   | 2 +-
 vdrmanager/res/xml/vdr_prefs.xml        | 7 +++++--
 4 files changed, 6 insertions(+), 5 deletions(-)

(limited to 'vdrmanager/res')

diff --git a/vdrmanager/res/layout/vdrmanager.xml b/vdrmanager/res/layout/vdrmanager.xml
index bbbae38..2d541bd 100644
--- a/vdrmanager/res/layout/vdrmanager.xml
+++ b/vdrmanager/res/layout/vdrmanager.xml
@@ -13,7 +13,6 @@
 		<LinearLayout android:layout_width="fill_parent"
 			android:layout_height="wrap_content" android:orientation="horizontal" android:padding="10dip">
 			<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"
diff --git a/vdrmanager/res/menu-v11/epg_details.xml b/vdrmanager/res/menu-v11/epg_details.xml
index fbbc9d6..339d423 100644
--- a/vdrmanager/res/menu-v11/epg_details.xml
+++ b/vdrmanager/res/menu-v11/epg_details.xml
@@ -11,7 +11,6 @@
         android:showAsAction="ifRoom|withText"
         android:id="@+id/epg_details_menu_share"
         android:icon="@android:drawable/ic_menu_share"
-        android:actionProviderClass="android.widget.ShareActionProvider"
         android:title="@string/share"/>
 
 </menu>
diff --git a/vdrmanager/res/values/preferences.xml b/vdrmanager/res/values/preferences.xml
index 25bc675..71523ae 100644
--- a/vdrmanager/res/values/preferences.xml
+++ b/vdrmanager/res/values/preferences.xml
@@ -42,7 +42,7 @@
     </string-array>
 
 
-    <string name="default_wakeup_method">url</string>
+    <string name="default_wakeup_method">wol</string>
    
     <string name="wakeup_wol_custom_boradcast_title">Destination IP address</string>
     <string name="wakeup_wol_custom_boradcast_summary">Unless you have static ARP tables you should use some kind of broadcast address.</string>
diff --git a/vdrmanager/res/xml/vdr_prefs.xml b/vdrmanager/res/xml/vdr_prefs.xml
index e985efc..b5a48a2 100644
--- a/vdrmanager/res/xml/vdr_prefs.xml
+++ b/vdrmanager/res/xml/vdr_prefs.xml
@@ -3,7 +3,7 @@
 
 	<PreferenceCategory android:title="@string/vdr_prefs_category">
 
-		<EditTextPreference android:inputType="textCapWords"
+		<EditTextPreference android:inputType="textCapWords" android:defaultValue="-"
 			android:key="@string/vdr_name_key" android:summary="@string/vdr_name_summary"
 			android:title="@string/vdr_name_title" />
 
@@ -13,6 +13,7 @@
 		android:title="@string/vdr_preferences">
 
 		<EditTextPreference android:inputType="textNoSuggestions"
+			android:defaultValue="0.0.0.0"
 			android:key="@string/vdr_host_key" android:summary="@string/vdr_host_summary"
 			android:title="@string/vdr_host_title" />
 
@@ -49,7 +50,8 @@
 	<PreferenceCategory android:key="wakeup_preferences"
 		android:title="@string/wakeup_preferences">
 
-		<CheckBoxPreference android:key="@string/wakeup_enabled_key"
+		<CheckBoxPreference android:key="@string/wakeup_enabled_key" 
+			android:defaultValue="false"
 			android:summary="@string/wakeup_enabled_summary" android:title="@string/wakeup_enabled_title" />
 
 		<ListPreference android:defaultValue="@string/default_wakeup_method"
@@ -117,6 +119,7 @@
 			android:key="livetv_streamformat" android:title="@string/settings_livetv_streamformat" />
 
 		<CheckBoxPreference android:key="remux_enable"
+			android:defaultValue="false"
 			android:summary="@string/remux_enable_summary" android:title="@string/remux_enable_title" />
 
 		<ListPreference android:defaultValue="EXT"
-- 
cgit v1.2.3