Change the initial screen handling and add file load to OpenRocketViewer activity...

[debian/openrocket] / android / src / net / sf / openrocket / android / rocket / OpenRocketViewer.java

diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
index 98c379e721886bbe0e8103df40427ac0e0941344..2ab9b63e2e9445107ae9030abfa06d0c1839f1d4 100644 (file)
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketViewer.java
@@ -21,12 +21,11 @@ import android.support.v4.app.FragmentTransaction;
 import android.support.v4.view.ViewPager;\r
 import android.view.View;\r
 \r
-import com.actionbarsherlock.app.SherlockFragmentActivity;\r
 import com.actionbarsherlock.view.Menu;\r
 import com.actionbarsherlock.view.MenuInflater;\r
 import com.actionbarsherlock.view.MenuItem;\r
 \r
-public class OpenRocketViewer extends SherlockFragmentActivity\r
+public class OpenRocketViewer extends OpenRocketLoaderActivity\r
 implements Simulations.OnSimulationSelectedListener\r
 {\r
 \r
@@ -70,6 +69,10 @@ implements Simulations.OnSimulationSelectedListener
        public boolean onMenuItemSelected(int featureId, MenuItem item) {\r
                AndroidLogWrapper.d(OpenRocketViewer.class,"onMenuItemSelected" + item.getItemId());\r
                switch(item.getItemId()) {\r
+               case R.id.menu_load:\r
+                       // FIXME - Might want to prompt for save here.\r
+                       pickOrkFiles();\r
+                       return true;\r
                case R.id.menu_save:\r
                        // FIXME - Probably want to open a dialog here.\r
                        try {\r