piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

Rename GameSettingsDialog to GamePropertiesDialog

Browse Source 
Since it no longer only contains settings.
This commit is contained in:
JosJuice 2019-06-15 20:14:35 +02:00
parent 00c4dad784
commit 5ed0cf8e0e
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameAdapter.java
View File

@ -13,7 +13,7 @@ import android.view.ViewGroup;
import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.R;
import org.dolphinemu.dolphinemu.activities.EmulationActivity; import org.dolphinemu.dolphinemu.activities.EmulationActivity;
import org.dolphinemu.dolphinemu.dialogs.GameSettingsDialog; import org.dolphinemu.dolphinemu.dialogs.GamePropertiesDialog;
import org.dolphinemu.dolphinemu.model.GameFile; import org.dolphinemu.dolphinemu.model.GameFile;
import org.dolphinemu.dolphinemu.utils.PicassoUtils; import org.dolphinemu.dolphinemu.utils.PicassoUtils;
import org.dolphinemu.dolphinemu.viewholders.GameViewHolder; import org.dolphinemu.dolphinemu.viewholders.GameViewHolder;
@ -145,11 +145,11 @@ public final class GameAdapter extends RecyclerView.Adapter<GameViewHolder> impl
return true; return true;
} }
GameSettingsDialog fragment = GamePropertiesDialog fragment =
GameSettingsDialog. GamePropertiesDialog
newInstance(holder.gameFile.getPath(), gameId, holder.gameFile.getPlatform()); .newInstance(holder.gameFile.getPath(), gameId, holder.gameFile.getPlatform());
((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction() ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction()
.add(fragment, GameSettingsDialog.TAG).commit(); .add(fragment, GamePropertiesDialog.TAG).commit();
return true; return true;
} }

8
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/adapters/GameRowPresenter.java
View File

@ -13,7 +13,7 @@ import android.view.ViewGroup;
import android.widget.ImageView; import android.widget.ImageView;
import org.dolphinemu.dolphinemu.R; import org.dolphinemu.dolphinemu.R;
import org.dolphinemu.dolphinemu.dialogs.GameSettingsDialog; import org.dolphinemu.dolphinemu.dialogs.GamePropertiesDialog;
import org.dolphinemu.dolphinemu.model.GameFile; import org.dolphinemu.dolphinemu.model.GameFile;
import org.dolphinemu.dolphinemu.ui.platform.Platform; import org.dolphinemu.dolphinemu.ui.platform.Platform;
import org.dolphinemu.dolphinemu.utils.PicassoUtils; import org.dolphinemu.dolphinemu.utils.PicassoUtils;
@ -90,11 +90,11 @@ public final class GameRowPresenter extends Presenter
return true; return true;
} }
GameSettingsDialog fragment = GamePropertiesDialog fragment =
GameSettingsDialog.newInstance(holder.gameFile.getPath(), gameId, GamePropertiesDialog.newInstance(holder.gameFile.getPath(), gameId,
holder.gameFile.getPlatform()); holder.gameFile.getPlatform());
((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction() ((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction()
.add(fragment, GameSettingsDialog.TAG).commit(); .add(fragment, GamePropertiesDialog.TAG).commit();
return true; return true;
}); });

11
Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GameSettingsDialog.java → Source/Android/app/src/main/java/org/dolphinemu/dolphinemu/dialogs/GamePropertiesDialog.java
View File

@ -18,16 +18,16 @@ import org.dolphinemu.dolphinemu.utils.DirectoryInitialization;
import java.io.File; import java.io.File;
public class GameSettingsDialog extends DialogFragment public class GamePropertiesDialog extends DialogFragment
{ {
public static final String TAG = "GameSettingsDialog"; public static final String TAG = "GamePropertiesDialog";
public static final String ARG_PATH = "path"; public static final String ARG_PATH = "path";
public static final String ARG_GAMEID = "game_id"; public static final String ARG_GAMEID = "game_id";
public static final String ARG_PLATFORM = "platform"; public static final String ARG_PLATFORM = "platform";
public static GameSettingsDialog newInstance(String path, String gameId, int platform) public static GamePropertiesDialog newInstance(String path, String gameId, int platform)
{ {
GameSettingsDialog fragment = new GameSettingsDialog(); GamePropertiesDialog fragment = new GamePropertiesDialog();
Bundle arguments = new Bundle(); Bundle arguments = new Bundle();
arguments.putString(ARG_PATH, path); arguments.putString(ARG_PATH, path);
@ -48,7 +48,8 @@ public class GameSettingsDialog extends DialogFragment
String gameId = requireArguments().getString(ARG_GAMEID); String gameId = requireArguments().getString(ARG_GAMEID);
int platform = requireArguments().getInt(ARG_PLATFORM); int platform = requireArguments().getInt(ARG_PLATFORM);
builder.setTitle(requireContext().getString(R.string.preferences_game_settings) + ": " + gameId) builder.setTitle(requireContext()
.getString(R.string.preferences_game_properties) + ": " + gameId)
.setItems(platform == Platform.GAMECUBE.toInt() ? .setItems(platform == Platform.GAMECUBE.toInt() ?
R.array.gameSettingsMenusGC : R.array.gameSettingsMenusGC :
R.array.gameSettingsMenusWii, (dialog, which) -> R.array.gameSettingsMenusWii, (dialog, which) ->

2
Source/Android/app/src/main/res/values/strings.xml
View File

@ -280,7 +280,7 @@
<!-- Preferences Screen --> <!-- Preferences Screen -->
<string name="preferences_save_exit">Save and Exit</string> <string name="preferences_save_exit">Save and Exit</string>
<string name="preferences_settings">Settings</string> <string name="preferences_settings">Settings</string>
<string name="preferences_game_settings">Game Settings</string> <string name="preferences_game_properties">Game Properties</string>
<string name="preferences_extensions">Extension Bindings</string> <string name="preferences_extensions">Extension Bindings</string>
<string name="game_ini_junk_title">Junk Data Found</string> <string name="game_ini_junk_title">Junk Data Found</string>
<string name="game_ini_junk_question">The settings file for this game contains junk data created by an old version of Dolphin. Would you like to fix this by deleting the settings file for this game? All game-specific settings and cheats that you have added will be removed. This cannot be undone.</string> <string name="game_ini_junk_question">The settings file for this game contains junk data created by an old version of Dolphin. Would you like to fix this by deleting the settings file for this game? All game-specific settings and cheats that you have added will be removed. This cannot be undone.</string>