--- a/res/layout/contactlistsettings.xml Tue Apr 21 19:06:38 2009 +0200
+++ b/res/layout/contactlistsettings.xml Wed Apr 22 00:25:01 2009 +0200
@@ -1,88 +1,107 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="vertical"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- >
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Host/Port:"
- android:minWidth="90dp"
- />
-
- <EditText android:id="@+id/host"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:textSize="16sp"
- android:autoText="false"
- android:capitalize="none"
- android:layout_weight="2"
- android:scrollHorizontally="true"/>
- <EditText android:id="@+id/port"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:textSize="16sp"
- android:autoText="false"
- android:capitalize="none"
- android:layout_weight="3"
- android:scrollHorizontally="true"/>
- </LinearLayout>
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="fill_parent">
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="Server connection"
+ android:textSize="18sp" />
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:text="Host/Port:"
+ android:minWidth="90dp" android:textSize="14sp" />
+ <EditText android:id="@+id/host" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:singleLine="true"
+ android:textSize="14sp" android:autoText="false" android:capitalize="none"
+ android:layout_weight="2" android:scrollHorizontally="true" />
+ <EditText android:id="@+id/port" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:singleLine="true"
+ android:textSize="14sp" android:autoText="false" android:capitalize="none"
+ android:layout_weight="3" android:scrollHorizontally="true" />
+ </LinearLayout>
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:text="Userid:"
+ android:minWidth="90dp" android:textSize="14sp" />
+ <EditText android:id="@+id/userid" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:singleLine="true"
+ android:textSize="14sp" android:autoText="false" android:capitalize="none"
+ android:scrollHorizontally="true" />
+ </LinearLayout>
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:text="Password:"
+ android:minWidth="90dp" android:textSize="14sp" />
+ <EditText android:id="@+id/password" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:singleLine="true"
+ android:password="true" android:textSize="14sp" android:autoText="false"
+ android:capitalize="none" android:scrollHorizontally="true" />
+ </LinearLayout>
+
+ <Spinner android:id="@+id/proxy_type" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" />
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Userid:"
- android:minWidth="90dp"
- />
- <EditText android:id="@+id/userid"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:textSize="16sp"
- android:autoText="false"
- android:capitalize="none"
- android:scrollHorizontally="true"/>
- </LinearLayout>
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- >
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="Password:"
- android:minWidth="90dp"
- />
- <EditText android:id="@+id/password"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:singleLine="true"
- android:password="true"
- android:textSize="16sp"
- android:autoText="false"
- android:capitalize="none"
- android:scrollHorizontally="true"/>
- </LinearLayout>
+ <LinearLayout android:id="@+id/proxy_layout"
+ android:orientation="vertical" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <TextView android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:text="Proxy informations"
+ android:textSize="18sp" />
+
+ <LinearLayout android:orientation="horizontal"
+ android:layout_width="fill_parent" android:layout_height="wrap_content">
+ <TextView android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:text="Host/Port:"
+ android:minWidth="90dp" android:textSize="14sp" />
+ <EditText android:id="@+id/proxy_host" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:singleLine="true"
+ android:textSize="14sp" android:autoText="false" android:capitalize="none"
+ android:layout_weight="2" android:scrollHorizontally="true" />
+ <EditText android:id="@+id/proxy_port" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:singleLine="true"
+ android:textSize="14sp" android:autoText="false" android:capitalize="none"
+ android:layout_weight="3" android:scrollHorizontally="true" />
+ </LinearLayout>
- <Button android:id="@+id/ok"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_horizontal"
- android:text="OK">
- <requestFocus/>
- </Button>
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:text="Login :"
+ android:minWidth="90dp" android:textSize="14sp" />
+ <EditText android:id="@+id/proxy_login"
+ android:layout_width="fill_parent" android:layout_height="wrap_content"
+ android:singleLine="true" android:textSize="14sp" android:autoText="false"
+ android:capitalize="none" android:scrollHorizontally="true" />
+ </LinearLayout>
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:orientation="horizontal" android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+ <TextView android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:text="Password:"
+ android:minWidth="90dp" android:textSize="14sp" />
+ <EditText android:id="@+id/proxy_pwd" android:layout_width="fill_parent"
+ android:layout_height="wrap_content" android:singleLine="true"
+ android:password="true" android:textSize="14sp" android:autoText="false"
+ android:capitalize="none" android:scrollHorizontally="true" />
+ </LinearLayout>
+ </LinearLayout>
+
+ <Button android:id="@+id/ok" android:layout_width="wrap_content"
+ android:layout_height="wrap_content" android:layout_gravity="center_horizontal"
+ android:text="OK">
+ <requestFocus />
+ </Button>
+
</LinearLayout>
\ No newline at end of file