Rework the loading workflow to be more natural and fix some nasty bugs. Make the...

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

diff --git a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderFragment.java b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderFragment.java
index 01b9549f6765e216ce357ab90004e62de9e46c98..e6dc5dd3b2e751c2af2d0b43fdee85406abe872b 100644 (file)
--- a/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderFragment.java
+++ b/android/src/net/sf/openrocket/android/rocket/OpenRocketLoaderFragment.java
@@ -2,6 +2,7 @@ package net.sf.openrocket.android.rocket;
 \r
 import java.io.File;\r
 \r
+import net.sf.openrocket.R;\r
 import net.sf.openrocket.android.util.AndroidLogWrapper;\r
 import net.sf.openrocket.android.util.ProgressDialogFragment;\r
 import net.sf.openrocket.document.OpenRocketDocument;\r
@@ -17,12 +18,12 @@ import android.view.LayoutInflater;
 import android.view.View;\r
 import android.view.ViewGroup;\r
 \r
-public class OpenRocketLoaderFragment extends Fragment {\r
+import com.actionbarsherlock.app.SherlockFragment;\r
+\r
+public class OpenRocketLoaderFragment extends SherlockFragment {\r
        \r
        private final static String FILE_ARG_KEY = "file";\r
        \r
-       private final static String LOADING_MESSAGE = "Loading file...";\r
-\r
        public interface OnOpenRocketFileLoaded {\r
                public void onOpenRocketFileLoaded( OpenRocketLoaderResult result );\r
        }\r
@@ -74,7 +75,8 @@ public class OpenRocketLoaderFragment extends Fragment {
                @Override\r
                protected void onPreExecute() {\r
                        super.onPreExecute();\r
-                       DialogFragment newFragment = ProgressDialogFragment.newInstance("", LOADING_MESSAGE);\r
+                       String loading = getActivity().getResources().getString(R.string.loading);\r
+                       DialogFragment newFragment = ProgressDialogFragment.newInstance("", loading);\r
                        newFragment.show(getFragmentManager(), PROGRESS_DIALOG_TAG);\r
                }\r
 \r