claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

qt: Reword some error messages slightly

Browse Source
This commit is contained in:
Alexander Babikov
2025-04-08 15:29:07 +05:00
parent 377381a8fa
commit 0a2d15db9b
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/qt/languages/86box.pot
View File

@@ -2085,7 +2085,7 @@ msgstr ""
msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P Dot-Matrix Printer." msgid "TrueType fonts in the \"roms/printer/fonts\" directory are required for the emulation of the Generic ESC/P Dot-Matrix Printer."
msgstr "" msgstr ""
msgid "Inhibit multimedia keys on Windows" msgid "Inhibit multimedia keys"
msgstr "" msgstr ""
msgid "Failed to initialize Vulkan renderer." msgid "Failed to initialize Vulkan renderer."

2
src/qt/qt_glsl_parser.cpp
View File

@@ -214,7 +214,7 @@ static glslp_t *glsl_parse(const char *f) {
strcpy(shader->shader_fn, f); strcpy(shader->shader_fn, f);
shader->shader_program = load_file(f); shader->shader_program = load_file(f);
if (!shader->shader_program) { if (!shader->shader_program) {
QMessageBox::critical((QWidget *) qApp->findChild<QWindow *>(), QObject::tr("GLSL error"), QObject::tr("Could not load shader %1").arg(shader->shader_fn)); QMessageBox::critical((QWidget *) qApp->findChild<QWindow *>(), QObject::tr("GLSL error"), QObject::tr("Could not load shader: %1").arg(shader->shader_fn));
//wx_simple_messagebox("GLSL error", "Could not load shader %s\n", shader->shader_fn); //wx_simple_messagebox("GLSL error", "Could not load shader %s\n", shader->shader_fn);
glslp_free(glslp); glslp_free(glslp);
return 0; return 0;

2
src/qt/qt_openglrenderer.cpp
View File

@@ -633,7 +633,7 @@ OpenGLRenderer::load_glslp(glsl_t *glsl, int num_shader, const char *f)
if (!load_texture(file, &tex->texture)) { if (!load_texture(file, &tex->texture)) {
//QMessageBox::critical(main_window, tr("GLSL Error"), tr("Could not load texture: %s").arg(file)); //QMessageBox::critical(main_window, tr("GLSL Error"), tr("Could not load texture: %s").arg(file));
main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Could not load texture: %s").arg(file)); main_window->showMessage(MBX_ERROR | MBX_FATAL, tr("GLSL Error"), tr("Could not load texture: %1").arg(file));
pclog("Could not load texture %s!\n", file); pclog("Could not load texture %s!\n", file);
failed = 1; failed = 1;
break; break;

2
src/qt/qt_openglshadermanagerdialog.cpp
View File

@@ -184,7 +184,7 @@ void OpenGLShaderManagerDialog::on_buttonAdd_clicked()
ui->buttonAdd->setDisabled(ui->shaderListWidget->count() >= MAX_USER_SHADERS); ui->buttonAdd->setDisabled(ui->shaderListWidget->count() >= MAX_USER_SHADERS);
} }
} else { } else {
QMessageBox::critical(this, tr("GLSL error"), tr("Could not load filename %1").arg(res)); QMessageBox::critical(this, tr("GLSL error"), tr("Could not load file %1").arg(res));
} }
} }
} }

2
src/qt/qt_progsettings.cpp
View File

@@ -80,7 +80,7 @@ ProgSettings::accept()
confirm_save = ui->checkBoxConfirmSave->isChecked() ? 1 : 0; confirm_save = ui->checkBoxConfirmSave->isChecked() ? 1 : 0;
confirm_reset = ui->checkBoxConfirmHardReset->isChecked() ? 1 : 0; confirm_reset = ui->checkBoxConfirmHardReset->isChecked() ? 1 : 0;
video_fullscreen_first = ui->checkBoxFullscreenFirst->isChecked() ? 1 : 0; video_fullscreen_first = ui->checkBoxFullscreenFirst->isChecked() ? 1 : 0;
inhibit_multimedia_keys = ui->checkBoxMultimediaKeys->isChecked(); inhibit_multimedia_keys = ui->checkBoxMultimediaKeys->isChecked() ? 1 : 0;
loadTranslators(QCoreApplication::instance()); loadTranslators(QCoreApplication::instance());
reloadStrings(); reloadStrings();

2
src/qt/qt_progsettings.ui
View File

@@ -140,7 +140,7 @@
<item row="7" column="0"> <item row="7" column="0">
<widget class="QCheckBox" name="checkBoxMultimediaKeys"> <widget class="QCheckBox" name="checkBoxMultimediaKeys">
<property name="text"> <property name="text">
<string>Inhibit multimedia keys on Windows</string> <string>Inhibit multimedia keys</string>
</property> </property>
</widget> </widget>
</item> </item>