Permalink
Browse files

Merge branch 'feature-zipped-roms'

  • Loading branch information...
littleguy77 committed Jan 16, 2015
2 parents cd65150 + ef6c0c6 commit 6db26118daef004cd8fcac7e392dc6a1b79d08b7
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/linearLayout1"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="horizontal"
+ android:padding="16dp" >
+
+ <ProgressBar
+ android:id="@+id/circleAnimation"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content" />
+
+ <LinearLayout
+ android:id="@+id/linearLayout2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:paddingLeft="16dp"
+ android:paddingRight="10dp" >
+
+ <TextView
+ android:id="@+id/textSubtitle"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <TextView
+ android:id="@+id/textProgress"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+
+ <ProgressBar
+ android:id="@+id/progressTotal"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:max="1000"
+ android:visibility="gone" />
+
+ <ProgressBar
+ android:id="@+id/progressSubtotal"
+ style="?android:attr/progressBarStyleHorizontal"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:max="1000"
+ android:visibility="gone" />
+
+ <TextView
+ android:id="@+id/textSubprogress"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+
+ <TextView
+ android:id="@+id/textMessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:textAppearance="?android:attr/textAppearanceSmall" />
+
+ </LinearLayout>
+
+</LinearLayout>
View
@@ -123,6 +123,8 @@
<string name="toast_overwritingFile">Overwriting %1$s…</string>
<string name="toast_loadingGameInfo">Loading game info…</string>
<string name="toast_savingScreenshot">Saving screenshot…</string>
+ <string name="toast_canceling">Canceling…</string>
+ <string name="toast_pleaseWait">Please wait…</string>
<!-- Something happened (use '.') -->
<string name="toast_nativeMainFailure01">Failed to parse initial command line parameters.</string>
@@ -477,6 +479,9 @@
<string name="pathHiResTexturesTask_message">Please be patient. This process may take some time.</string>
<string name="pathHiResTexturesTask_errorMessage">Problem unpacking textures!</string>
+ <!-- ROM Scanning -->
+ <string name="scanning_title">Scanning…</string>
+
<!-- Seek Bar Preference -->
<string name="seekBarPreference_summary">%1$d %2$s</string>
@@ -273,22 +273,20 @@ else if( file != null )
private void refreshRoms( final File startDir )
{
// Asynchronously search for ROMs
- Notifier.showToast( this, "Searching for ROMs in " + startDir.getName() );
- mCacheRomInfoTask = new CacheRomInfoTask( startDir, mAppData.mupen64plus_ini, mUserPrefs.romInfoCache_cfg, mUserPrefs.galleryDataDir, this );
+ mCacheRomInfoTask = new CacheRomInfoTask( this, startDir, mAppData.mupen64plus_ini, mUserPrefs.romInfoCache_cfg,
+ mUserPrefs.coverArtDir, mUserPrefs.unzippedRomsDir, this );
mCacheRomInfoTask.execute();
}
@Override
public void onCacheRomInfoProgress( ConfigSection section )
{
- Notifier.showToast( this, section.get( "goodName" ) );
}
@Override
public void onCacheRomInfoFinished( ConfigFile config, boolean canceled )
{
mCacheRomInfoTask = null;
- Notifier.showToast( this, canceled ? "Canceled" : "Finished" );
refreshGrid( config );
}
@@ -87,8 +87,14 @@
/** The parent directory containing all user-writable data files. */
public final String userDataDir;
- /** The subdirectory containing gallery data. */
- public final String galleryDataDir;
+ /** The subdirectory containing gallery data cache. */
+ public final String galleryCacheDir;
+
+ /** The subdirectory containing cover art files. */
+ public final String coverArtDir;
+
+ /** The subdirectory containing unzipped ROM files. */
+ public final String unzippedRomsDir;
/** The subdirectory containing custom profiles. */
public final String profilesDir;
@@ -280,13 +286,15 @@ public UserPrefs( Context context )
// Files
userDataDir = mPreferences.getString( "pathGameSaves", "" );
- galleryDataDir = userDataDir + "/GalleryData";
+ galleryCacheDir = userDataDir + "/GalleryCache";
+ coverArtDir = galleryCacheDir + "/CoverArt";
+ unzippedRomsDir = galleryCacheDir + "/UnzippedRoms";
profilesDir = userDataDir + "/Profiles";
crashLogDir = userDataDir + "/CrashLogs";
coreUserDataDir = userDataDir + "/CoreConfig/UserData";
coreUserCacheDir = userDataDir + "/CoreConfig/UserCache";
hiResTextureDir = coreUserDataDir + "/mupen64plus/hires_texture/"; // MUST match what rice assumes natively
- romInfoCache_cfg = galleryDataDir + "/romInfoCache.cfg";
+ romInfoCache_cfg = galleryCacheDir + "/romInfoCache.cfg";
controllerProfiles_cfg = profilesDir + "/controller.cfg";
touchscreenProfiles_cfg = profilesDir + "/touchscreen.cfg";
emulationProfiles_cfg = profilesDir + "/emulation.cfg";
Oops, something went wrong.

0 comments on commit 6db2611

Please sign in to comment.