Minor layout update

infil00p · Feb 16, 2010 · 699026b · 699026b
1 parent c7ccd35
commit 699026b
Showing 1 changed file with 69 additions and 42 deletions.
diff --git a/javascript/DroidScript.js b/javascript/DroidScript.js
@@ -24,16 +24,16 @@ var Intent = Packages.android.content.Intent;
 var Menu = Packages.android.view.Menu;
 var Intent = Packages.android.content.Intent;
 var Uri = Packages.android.net.Uri;
-	
+    
 var Server;
 var Editor;
 
 function onCreate(icicle)
 {
     var script = ''
-	    + 'var Widget = Packages.android.widget;\n'
-	    + 'var Gravity = Packages.android.view.Gravity;\n\n'
-	    + 'function onCreate(icicle) {\n'
+        + 'var Widget = Packages.android.widget;\n'
+        + 'var Gravity = Packages.android.view.Gravity;\n\n'
+        + 'function onCreate(icicle) {\n'
         + '    var text = "Apps are early bound.\\n"\n'
         + '        + "The web is late bound.\\n"\n'
         + '        + "Apps are updated infrequently.\\n"\n'
@@ -49,10 +49,9 @@ function onCreate(icicle)
 
     var editor = new Widget.EditText(Activity);
     editor.setLayoutParams(new Widget.LinearLayout.LayoutParams(
-    		LayoutParams.FILL_PARENT, 
-    		LayoutParams.WRAP_CONTENT, 
-        1));
+            LayoutParams.FILL_PARENT, LayoutParams.WRAP_CONTENT, 1));
     editor.setGravity(Gravity.TOP);
+    editor.setSelectAllOnFocus(false);
     editor.setVerticalScrollBarEnabled(true);
     editor.setScrollBarStyle(View.SCROLLBARS_OUTSIDE_INSET);
 //    editor.setScrollContainer(true);
@@ -62,46 +61,40 @@ function onCreate(icicle)
     Editor = editor;
 
     var buttonEval = new Widget.Button(Activity);
-    buttonEval.setLayoutParams(new LayoutParams(
-        LayoutParams.WRAP_CONTENT, 
-        LayoutParams.WRAP_CONTENT));
+    buttonEval.setLayoutParams(new Widget.LinearLayout.LayoutParams(
+        LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT, 1));
     buttonEval.setText("Evaluate");
     buttonEval.setOnClickListener(function () { 
         Activity.eval(editor.getText().toString()); });
 
     var buttonRun = new Widget.Button(Activity);
-    buttonRun.setLayoutParams(new LayoutParams(
-        LayoutParams.WRAP_CONTENT, 
-        LayoutParams.WRAP_CONTENT));
-    buttonRun.setText("Run as Activity");
+    buttonRun.setLayoutParams(new Widget.LinearLayout.LayoutParams(
+        LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT, 1));
+    buttonRun.setText("Run Activity");
     buttonRun.setOnClickListener(function () { 
         var intent = new Intent();
         intent.setClassName(Activity, "comikit.droidscript.DroidScriptActivity");
         intent.putExtra("Script", editor.getText().toString());
         Activity.startActivity(intent); });
 
     var buttonOpen = new Widget.Button(Activity);
-    buttonRun.setLayoutParams(new LayoutParams(
-        LayoutParams.WRAP_CONTENT, 
-        LayoutParams.WRAP_CONTENT));
+    buttonRun.setLayoutParams(new Widget.LinearLayout.LayoutParams(
+        LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT, 1));
     buttonOpen.setText("Open Script");
     buttonOpen.setOnClickListener(function () { openScript(); });
 
     var buttonLayout = new Widget.LinearLayout(Activity);
     buttonLayout.setOrientation(Widget.LinearLayout.HORIZONTAL);
