From d71bcc731dc1f0d10413cccbcc1141729bc1d357 Mon Sep 17 00:00:00 2001 From: Alexander Babikov Date: Tue, 25 Nov 2025 04:29:11 +0500 Subject: [PATCH] qt: Use `QString::arg()` instead of concatenation for monitor number in the title bar --- src/qt/languages/86box.pot | 2 +- src/qt/languages/cs-CZ.po | 4 ++-- src/qt/languages/de-DE.po | 4 ++-- src/qt/languages/es-ES.po | 4 ++-- src/qt/languages/fi-FI.po | 4 ++-- src/qt/languages/fr-FR.po | 4 ++-- src/qt/languages/hr-HR.po | 4 ++-- src/qt/languages/it-IT.po | 4 ++-- src/qt/languages/ja-JP.po | 4 ++-- src/qt/languages/ko-KR.po | 4 ++-- src/qt/languages/nb-NO.po | 4 ++-- src/qt/languages/nl-NL.po | 4 ++-- src/qt/languages/pl-PL.po | 4 ++-- src/qt/languages/pt-BR.po | 4 ++-- src/qt/languages/pt-PT.po | 4 ++-- src/qt/languages/ru-RU.po | 4 ++-- src/qt/languages/sk-SK.po | 4 ++-- src/qt/languages/sl-SI.po | 4 ++-- src/qt/languages/sv-SE.po | 4 ++-- src/qt/languages/tr-TR.po | 4 ++-- src/qt/languages/uk-UA.po | 4 ++-- src/qt/languages/vi-VN.po | 4 ++-- src/qt/languages/zh-CN.po | 4 ++-- src/qt/languages/zh-TW.po | 4 ++-- src/qt/qt_mainwindow.cpp | 2 +- src/qt/qt_rendererstack.cpp | 2 +- 26 files changed, 49 insertions(+), 49 deletions(-) diff --git a/src/qt/languages/86box.pot b/src/qt/languages/86box.pot index c88e5820e..829df536a 100644 --- a/src/qt/languages/86box.pot +++ b/src/qt/languages/86box.pot @@ -1818,7 +1818,7 @@ msgstr "" msgid "I Copied It" msgstr "" -msgid "86Box Monitor #" +msgid "86Box Monitor #%1" msgstr "" msgid "No MCA devices." diff --git a/src/qt/languages/cs-CZ.po b/src/qt/languages/cs-CZ.po index 47f1b5d44..d16049fc9 100644 --- a/src/qt/languages/cs-CZ.po +++ b/src/qt/languages/cs-CZ.po @@ -1818,8 +1818,8 @@ msgstr "Přesunul jsem jej" msgid "I Copied It" msgstr "Zkopíroval jsem jej" -msgid "86Box Monitor #" -msgstr "86Box Monitor " +msgid "86Box Monitor #%1" +msgstr "86Box Monitor %1" msgid "No MCA devices." msgstr "Žádné zařízení MCA." diff --git a/src/qt/languages/de-DE.po b/src/qt/languages/de-DE.po index 0d4d166f1..0a5faccf9 100644 --- a/src/qt/languages/de-DE.po +++ b/src/qt/languages/de-DE.po @@ -1818,8 +1818,8 @@ msgstr "Ich habe es verschoben" msgid "I Copied It" msgstr "Ich habe es kopiert" -msgid "86Box Monitor #" -msgstr "86Box-Monitor #" +msgid "86Box Monitor #%1" +msgstr "86Box-Monitor #%1" msgid "No MCA devices." msgstr "Keine MCA-Geräte." diff --git a/src/qt/languages/es-ES.po b/src/qt/languages/es-ES.po index 385b309c2..fe451bd06 100644 --- a/src/qt/languages/es-ES.po +++ b/src/qt/languages/es-ES.po @@ -1818,8 +1818,8 @@ msgstr "La he movido" msgid "I Copied It" msgstr "La he copiado" -msgid "86Box Monitor #" -msgstr "Monitor de 86Box " +msgid "86Box Monitor #%1" +msgstr "Monitor de 86Box %1" msgid "No MCA devices." msgstr "No hay dispositovos MCA." diff --git a/src/qt/languages/fi-FI.po b/src/qt/languages/fi-FI.po index 319d18e0d..87d8e2a62 100644 --- a/src/qt/languages/fi-FI.po +++ b/src/qt/languages/fi-FI.po @@ -1818,8 +1818,8 @@ msgstr "Siirsin sen" msgid "I Copied It" msgstr "Kopioin sen" -msgid "86Box Monitor #" -msgstr "86Box Monitor " +msgid "86Box Monitor #%1" +msgstr "86Box Monitor %1" msgid "No MCA devices." msgstr "Ei MCA-laitteita." diff --git a/src/qt/languages/fr-FR.po b/src/qt/languages/fr-FR.po index d9fb46298..05ca345bb 100644 --- a/src/qt/languages/fr-FR.po +++ b/src/qt/languages/fr-FR.po @@ -1818,8 +1818,8 @@ msgstr "Je l'ai déplacé" msgid "I Copied It" msgstr "Je l'ai copié" -msgid "86Box Monitor #" -msgstr "Moniteur 86Box" +msgid "86Box Monitor #%1" +msgstr "Moniteur 86Box %1" msgid "No MCA devices." msgstr "Pas de dispositifs MCA." diff --git a/src/qt/languages/hr-HR.po b/src/qt/languages/hr-HR.po index ab784eaf1..0ef31f483 100644 --- a/src/qt/languages/hr-HR.po +++ b/src/qt/languages/hr-HR.po @@ -1818,8 +1818,8 @@ msgstr "Premjestio sam ga" msgid "I Copied It" msgstr "Kopirao sam ga" -msgid "86Box Monitor #" -msgstr "Monitor 86Box-a " +msgid "86Box Monitor #%1" +msgstr "Monitor 86Box-a %1" msgid "No MCA devices." msgstr "Nema uređaja MCA." diff --git a/src/qt/languages/it-IT.po b/src/qt/languages/it-IT.po index 04bd9d537..264c55bc8 100644 --- a/src/qt/languages/it-IT.po +++ b/src/qt/languages/it-IT.po @@ -1818,8 +1818,8 @@ msgstr "L'ho spostata" msgid "I Copied It" msgstr "L'ho copiata" -msgid "86Box Monitor #" -msgstr "Monitor 86Box #" +msgid "86Box Monitor #%1" +msgstr "Monitor 86Box #%1" msgid "No MCA devices." msgstr "Nessun dispositivo MCA." diff --git a/src/qt/languages/ja-JP.po b/src/qt/languages/ja-JP.po index a6314ca3b..7a38aabc8 100644 --- a/src/qt/languages/ja-JP.po +++ b/src/qt/languages/ja-JP.po @@ -1818,8 +1818,8 @@ msgstr "動かした" msgid "I Copied It" msgstr "コピーした" -msgid "86Box Monitor #" -msgstr "86Box モニター" +msgid "86Box Monitor #%1" +msgstr "86Box モニター%1" msgid "No MCA devices." msgstr "MCAデバイスはない。" diff --git a/src/qt/languages/ko-KR.po b/src/qt/languages/ko-KR.po index 798b1f80e..ddbc08866 100644 --- a/src/qt/languages/ko-KR.po +++ b/src/qt/languages/ko-KR.po @@ -1818,8 +1818,8 @@ msgstr "옮겼어요" msgid "I Copied It" msgstr "복사했습니다" -msgid "86Box Monitor #" -msgstr "86Box 모니터 " +msgid "86Box Monitor #%1" +msgstr "86Box 모니터 %1" msgid "No MCA devices." msgstr "MCA 장치가 없습니다." diff --git a/src/qt/languages/nb-NO.po b/src/qt/languages/nb-NO.po index 163d44fd8..0ae09ed6a 100644 --- a/src/qt/languages/nb-NO.po +++ b/src/qt/languages/nb-NO.po @@ -1818,8 +1818,8 @@ msgstr "Jeg flyttet den" msgid "I Copied It" msgstr "Jeg kopierte den" -msgid "86Box Monitor #" -msgstr "86Box-skjerm #" +msgid "86Box Monitor #%1" +msgstr "86Box-skjerm #%1" msgid "No MCA devices." msgstr "Ingen MCA-enheter." diff --git a/src/qt/languages/nl-NL.po b/src/qt/languages/nl-NL.po index fcd36dcb9..df7628bea 100644 --- a/src/qt/languages/nl-NL.po +++ b/src/qt/languages/nl-NL.po @@ -1818,8 +1818,8 @@ msgstr "Ik heb het verplaatst" msgid "I Copied It" msgstr "Ik heb het gekopieerd" -msgid "86Box Monitor #" -msgstr "86Box Monitor #" +msgid "86Box Monitor #%1" +msgstr "86Box Monitor #%1" msgid "No MCA devices." msgstr "Geen MCA-apparaten." diff --git a/src/qt/languages/pl-PL.po b/src/qt/languages/pl-PL.po index 5a321c5bc..b3dd39513 100644 --- a/src/qt/languages/pl-PL.po +++ b/src/qt/languages/pl-PL.po @@ -1818,8 +1818,8 @@ msgstr "Została przeniesiona" msgid "I Copied It" msgstr "Została skopiowana" -msgid "86Box Monitor #" -msgstr "86Box Monitor " +msgid "86Box Monitor #%1" +msgstr "86Box Monitor %1" msgid "No MCA devices." msgstr "Brak urządzeń MCA." diff --git a/src/qt/languages/pt-BR.po b/src/qt/languages/pt-BR.po index 4c4bfdb00..30f5a0a66 100644 --- a/src/qt/languages/pt-BR.po +++ b/src/qt/languages/pt-BR.po @@ -1818,8 +1818,8 @@ msgstr "Movi" msgid "I Copied It" msgstr "Copiei" -msgid "86Box Monitor #" -msgstr "Monitor 86Box nº" +msgid "86Box Monitor #%1" +msgstr "Monitor 86Box nº%1" msgid "No MCA devices." msgstr "Nenhum dispositivo MCA." diff --git a/src/qt/languages/pt-PT.po b/src/qt/languages/pt-PT.po index 0b75d3737..8be1c1912 100644 --- a/src/qt/languages/pt-PT.po +++ b/src/qt/languages/pt-PT.po @@ -1818,8 +1818,8 @@ msgstr "Movi-a" msgid "I Copied It" msgstr "Copiei-a" -msgid "86Box Monitor #" -msgstr "Monitor 86Box " +msgid "86Box Monitor #%1" +msgstr "Monitor 86Box %1" msgid "No MCA devices." msgstr "Não há dispositivos MCA." diff --git a/src/qt/languages/ru-RU.po b/src/qt/languages/ru-RU.po index 4fecfca2e..8b3c952e9 100644 --- a/src/qt/languages/ru-RU.po +++ b/src/qt/languages/ru-RU.po @@ -1818,8 +1818,8 @@ msgstr "Перемещена" msgid "I Copied It" msgstr "Скопирована" -msgid "86Box Monitor #" -msgstr "86Box Monitor #" +msgid "86Box Monitor #%1" +msgstr "Монитор 86Box № %1" msgid "No MCA devices." msgstr "Нет устройств MCA." diff --git a/src/qt/languages/sk-SK.po b/src/qt/languages/sk-SK.po index 781f1a7b0..b537f9285 100644 --- a/src/qt/languages/sk-SK.po +++ b/src/qt/languages/sk-SK.po @@ -1818,8 +1818,8 @@ msgstr "Presunul som ho" msgid "I Copied It" msgstr "Skopíroval som ho" -msgid "86Box Monitor #" -msgstr "86Box Monitor " +msgid "86Box Monitor #%1" +msgstr "86Box Monitor %1" msgid "No MCA devices." msgstr "Žiadne zariadenia MCA." diff --git a/src/qt/languages/sl-SI.po b/src/qt/languages/sl-SI.po index 6b20fa1c7..7e1ba367e 100644 --- a/src/qt/languages/sl-SI.po +++ b/src/qt/languages/sl-SI.po @@ -1818,8 +1818,8 @@ msgstr "Premaknil sem jo" msgid "I Copied It" msgstr "Kopiral sem jo" -msgid "86Box Monitor #" -msgstr "86Box Monitor " +msgid "86Box Monitor #%1" +msgstr "86Box Monitor %1" msgid "No MCA devices." msgstr "Ni naprav MCA." diff --git a/src/qt/languages/sv-SE.po b/src/qt/languages/sv-SE.po index 79b921e44..44247a260 100644 --- a/src/qt/languages/sv-SE.po +++ b/src/qt/languages/sv-SE.po @@ -1818,8 +1818,8 @@ msgstr "Jag flyttade den" msgid "I Copied It" msgstr "Jag kopierade den" -msgid "86Box Monitor #" -msgstr "86Box skärm #" +msgid "86Box Monitor #%1" +msgstr "86Box skärm #%1" msgid "No MCA devices." msgstr "Inga MCA-enheter." diff --git a/src/qt/languages/tr-TR.po b/src/qt/languages/tr-TR.po index 64ba1d0e3..9689e4331 100644 --- a/src/qt/languages/tr-TR.po +++ b/src/qt/languages/tr-TR.po @@ -1818,8 +1818,8 @@ msgstr "Taşındı" msgid "I Copied It" msgstr "Kopyalandı" -msgid "86Box Monitor #" -msgstr "86Box Monitör #" +msgid "86Box Monitor #%1" +msgstr "86Box Monitör #%1" msgid "No MCA devices." msgstr "MCA cihazı yok." diff --git a/src/qt/languages/uk-UA.po b/src/qt/languages/uk-UA.po index 2e409f9d7..f2655a492 100644 --- a/src/qt/languages/uk-UA.po +++ b/src/qt/languages/uk-UA.po @@ -1818,8 +1818,8 @@ msgstr "Переміщена" msgid "I Copied It" msgstr "Скопійована" -msgid "86Box Monitor #" -msgstr "Монітор 86Box " +msgid "86Box Monitor #%1" +msgstr "Монітор 86Box %1" msgid "No MCA devices." msgstr "Ніяких пристроїв MCA." diff --git a/src/qt/languages/vi-VN.po b/src/qt/languages/vi-VN.po index c5ee4bfe4..7cd3396eb 100644 --- a/src/qt/languages/vi-VN.po +++ b/src/qt/languages/vi-VN.po @@ -1818,8 +1818,8 @@ msgstr "Tôi đã di chuyển nó" msgid "I Copied It" msgstr "Tôi đã sao chép nó" -msgid "86Box Monitor #" -msgstr "Màn hình 86box #" +msgid "86Box Monitor #%1" +msgstr "Màn hình 86Box #%1" msgid "No MCA devices." msgstr "Không có thiết bị MCA." diff --git a/src/qt/languages/zh-CN.po b/src/qt/languages/zh-CN.po index 41e40d808..0aa40165e 100644 --- a/src/qt/languages/zh-CN.po +++ b/src/qt/languages/zh-CN.po @@ -1818,8 +1818,8 @@ msgstr "我已移动这台机器" msgid "I Copied It" msgstr "我已复制这台机器" -msgid "86Box Monitor #" -msgstr "86Box 显示器 #" +msgid "86Box Monitor #%1" +msgstr "86Box 显示器 #%1" msgid "No MCA devices." msgstr "无 MCA 设备。" diff --git a/src/qt/languages/zh-TW.po b/src/qt/languages/zh-TW.po index f17d1a7bd..41ea38f50 100644 --- a/src/qt/languages/zh-TW.po +++ b/src/qt/languages/zh-TW.po @@ -1818,8 +1818,8 @@ msgstr "我已移動這台機器" msgid "I Copied It" msgstr "我已複製這台機器" -msgid "86Box Monitor #" -msgstr "86Box 監視器 #" +msgid "86Box Monitor #%1" +msgstr "86Box 監視器 #%1" msgid "No MCA devices." msgstr "沒有 MCA 裝置。" diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 87415ba07..c51ae6269 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -1070,7 +1070,7 @@ MainWindow::initRendererMonitorSlot(int monitor_index) this->renderers[monitor_index]->show(); }); secondaryRenderer->setWindowFlags(Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowCloseButtonHint); - secondaryRenderer->setWindowTitle(QObject::tr("86Box Monitor #") + QString::number(monitor_index + 1)); + secondaryRenderer->setWindowTitle(QObject::tr("86Box Monitor #%1").arg(monitor_index + 1)); secondaryRenderer->setContextMenuPolicy(Qt::PreventContextMenu); for (int i = 0; i < this->actions().size(); i++) { diff --git a/src/qt/qt_rendererstack.cpp b/src/qt/qt_rendererstack.cpp index a65f056b6..41d17d897 100644 --- a/src/qt/qt_rendererstack.cpp +++ b/src/qt/qt_rendererstack.cpp @@ -116,7 +116,7 @@ RendererStack::RendererStack(QWidget *parent, int monitor_index) frameRateTimer->setSingleShot(false); frameRateTimer->setInterval(1000); connect(frameRateTimer, &QTimer::timeout, [this] { - this->setWindowTitle(QObject::tr("86Box Monitor #") + QString::number(m_monitor_index + 1) + QString(" - ") + tr("%1 Hz").arg(QString::number(monitors[m_monitor_index].mon_actualrenderedframes.load()) + (monitors[m_monitor_index].mon_interlace ? "i" : ""))); + this->setWindowTitle(QObject::tr("86Box Monitor #%1").arg(m_monitor_index + 1) + QString(" - ") + tr("%1 Hz").arg(QString::number(monitors[m_monitor_index].mon_actualrenderedframes.load()) + (monitors[m_monitor_index].mon_interlace ? "i" : ""))); }); frameRateTimer->start(1000); }