[[project @ 11]
googlecode@antlersoft.com**20090116000719
 Ignore-this: c4f8ad4e7e9e235e40bb3ea24343a049
 Part of patch from christian.koestlin, so it will work with
 VNC servers that don't support 64 color model.
 
 Change main screen and pick color at main screen
 
] addfile ./androidVNC/src/android/androidVNC/VncConstants.java
hunk ./androidVNC/res/layout/main.xml 2
-<AbsoluteLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    >
-    
-<TextView
-	android:id="@+id/text1"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:textSize="18sp"
-	android:text="Address"
-	android:layout_y="60px"
-	android:layout_x="35px"/>
-	
-<EditText
-	android:id="@+id/textIP"
-	android:layout_width="160px"
-	android:layout_height="wrap_content"
-	android:textSize="18sp"
-	android:text=""
-	android:layout_y="45px"
-	android:layout_x="120px"/>
-
-<TextView
-	android:id="@+id/text2"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:textSize="18sp"
-	android:text="   Port"
-	android:layout_x="45px" android:layout_y="115px"/>
-
-<EditText
-	android:id="@+id/textPORT"
-	android:layout_height="wrap_content"
-	android:textSize="18sp"
-	android:text="5900"
-	android:layout_x="120px" android:layout_width="70px" android:layout_y="100px"/>
-
-<TextView
-	android:id="@+id/text3"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:textSize="18sp"
-	android:text="Password"
-	android:layout_x="35px" android:layout_y="170px"/>
-	
-<EditText
-	android:id="@+id/textPASSWORD"
-	android:layout_width="160px"
-	android:layout_height="wrap_content"
-	android:textSize="18sp"
-	android:text=""
-	android:password="true"
-	android:layout_x="120px" android:layout_y="155px"/>
-<Button
-	android:id="@+id/buttonGO"
-	android:text="Connect"
-	android:layout_width="wrap_content"
-	android:layout_height="wrap_content"
-	android:textSize="18sp"
-	android:layout_x="195px" android:layout_y="210px"/>
-
-</AbsoluteLayout>
-
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+	android:layout_height="fill_parent"
+	android:layout_width="fill_parent"	
+	android:scrollbars="vertical"
+	>	
+	<LinearLayout
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:padding="10dip"
+		android:orientation="vertical"
+		>
+		<TableLayout 
+			android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+			android:padding="10dip"
+			>
+				
+			<TableRow>
+				<TextView android:text="Address" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
+				<EditText android:id="@+id/textIP" android:layout_width="fill_parent" android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="1" />
+			</TableRow>
+			<TableRow>
+				<TextView android:text="Port" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
+				<EditText android:id="@+id/textPORT"
+					android:text="5900"
+					android:layout_width="fill_parent"
+					android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="1" />
+			</TableRow>
+			<TableRow>
+				<TextView android:text="Password" android:paddingRight="10dip" android:gravity="right|center_vertical" android:textAppearance="?android:attr/textAppearanceMedium" />
+				<EditText android:id="@+id/textPASSWORD"
+					android:password="true"
+					android:layout_width="fill_parent" android:layout_height="wrap_content" android:singleLine="true" android:layout_weight="1" />
+			</TableRow>
+		</TableLayout>
+		<TextView
+		    android:layout_height="wrap_content"
+		    android:layout_width="wrap_content"
+		    android:layout_gravity="left|center_vertical"
+			android:textAppearance="?android:attr/textAppearanceMedium"
+			android:text="Color Format"
+		/>
+		<Spinner 
+		    android:id="@+id/colorformat" 
+		    android:layout_width="fill_parent"
+			android:layout_height="wrap_content"
+		   />
+		<Button 
+		    android:id="@+id/buttonGO" 
+		    android:text="Connect"
+			android:layout_width="wrap_content" 
+			android:layout_height="wrap_content"
+		/>
+	</LinearLayout>
+</ScrollView>
hunk ./androidVNC/src/android/androidVNC/R.java 17
-        public static final int buttonGO=0x7f060006;
-        public static final int groupScaling=0x7f06000b;
-        public static final int itemCenterMouse=0x7f060008;
-        public static final int itemColorMode=0x7f060009;
-        public static final int itemCtrlAltDel=0x7f060014;
-        public static final int itemDisconnect=0x7f060013;
-        public static final int itemFitToScreen=0x7f06000d;
-        public static final int itemInfo=0x7f060007;
-        public static final int itemInputFitToScreen=0x7f06000f;
-        public static final int itemInputMode=0x7f06000e;
-        public static final int itemInputMouse=0x7f060011;
-        public static final int itemInputPan=0x7f060010;
-        public static final int itemInputTouchPanTrackballMouse=0x7f060012;
-        public static final int itemOneToOne=0x7f06000c;
-        public static final int itemScaling=0x7f06000a;
-        public static final int text1=0x7f060000;
-        public static final int text2=0x7f060002;
-        public static final int text3=0x7f060004;
-        public static final int textIP=0x7f060001;
-        public static final int textPASSWORD=0x7f060005;
-        public static final int textPORT=0x7f060003;
+        public static final int buttonGO=0x7f060004;
+        public static final int colorformat=0x7f060003;
+        public static final int groupScaling=0x7f060009;
+        public static final int itemCenterMouse=0x7f060006;
+        public static final int itemColorMode=0x7f060007;
+        public static final int itemCtrlAltDel=0x7f060012;
+        public static final int itemDisconnect=0x7f060011;
+        public static final int itemFitToScreen=0x7f06000b;
+        public static final int itemInfo=0x7f060005;
+        public static final int itemInputFitToScreen=0x7f06000d;
+        public static final int itemInputMode=0x7f06000c;
+        public static final int itemInputMouse=0x7f06000f;
+        public static final int itemInputPan=0x7f06000e;
+        public static final int itemInputTouchPanTrackballMouse=0x7f060010;
+        public static final int itemOneToOne=0x7f06000a;
+        public static final int itemScaling=0x7f060008;
+        public static final int textIP=0x7f060000;
+        public static final int textPASSWORD=0x7f060002;
+        public static final int textPORT=0x7f060001;
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 96
-	private COLORMODEL pendingColorModel = COLORMODEL.C64;
+	private COLORMODEL pendingColorModel = COLORMODEL.C24bit;
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 135
-	public VncCanvas(final Context context, String serverIP, int serverPort, String serverPassword, String repeaterid) {
+	public VncCanvas(final Context context, String serverIP, int serverPort, String serverPassword, String repeaterid, COLORMODEL colorModel) {
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 141
+		this.pendingColorModel = colorModel;
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 186
-							if (e.getMessage().indexOf("authentication") > -1) {
-								handler.post(new Runnable() {
-									public void run() {
-										Utils.showFatalErrorMessage(context, "VNC authentication failed!");
-									}
-								});
-							} else {
-								handler.post(new Runnable() {
-									public void run() {
-										Utils.showFatalErrorMessage(context, "VNC connection failed!");
-									}
-								});
-							}
+							String error = "VNC connection failed!";
+							if (e.getMessage() != null && (e.getMessage().indexOf("authentication") > -1)) {
+								error = "VNC authentication failed!";
+ 							}
+							final String error_ = error;
+							handler.post(new Runnable() {
+								public void run() {
+									Utils.showFatalErrorMessage(context, error_);
+								}
+							});
hunk ./androidVNC/src/android/androidVNC/VncCanvas.java 626
+		    
hunk ./androidVNC/src/android/androidVNC/VncCanvasActivity.java 66
-		String host = extras.getString("HOST");
+		String host = extras.getString(VncConstants.HOST);
hunk ./androidVNC/src/android/androidVNC/VncCanvasActivity.java 68
-			host = extras.getString("IP");
-		int port = extras.getInt("PORT");
+			host = extras.getString(VncConstants.IP);
+		int port = extras.getInt(VncConstants.PORT);
hunk ./androidVNC/src/android/androidVNC/VncCanvasActivity.java 83
-		String password = extras.getString("PASSWORD");
-		String repeaterID = extras.getString("ID");
+		String password = extras.getString(VncConstants.PASSWORD);
+		String repeaterID = extras.getString(VncConstants.ID);
hunk ./androidVNC/src/android/androidVNC/VncCanvasActivity.java 86
-		vncCanvas = new VncCanvas(this, host, port, password, repeaterID);
+		vncCanvas = new VncCanvas(this, host, port, password, repeaterID, (COLORMODEL)extras.getSerializable(VncConstants.COLORMODEL));
hunk ./androidVNC/src/android/androidVNC/VncConstants.java 1
+package android.androidVNC;
+
+/**
+ * Keys for intent values
+ */
+public class VncConstants {
+	public static final String ID = "ID";
+	public static final String PASSWORD = "PASSWORD";
+	public static final String PORT = "PORT";
+	public static final String IP = "IP";
+	public static final String HOST = "HOST";
+	public static final String COLORMODEL = "COLORMODEL";
+}
hunk ./androidVNC/src/android/androidVNC/androidVNC.java 31
+import android.widget.ArrayAdapter;
hunk ./androidVNC/src/android/androidVNC/androidVNC.java 34
+import android.widget.Spinner;
hunk ./androidVNC/src/android/androidVNC/androidVNC.java 41
+	private Spinner colorSpinner;
hunk ./androidVNC/src/android/androidVNC/androidVNC.java 53
+		colorSpinner = (Spinner)findViewById(R.id.colorformat);
+		ArrayAdapter<COLORMODEL> colorSpinnerAdapter = new ArrayAdapter<COLORMODEL>(this, android.R.layout.simple_spinner_item, COLORMODEL.values());
+		colorSpinner.setAdapter(colorSpinnerAdapter);
+		colorSpinner.setSelection(0);
hunk ./androidVNC/src/android/androidVNC/androidVNC.java 69
-		vnc(this, ip, port, password, null);
+		COLORMODEL model = (COLORMODEL) colorSpinner.getSelectedItem();
+		vnc(this, ip, port, password, null, model);
hunk ./androidVNC/src/android/androidVNC/androidVNC.java 73
-	
-	private void vnc(final Context _context, final String host, final int port, final String password, final String repeaterID) {
+	private void vnc(final Context _context, final String host, final int port, final String password, final String repeaterID, final COLORMODEL model) {
hunk ./androidVNC/src/android/androidVNC/androidVNC.java 80
-					vnc_(_context, host, port, password, repeaterID);
+					vnc_(_context, host, port, password, repeaterID, model);
hunk ./androidVNC/src/android/androidVNC/androidVNC.java 84
-			vnc_(_context, host, port, password, repeaterID);
+			vnc_(_context, host, port, password, repeaterID, model);
hunk ./androidVNC/src/android/androidVNC/androidVNC.java 87
-	private void vnc_(Context _context, String host, int port, String password, String repeaterID) {
+	private void vnc_(Context _context, String host, int port, String password, String repeaterID, final COLORMODEL model) {
hunk ./androidVNC/src/android/androidVNC/androidVNC.java 89
-		 intent.putExtra("HOST", host);
-		 intent.putExtra("PORT", port);
-		 intent.putExtra("PASSWORD", password);
-		 intent.putExtra("ID", repeaterID);
+		 intent.putExtra(VncConstants.HOST, host);
+		 intent.putExtra(VncConstants.PORT, port);
+		 intent.putExtra(VncConstants.PASSWORD, password);
+		 intent.putExtra(VncConstants.ID, repeaterID);
+		 intent.putExtra(VncConstants.COLORMODEL, model);
hunk ./androidVNC/src/android/androidVNC/androidVNC.java 97
+