mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2025-07-22 22:00:39 -06:00
Treewide: Rename references to SD Card image path to clarify they mean the image file, not the folder.
This commit is contained in:
@ -128,7 +128,7 @@
|
|||||||
|
|
||||||
#define WII_STATE "state.dat"
|
#define WII_STATE "state.dat"
|
||||||
|
|
||||||
#define WII_SDCARD "sd.raw"
|
#define WII_SD_CARD_IMAGE "sd.raw"
|
||||||
#define WII_BTDINF_BACKUP "btdinf.bak"
|
#define WII_BTDINF_BACKUP "btdinf.bak"
|
||||||
|
|
||||||
#define WII_SETTING "setting.txt"
|
#define WII_SETTING "setting.txt"
|
||||||
|
@ -994,7 +994,7 @@ static void RebuildUserDirectories(unsigned int dir_index)
|
|||||||
s_user_paths[F_ARAMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + ARAM_DUMP;
|
s_user_paths[F_ARAMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + ARAM_DUMP;
|
||||||
s_user_paths[F_FAKEVMEMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
|
s_user_paths[F_FAKEVMEMDUMP_IDX] = s_user_paths[D_DUMP_IDX] + FAKEVMEM_DUMP;
|
||||||
s_user_paths[F_GCSRAM_IDX] = s_user_paths[D_GCUSER_IDX] + GC_SRAM;
|
s_user_paths[F_GCSRAM_IDX] = s_user_paths[D_GCUSER_IDX] + GC_SRAM;
|
||||||
s_user_paths[F_WIISDCARD_IDX] = s_user_paths[D_WIIROOT_IDX] + WII_SDCARD;
|
s_user_paths[F_WIISDCARDIMAGE_IDX] = s_user_paths[D_WIIROOT_IDX] + WII_SD_CARD_IMAGE;
|
||||||
|
|
||||||
s_user_paths[D_MEMORYWATCHER_IDX] = s_user_paths[D_USER_IDX] + MEMORYWATCHER_DIR DIR_SEP;
|
s_user_paths[D_MEMORYWATCHER_IDX] = s_user_paths[D_USER_IDX] + MEMORYWATCHER_DIR DIR_SEP;
|
||||||
s_user_paths[F_MEMORYWATCHERLOCATIONS_IDX] =
|
s_user_paths[F_MEMORYWATCHERLOCATIONS_IDX] =
|
||||||
|
@ -79,7 +79,7 @@ enum
|
|||||||
F_GCSRAM_IDX,
|
F_GCSRAM_IDX,
|
||||||
F_MEMORYWATCHERLOCATIONS_IDX,
|
F_MEMORYWATCHERLOCATIONS_IDX,
|
||||||
F_MEMORYWATCHERSOCKET_IDX,
|
F_MEMORYWATCHERSOCKET_IDX,
|
||||||
F_WIISDCARD_IDX,
|
F_WIISDCARDIMAGE_IDX,
|
||||||
F_DUALSHOCKUDPCLIENTCONFIG_IDX,
|
F_DUALSHOCKUDPCLIENTCONFIG_IDX,
|
||||||
F_FREELOOKCONFIG_IDX,
|
F_FREELOOKCONFIG_IDX,
|
||||||
F_GBABIOS_IDX,
|
F_GBABIOS_IDX,
|
||||||
|
@ -268,7 +268,7 @@ const Info<std::string> MAIN_DUMP_PATH{{System::Main, "General", "DumpPath"}, ""
|
|||||||
const Info<std::string> MAIN_LOAD_PATH{{System::Main, "General", "LoadPath"}, ""};
|
const Info<std::string> MAIN_LOAD_PATH{{System::Main, "General", "LoadPath"}, ""};
|
||||||
const Info<std::string> MAIN_RESOURCEPACK_PATH{{System::Main, "General", "ResourcePackPath"}, ""};
|
const Info<std::string> MAIN_RESOURCEPACK_PATH{{System::Main, "General", "ResourcePackPath"}, ""};
|
||||||
const Info<std::string> MAIN_FS_PATH{{System::Main, "General", "NANDRootPath"}, ""};
|
const Info<std::string> MAIN_FS_PATH{{System::Main, "General", "NANDRootPath"}, ""};
|
||||||
const Info<std::string> MAIN_SD_PATH{{System::Main, "General", "WiiSDCardPath"}, ""};
|
const Info<std::string> MAIN_WII_SD_CARD_IMAGE_PATH{{System::Main, "General", "WiiSDCardPath"}, ""};
|
||||||
const Info<std::string> MAIN_WFS_PATH{{System::Main, "General", "WFSPath"}, ""};
|
const Info<std::string> MAIN_WFS_PATH{{System::Main, "General", "WFSPath"}, ""};
|
||||||
const Info<bool> MAIN_SHOW_LAG{{System::Main, "General", "ShowLag"}, false};
|
const Info<bool> MAIN_SHOW_LAG{{System::Main, "General", "ShowLag"}, false};
|
||||||
const Info<bool> MAIN_SHOW_FRAME_COUNT{{System::Main, "General", "ShowFrameCount"}, false};
|
const Info<bool> MAIN_SHOW_FRAME_COUNT{{System::Main, "General", "ShowFrameCount"}, false};
|
||||||
|
@ -178,7 +178,7 @@ extern const Info<std::string> MAIN_DUMP_PATH;
|
|||||||
extern const Info<std::string> MAIN_LOAD_PATH;
|
extern const Info<std::string> MAIN_LOAD_PATH;
|
||||||
extern const Info<std::string> MAIN_RESOURCEPACK_PATH;
|
extern const Info<std::string> MAIN_RESOURCEPACK_PATH;
|
||||||
extern const Info<std::string> MAIN_FS_PATH;
|
extern const Info<std::string> MAIN_FS_PATH;
|
||||||
extern const Info<std::string> MAIN_SD_PATH;
|
extern const Info<std::string> MAIN_WII_SD_CARD_IMAGE_PATH;
|
||||||
extern const Info<std::string> MAIN_WFS_PATH;
|
extern const Info<std::string> MAIN_WFS_PATH;
|
||||||
extern const Info<bool> MAIN_SHOW_LAG;
|
extern const Info<bool> MAIN_SHOW_LAG;
|
||||||
extern const Info<bool> MAIN_SHOW_FRAME_COUNT;
|
extern const Info<bool> MAIN_SHOW_FRAME_COUNT;
|
||||||
|
@ -89,7 +89,7 @@ void SDIOSlot0Device::EventNotify()
|
|||||||
|
|
||||||
void SDIOSlot0Device::OpenInternal()
|
void SDIOSlot0Device::OpenInternal()
|
||||||
{
|
{
|
||||||
const std::string filename = File::GetUserPath(F_WIISDCARD_IDX);
|
const std::string filename = File::GetUserPath(F_WIISDCARDIMAGE_IDX);
|
||||||
m_card.Open(filename, "r+b");
|
m_card.Open(filename, "r+b");
|
||||||
if (!m_card)
|
if (!m_card)
|
||||||
{
|
{
|
||||||
|
@ -2479,7 +2479,7 @@ void NetPlayClient::ComputeMD5(const SyncIdentifier& sync_identifier)
|
|||||||
|
|
||||||
std::string file;
|
std::string file;
|
||||||
if (sync_identifier == GetSDCardIdentifier())
|
if (sync_identifier == GetSDCardIdentifier())
|
||||||
file = File::GetUserPath(F_WIISDCARD_IDX);
|
file = File::GetUserPath(F_WIISDCARDIMAGE_IDX);
|
||||||
else if (auto game = m_dialog->FindGameFile(sync_identifier))
|
else if (auto game = m_dialog->FindGameFile(sync_identifier))
|
||||||
file = game->GetFilePath();
|
file = game->GetFilePath();
|
||||||
|
|
||||||
|
@ -102,7 +102,8 @@ void PathPane::BrowseResourcePack()
|
|||||||
void PathPane::BrowseSDCard()
|
void PathPane::BrowseSDCard()
|
||||||
{
|
{
|
||||||
QString file = QDir::toNativeSeparators(DolphinFileDialog::getOpenFileName(
|
QString file = QDir::toNativeSeparators(DolphinFileDialog::getOpenFileName(
|
||||||
this, tr("Select a SD Card Image"), QString::fromStdString(Config::Get(Config::MAIN_SD_PATH)),
|
this, tr("Select a SD Card Image"),
|
||||||
|
QString::fromStdString(Config::Get(Config::MAIN_WII_SD_CARD_IMAGE_PATH)),
|
||||||
tr("SD Card Image (*.raw);;"
|
tr("SD Card Image (*.raw);;"
|
||||||
"All Files (*)")));
|
"All Files (*)")));
|
||||||
if (!file.isEmpty())
|
if (!file.isEmpty())
|
||||||
@ -125,7 +126,7 @@ void PathPane::BrowseWFS()
|
|||||||
|
|
||||||
void PathPane::OnSDCardPathChanged()
|
void PathPane::OnSDCardPathChanged()
|
||||||
{
|
{
|
||||||
Config::SetBase(Config::MAIN_SD_PATH, m_sdcard_edit->text().toStdString());
|
Config::SetBase(Config::MAIN_WII_SD_CARD_IMAGE_PATH, m_sdcard_edit->text().toStdString());
|
||||||
}
|
}
|
||||||
|
|
||||||
void PathPane::OnNANDPathChanged()
|
void PathPane::OnNANDPathChanged()
|
||||||
@ -241,7 +242,7 @@ QGridLayout* PathPane::MakePathsLayout()
|
|||||||
layout->addWidget(m_resource_pack_edit, 4, 1);
|
layout->addWidget(m_resource_pack_edit, 4, 1);
|
||||||
layout->addWidget(resource_pack_open, 4, 2);
|
layout->addWidget(resource_pack_open, 4, 2);
|
||||||
|
|
||||||
m_sdcard_edit = new QLineEdit(QString::fromStdString(File::GetUserPath(F_WIISDCARD_IDX)));
|
m_sdcard_edit = new QLineEdit(QString::fromStdString(File::GetUserPath(F_WIISDCARDIMAGE_IDX)));
|
||||||
connect(m_sdcard_edit, &QLineEdit::editingFinished, this, &PathPane::OnSDCardPathChanged);
|
connect(m_sdcard_edit, &QLineEdit::editingFinished, this, &PathPane::OnSDCardPathChanged);
|
||||||
QPushButton* sdcard_open = new NonDefaultQPushButton(QStringLiteral("..."));
|
QPushButton* sdcard_open = new NonDefaultQPushButton(QStringLiteral("..."));
|
||||||
connect(sdcard_open, &QPushButton::clicked, this, &PathPane::BrowseSDCard);
|
connect(sdcard_open, &QPushButton::clicked, this, &PathPane::BrowseSDCard);
|
||||||
|
@ -91,7 +91,7 @@ static void InitCustomPaths()
|
|||||||
CreateDumpPath(Config::Get(Config::MAIN_DUMP_PATH));
|
CreateDumpPath(Config::Get(Config::MAIN_DUMP_PATH));
|
||||||
CreateResourcePackPath(Config::Get(Config::MAIN_RESOURCEPACK_PATH));
|
CreateResourcePackPath(Config::Get(Config::MAIN_RESOURCEPACK_PATH));
|
||||||
CreateWFSPath(Config::Get(Config::MAIN_WFS_PATH));
|
CreateWFSPath(Config::Get(Config::MAIN_WFS_PATH));
|
||||||
File::SetUserPath(F_WIISDCARD_IDX, Config::Get(Config::MAIN_SD_PATH));
|
File::SetUserPath(F_WIISDCARDIMAGE_IDX, Config::Get(Config::MAIN_WII_SD_CARD_IMAGE_PATH));
|
||||||
#ifdef HAS_LIBMGBA
|
#ifdef HAS_LIBMGBA
|
||||||
File::SetUserPath(F_GBABIOS_IDX, Config::Get(Config::MAIN_GBA_BIOS_PATH));
|
File::SetUserPath(F_GBABIOS_IDX, Config::Get(Config::MAIN_GBA_BIOS_PATH));
|
||||||
File::SetUserPath(D_GBASAVES_IDX, Config::Get(Config::MAIN_GBA_SAVES_PATH));
|
File::SetUserPath(D_GBASAVES_IDX, Config::Get(Config::MAIN_GBA_SAVES_PATH));
|
||||||
|
Reference in New Issue
Block a user