Skip to content
Permalink
Browse files

Rename GameSettingsDialog to GamePropertiesDialog

Since it no longer only contains settings.
  • Loading branch information
JosJuice committed Jun 15, 2019
1 parent 00c4dad commit 5ed0cf8e0e9882896ee30b6deb24e971fda44d13
@@ -13,7 +13,7 @@

import org.dolphinemu.dolphinemu.R;
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.utils.PicassoUtils;
import org.dolphinemu.dolphinemu.viewholders.GameViewHolder;
@@ -145,11 +145,11 @@ public boolean onLongClick(View view)
return true;
}

GameSettingsDialog fragment =
GameSettingsDialog.
newInstance(holder.gameFile.getPath(), gameId, holder.gameFile.getPlatform());
GamePropertiesDialog fragment =
GamePropertiesDialog
.newInstance(holder.gameFile.getPath(), gameId, holder.gameFile.getPlatform());
((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction()
.add(fragment, GameSettingsDialog.TAG).commit();
.add(fragment, GamePropertiesDialog.TAG).commit();
return true;
}

@@ -13,7 +13,7 @@
import android.widget.ImageView;

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.ui.platform.Platform;
import org.dolphinemu.dolphinemu.utils.PicassoUtils;
@@ -90,11 +90,11 @@ public void onBindViewHolder(ViewHolder viewHolder, Object item)
return true;
}

GameSettingsDialog fragment =
GameSettingsDialog.newInstance(holder.gameFile.getPath(), gameId,
GamePropertiesDialog fragment =
GamePropertiesDialog.newInstance(holder.gameFile.getPath(), gameId,
holder.gameFile.getPlatform());
((FragmentActivity) view.getContext()).getSupportFragmentManager().beginTransaction()
.add(fragment, GameSettingsDialog.TAG).commit();
.add(fragment, GamePropertiesDialog.TAG).commit();

return true;
});
@@ -18,16 +18,16 @@

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_GAMEID = "game_id";
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();
arguments.putString(ARG_PATH, path);
@@ -48,7 +48,8 @@ public Dialog onCreateDialog(Bundle savedInstanceState)
String gameId = requireArguments().getString(ARG_GAMEID);
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() ?
R.array.gameSettingsMenusGC :
R.array.gameSettingsMenusWii, (dialog, which) ->
@@ -280,7 +280,7 @@
<!-- Preferences Screen -->
<string name="preferences_save_exit">Save and Exit</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="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>

0 comments on commit 5ed0cf8

Please sign in to comment.
You can’t perform that action at this time.