Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

DolphinQt: Make SD sync strings look nicer #10860

Merged
merged 2 commits into from
Jul 16, 2022
Merged

DolphinQt: Make SD sync strings look nicer #10860

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
60aaa30
WiiPane: Trim automatic SD sync checkbox string
OatmealDome Jul 16, 2022
2eecfc8
WiiPane: Adjust capitalization of conversion buttons and alert titles
OatmealDome Jul 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 9 additions & 8 deletions Source/Core/DolphinQt/Settings/WiiPane.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,8 +193,9 @@ void WiiPane::CreateSDCard()
++row;
}

m_sync_sd_folder_checkbox =
new QCheckBox(tr("Automatically sync with Folder on emulation start and end"));
m_sync_sd_folder_checkbox = new QCheckBox(tr("Automatically Sync with Folder"));
m_sync_sd_folder_checkbox->setToolTip(
tr("Synchronizes the SD Card with the SD Sync Folder when starting and ending emulation."));
sd_settings_group_layout->addWidget(m_sync_sd_folder_checkbox, row, 0, 1, 2);
++row;

Expand All @@ -214,11 +215,11 @@ void WiiPane::CreateSDCard()
++row;
}

QPushButton* pack_now = new NonDefaultQPushButton(tr("Convert Folder to File now"));
QPushButton* unpack_now = new NonDefaultQPushButton(tr("Convert File to Folder now"));
QPushButton* pack_now = new NonDefaultQPushButton(tr("Convert Folder to File Now"));
QPushButton* unpack_now = new NonDefaultQPushButton(tr("Convert File to Folder Now"));
connect(pack_now, &QPushButton::clicked, [this] {
auto result = ModalMessageBox::warning(
this, tr("Convert Folder to File now"),
this, tr("Convert Folder to File Now"),
tr("You are about to convert the content of the folder at %1 into the file at %2. All "
"current content of the file will be deleted. Are you sure you want to continue?")
.arg(QString::fromStdString(File::GetUserPath(D_WIISDCARDSYNCFOLDER_IDX)))
Expand All @@ -227,12 +228,12 @@ void WiiPane::CreateSDCard()
if (result == QMessageBox::Yes)
{
if (!Common::SyncSDFolderToSDImage(false))
ModalMessageBox::warning(this, tr("Convert Folder to File now"), tr("Conversion failed."));
ModalMessageBox::warning(this, tr("Convert Folder to File Now"), tr("Conversion failed."));
}
});
connect(unpack_now, &QPushButton::clicked, [this] {
auto result = ModalMessageBox::warning(
this, tr("Convert File to Folder now"),
this, tr("Convert File to Folder Now"),
tr("You are about to convert the content of the file at %2 into the folder at %1. All "
"current content of the folder will be deleted. Are you sure you want to continue?")
.arg(QString::fromStdString(File::GetUserPath(D_WIISDCARDSYNCFOLDER_IDX)))
Expand All @@ -241,7 +242,7 @@ void WiiPane::CreateSDCard()
if (result == QMessageBox::Yes)
{
if (!Common::SyncSDImageToSDFolder())
ModalMessageBox::warning(this, tr("Convert File to Folder now"), tr("Conversion failed."));
ModalMessageBox::warning(this, tr("Convert File to Folder Now"), tr("Conversion failed."));
}
});
sd_settings_group_layout->addWidget(pack_now, row, 0, 1, 1);
Expand Down