Bug #163
authordasilvj@jean-manuel-da-silvas-macbook.local
Mon, 01 Jun 2009 14:58:03 +0200
changeset 226 e19e8aba0dd2
parent 225 cb15bad7d9ca
child 227 586bbd6b647d
Bug #163 -- Changement des Label de editable:false a focusable:false. Il a present de nouveau possible de desactiver le proxy.
.classpath
default.properties
res/layout/edit_settings.xml
res/values/styles.xml
--- a/.classpath	Fri May 29 20:35:19 2009 +0200
+++ b/.classpath	Mon Jun 01 14:58:03 2009 +0200
@@ -1,12 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<classpath>
-	<classpathentry kind="src" path="src"/>
-	<classpathentry kind="src" path="gen"/>
-	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
-	<classpathentry kind="lib" path="libs/smack.jar"/>
-	<classpathentry kind="lib" path="libs/smackx-debug.jar"/>
-	<classpathentry kind="lib" path="libs/smackx-jingle.jar"/>
-	<classpathentry kind="lib" path="libs/smackx.jar"/>
-	<classpathentry kind="lib" path="libs/jlibrtp-0.2.2.jar"/>
-	<classpathentry kind="output" path="bin"/>
-</classpath>
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="con" path="com.android.ide.eclipse.adt.ANDROID_FRAMEWORK"/>
+	<classpathentry kind="lib" path="libs/smack.jar"/>
+	<classpathentry kind="lib" path="libs/smackx-debug.jar"/>
+	<classpathentry kind="lib" path="libs/smackx-jingle.jar"/>
+	<classpathentry kind="lib" path="libs/smackx.jar"/>
+	<classpathentry kind="lib" path="libs/jlibrtp-0.2.2.jar"/>
+	<classpathentry kind="src" path="src"/>
+	<classpathentry kind="src" path="gen"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>
--- a/default.properties	Fri May 29 20:35:19 2009 +0200
+++ b/default.properties	Mon Jun 01 14:58:03 2009 +0200
@@ -7,8 +7,6 @@
 # "build.properties", and override values to adapt the script to your
 # project structure.
 
-# Project target.
-target=android-3
 # apk configurations. This property allows creation of APK files with limited
 # resources. For example, if your application contains many locales and
 # you wish to release multiple smaller apks instead of a large one, you can
@@ -20,3 +18,5 @@
 #     apk-config-european=en,fr,it,de,es
 #     apk-config-northamerica=en,es
 apk-configurations=
+# Project target.
+target=android-3
--- a/res/layout/edit_settings.xml	Fri May 29 20:35:19 2009 +0200
+++ b/res/layout/edit_settings.xml	Mon Jun 01 14:58:03 2009 +0200
@@ -103,7 +103,7 @@
     				android:layout_height="wrap_content"
     				android:text="@string/settings_xmpp_use_tls"
     				android:layout_below="@id/settings_xmpp_table_sp"
-    				style="@style/Label" />
+    				style="@style/CheckBoxLabel" />
 				<Button android:id="@+id/settings_xmpp_button_save"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
@@ -129,7 +129,7 @@
     				android:layout_width="wrap_content"
     				android:layout_height="wrap_content"
     				android:text="@string/settings_proxy_use"
-    				style="@style/Label" />
+    				style="@style/CheckBoxLabel" />
     			<LinearLayout android:id="@+id/settings_proxy_parameters"
     				android:layout_width="fill_parent"
     				android:layout_height="fill_parent"
--- a/res/values/styles.xml	Fri May 29 20:35:19 2009 +0200
+++ b/res/values/styles.xml	Mon Jun 01 14:58:03 2009 +0200
@@ -6,7 +6,10 @@
 		<item name="android:typeface">sans</item>
 		<item name="android:capitalize">characters</item>
 		<item name="android:textColor">#FFFFFF</item>
-		<item name="android:enabled">false</item>
+		<item name="android:focusable">false</item>
+	</style>
+	<style name="CheckBoxLabel" parent="@style/Label">
+		<item name="android:enabled">true</item>
 	</style>
 	<style name="Theme.BEEM.Default" parent="@android:style/Theme">
 		<item name="android:windowBackground">@drawable/background</item>