X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=android%2Fsrc%2Fnet%2Fsf%2Fopenrocket%2Fandroid%2FMain.java;h=7b6eb48e3e39a03e34205d3cfa1c9d04824ea2b9;hb=4095cb0dd61a75b7b6b0bd811f8e803af5b27919;hp=bd80c9fd050cc0fe921e87732b2ad79fa53501c2;hpb=78d3cd6af48719881c646d9755df57fac3cf50fd;p=debian%2Fopenrocket

diff --git a/android/src/net/sf/openrocket/android/Main.java b/android/src/net/sf/openrocket/android/Main.java
index bd80c9fd..7b6eb48e 100644
--- a/android/src/net/sf/openrocket/android/Main.java
+++ b/android/src/net/sf/openrocket/android/Main.java
@@ -1,52 +1,72 @@
 package net.sf.openrocket.android;
 
 import net.sf.openrocket.R;
-import net.sf.openrocket.android.motor.MotorHierarchicalBrowser;
-import android.app.Activity;
-import android.content.Intent;
-import android.net.Uri;
+import net.sf.openrocket.android.rocket.OpenRocketLoaderActivity;
 import android.os.Bundle;
 import android.view.View;
-import android.view.Window;
+import android.widget.Button;
 
-public class Main extends Activity {
+import com.actionbarsherlock.view.Menu;
+import com.actionbarsherlock.view.MenuInflater;
+import com.actionbarsherlock.view.MenuItem;
 
-	private static final int PICK_ORK_FILE_RESULT = 1;
+public class Main extends OpenRocketLoaderActivity {
 
 	/** Called when the activity is first created. */
 	@Override
 	public void onCreate(Bundle icicle) {
 		super.onCreate(icicle);
 		setContentView(R.layout.main);
+		((Button) findViewById(R.id.main_open)).setOnClickListener(
+				new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						Main.this.pickOrkFiles();
+					}
+				});
+		((Button) findViewById(R.id.main_browse)).setOnClickListener(
+				new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						ActivityHelpers.browseMotors(Main.this);
+					}
+				});
+		((Button) findViewById(R.id.main_donate)).setOnClickListener(
+				new View.OnClickListener() {
+					@Override
+					public void onClick(View v) {
+						ActivityHelpers.donate(Main.this);
+					}
+				});
 	}
 
-	/* (non-Javadoc)
-	 * @see android.app.Activity#onActivityResult(int, int, android.content.Intent)
-	 */
 	@Override
-	protected void onActivityResult(int requestCode, int resultCode, Intent data) {
-		switch ( requestCode ) {
-		case PICK_ORK_FILE_RESULT:
-			if(resultCode==RESULT_OK){
-				Uri file = data.getData();
-				Intent intent = new Intent(Intent.ACTION_VIEW);
-				intent.setData(file);
-				startActivity(intent);
-			}
-			break;
+	protected void onPostResume() {
+		super.onPostResume();
+		// Rocket already loaded.
+		if ( !isLoading() && CurrentRocketHolder.getCurrentRocket().getRocketDocument() != null ) {
+			moveOnToViewer();
 		}
-		super.onActivityResult(requestCode, resultCode, data);
 	}
 
-	public void pickOrkFiles( View v ) {
-		Intent intent = new Intent(Intent.ACTION_GET_CONTENT);
-		intent.setType("file/*");
-		startActivityForResult(intent,PICK_ORK_FILE_RESULT);
+	@Override
+	public boolean onCreateOptionsMenu(Menu menu) {
+		MenuInflater inflater = getSupportMenuInflater();
+		inflater.inflate(R.menu.main_menu, menu);
+		return true;
 	}
 
-	public void browseMotors( View v ) {
-		Intent i = new Intent(Main.this, MotorHierarchicalBrowser.class);
-		startActivity(i);
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch( item.getItemId() ) {
+		case R.id.main_menu_preferences:
+			ActivityHelpers.startPreferences(this);
+			return true;
+		case R.id.menu_about:
+			ActivityHelpers.showAbout(this);
+			return true;
+		}
+		return super.onOptionsItemSelected(item);
 	}
 
 }