-    buttonLayout.setLayoutParams(new LayoutParams(
-        LayoutParams.FILL_PARENT, 
-        LayoutParams.WRAP_CONTENT));
+    buttonLayout.setLayoutParams(new Widget.LinearLayout.LayoutParams(
+        LayoutParams.FILL_PARENT,  LayoutParams.WRAP_CONTENT, 0));
     buttonLayout.addView(buttonOpen);
     buttonLayout.addView(buttonEval);
     buttonLayout.addView(buttonRun);
 
     var mainLayout = new Widget.LinearLayout(Activity);
     mainLayout.setOrientation(Widget.LinearLayout.VERTICAL);
     mainLayout.setLayoutParams(new Widget.LinearLayout.LayoutParams(
-        LayoutParams.FILL_PARENT, 
-        LayoutParams.FILL_PARENT,
-        1));
+        LayoutParams.FILL_PARENT, LayoutParams.FILL_PARENT));
     mainLayout.addView(editor);
     mainLayout.addView(buttonLayout);
 
@@ -165,41 +158,75 @@ function openScript()
 {
     var input = new Widget.EditText(Activity);
     input.setText("droidscript/Toast.js")
-	var dialog = new AlertDialog.Builder(Activity);
-	dialog.setTitle("Open Script");
-	dialog.setMessage("Enter file or url:");
+    var dialog = new AlertDialog.Builder(Activity);
+    dialog.setTitle("Open Script");
+    dialog.setMessage("Enter file or url:");
     dialog.setView(input);
-	dialog.setPositiveButton("Open", function() {
-	    var script = Packages.comikit.droidscript.DroidScriptFileHandler.create().readStringFromFileOrUrl(
-	            input.getText().toString());
-	    Editor.setText(script);
+    dialog.setPositiveButton("Open", function() {
+        var script = Packages.comikit.droidscript.DroidScriptFileHandler.create().readStringFromFileOrUrl(
+                input.getText().toString());
+        Editor.setText(script);
     });
     dialog.setNegativeButton("Cancel", function() {
     });
-	dialog.show();
+    dialog.show();
 }
 
+//function openScriptList()
+//{
+//    var list = new Widget.ListView(Activity);
+//    var listAdapter = Widget.BaseAdapter({
+//        
+//    });
+//
+//}
+//
+//public class myListAdapter extends BaseAdapter {
+//    public myListAdapter(Context c) { ...
+//    public int getCount() { ...
+//    public Object getItem(int position) { ...
+//    public long getItemId(int position) { ...
+//@Override
+//    public View getView(int position, View convertView, ViewGroup parent) {
+//
+//            cursor.moveToPosition(position);
+//             RowView rv;
+//             if (convertView == null) {
+//            rv = new RowView(mContext,(cursor.getString(2)),
+//                            (cursor.getString(5)), position);
+//        } else {
+//            rv = (RowView) convertView;
+//            rv.setTitle(cursor.getString(2));
+//            rv.setDialogue(cursor.getString(5));
+//            rv.setFocusable(true);
+//            rv.setClickable(true);
+//        }
+//         return rv;
+//       }
+//
+//}
+
 function print(s)
 {
-	var System = Packages.java.lang.System;
-	System.out.println(s);
+    var System = Packages.java.lang.System;
+    System.out.println(s);
 }
 
 function startServer()
 {
-	var DroidScriptServer = Packages.comikit.droidscript.DroidScriptServer;
-	Server = DroidScriptServer.create();
-	Server.setPort(4042);
-	Server.setRequestHandler(function(url, data) {
-		print("URL=" + url + " DATA=" + data);
-		return "Hello";
-	});
-	Server.startServer();
+    var DroidScriptServer = Packages.comikit.droidscript.DroidScriptServer;
+    Server = DroidScriptServer.create();
+    Server.setPort(4042);
+    Server.setRequestHandler(function(url, data) {
+        print("URL=" + url + " DATA=" + data);
+        return "Hello";
+    });
+    Server.startServer();
 }
 
 function stopServer()
 {
-	Server.stopServer();
+    Server.stopServer();
 }