ShuriZma
/
duckstation
mirror of https://github.com/stenzek/duckstation
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Qt: Fix saved language setting

This commit is contained in:
Connor McLaughlin 2022-07-22 23:47:12 +10:00
parent 6e5b9c8f33
commit 23ea7b92bc
4 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/duckstation-qt/controllerbindingwidget.ui
View File

@ -77,7 +77,7 @@
<item>
<widget class="QPushButton" name="automaticBinding">
<property name="text">
<string>Automatic binding</string>
<string>Automatic Mapping</string>
</property>
<property name="icon">
<iconset theme="gamepad-line">
@ -88,7 +88,7 @@
<item>
<widget class="QPushButton" name="clearBindings">
<property name="text">
<string>Clear Bindings</string>
<string>Clear Mapping</string>
</property>
<property name="icon">
<iconset theme="file-reduce-line">

6
src/duckstation-qt/controllerbindingwidgets.cpp
View File

@ -162,8 +162,8 @@ void ControllerBindingWidget::onAutomaticBindingClicked()
void ControllerBindingWidget::onClearBindingsClicked()
{
if (QMessageBox::question(
QtUtils::GetRootWidget(this), tr("Clear Bindings"),
tr("Are you sure you want to clear all bindings for this controller? This action cannot be undone.")) !=
QtUtils::GetRootWidget(this), tr("Clear Mapping"),
tr("Are you sure you want to clear all mappings for this controller? This action cannot be undone.")) !=
QMessageBox::Yes)
{
return;
@ -200,7 +200,7 @@ void ControllerBindingWidget::doDeviceAutomaticBinding(const QString& device)
InputManager::GetGenericBindingMapping(device.toStdString());
if (mapping.empty())
{
QMessageBox::critical(QtUtils::GetRootWidget(this), tr("Automatic Binding"),
QMessageBox::critical(QtUtils::GetRootWidget(this), tr("Automatic Mapping"),
tr("No generic bindings were generated for device '%1'").arg(device));
return;
}

18
src/duckstation-qt/qthost.cpp
View File

@ -208,6 +208,7 @@ bool QtHost::InitializeConfig(std::string settings_filename)
Log::SetConsoleOutputParams(true, nullptr, LOGLEVEL_NONE);
}
InstallTranslator();
return true;
}
@ -2160,8 +2161,9 @@ bool QtHost::ParseCommandLineParametersAndInitializeConfig(QApplication& app,
if (autoboot && !autoboot->filename.empty() && !FileSystem::FileExists(autoboot->filename.c_str()))
{
QMessageBox::critical(nullptr, QStringLiteral("Error"),
QStringLiteral("File '%1' does not exist.").arg(QString::fromStdString(autoboot->filename)));
QMessageBox::critical(
nullptr, qApp->translate("QtHost", "Error"),
qApp->translate("QtHost", "File '%1' does not exist.").arg(QString::fromStdString(autoboot->filename)));
return false;
}
@ -2186,8 +2188,8 @@ bool QtHost::ParseCommandLineParametersAndInitializeConfig(QApplication& app,
if (autoboot->save_state.empty() || !FileSystem::FileExists(autoboot->save_state.c_str()))
{
QMessageBox::critical(nullptr, QStringLiteral("Error"),
QStringLiteral("The specified save state does not exist."));
QMessageBox::critical(nullptr, qApp->translate("QtHost", "Error"),
qApp->translate("QtHost", "The specified save state does not exist."));
return false;
}
}
@ -2201,10 +2203,10 @@ bool QtHost::ParseCommandLineParametersAndInitializeConfig(QApplication& app,
// scanning the game list).
if (s_batch_mode && !autoboot && !s_start_fullscreen_ui)
{
QMessageBox::critical(nullptr, QStringLiteral("Error"),
s_nogui_mode ?
QStringLiteral("Cannot use no-gui mode, because no boot filename was specified.") :
QStringLiteral("Cannot use batch mode, because no boot filename was specified."));
QMessageBox::critical(
nullptr, qApp->translate("QtHost", "Error"),
s_nogui_mode ? qApp->translate("QtHost", "Cannot use no-gui mode, because no boot filename was specified.") :
qApp->translate("QtHost", "Cannot use batch mode, because no boot filename was specified."));
return false;
}

2
src/frontend-common/fullscreen_ui.cpp
View File

@ -1656,7 +1656,7 @@ void FullscreenUI::StartAutomaticBinding(u32 port)
std::vector<std::pair<std::string, std::string>> devices(InputManager::EnumerateDevices());
if (devices.empty())
{
ShowToast({}, "Automatic binding failed, no devices are available.");
ShowToast({}, "Automatic mapping failed, no devices are available.");
return;
}