From 6a6187e1045184de602096ea9e661e68cbc51d33 Mon Sep 17 00:00:00 2001 From: OBattler Date: Wed, 16 Feb 2022 11:14:38 +0100 Subject: [PATCH 1/4] Fixed the website button in the QT About box. --- src/qt/qt_mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index 6d7fb6592..d78316cec 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -1433,7 +1433,7 @@ void MainWindow::on_actionAbout_86Box_triggered() msgBox.setInformativeText(tr("An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, Tiseno100, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information.")); msgBox.setWindowTitle("About 86Box"); msgBox.addButton("OK", QMessageBox::ButtonRole::AcceptRole); - auto webSiteButton = msgBox.addButton(EMU_SITE, QMessageBox::ButtonRole::HelpRole); + auto webSiteButton = msgBox.addButton(EMU_SITE_W, QMessageBox::ButtonRole::HelpRole); webSiteButton->connect(webSiteButton, &QPushButton::released, []() { QDesktopServices::openUrl(QUrl("https://" EMU_SITE)); From 9b0c50f91eabdb219586ed767e8ce4edb21cac5c Mon Sep 17 00:00:00 2001 From: OBattler Date: Wed, 16 Feb 2022 11:18:18 +0100 Subject: [PATCH 2/4] Fixed the fix. --- src/qt/qt_mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index d78316cec..e1e3e6c3f 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -1433,7 +1433,7 @@ void MainWindow::on_actionAbout_86Box_triggered() msgBox.setInformativeText(tr("An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, Tiseno100, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information.")); msgBox.setWindowTitle("About 86Box"); msgBox.addButton("OK", QMessageBox::ButtonRole::AcceptRole); - auto webSiteButton = msgBox.addButton(EMU_SITE_W, QMessageBox::ButtonRole::HelpRole); + auto webSiteButton = msgBox.addButton(QString::fromWCharArray(EMU_SITE_W), QMessageBox::ButtonRole::HelpRole); webSiteButton->connect(webSiteButton, &QPushButton::released, []() { QDesktopServices::openUrl(QUrl("https://" EMU_SITE)); From e906886ddccd57b0a9b00906cb8065c01d18fcb2 Mon Sep 17 00:00:00 2001 From: OBattler Date: Wed, 16 Feb 2022 11:19:54 +0100 Subject: [PATCH 3/4] And fixed Win32 as well. --- src/win/win_about.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/win/win_about.c b/src/win/win_about.c index d3d5157c2..c508c7b3c 100644 --- a/src/win/win_about.c +++ b/src/win/win_about.c @@ -39,7 +39,7 @@ AboutDialogCreate(HWND hwnd) int i; TASKDIALOGCONFIG tdconfig = {0}; TASKDIALOG_BUTTON tdbuttons[] = { - {IDOK, EMU_SITE}, + {IDOK, EMU_SITE_W}, {IDCANCEL, MAKEINTRESOURCE(IDS_2127)} }; From ac4a6ccb9c92cdd1a3be350af3382c0520be0e0b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?David=20Hrdli=C4=8Dka?= Date: Wed, 16 Feb 2022 11:34:04 +0100 Subject: [PATCH 4/4] Reverted the fix for the Qt about dialog as it wasn't broken in the first place --- src/qt/qt_mainwindow.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/qt/qt_mainwindow.cpp b/src/qt/qt_mainwindow.cpp index e1e3e6c3f..6d7fb6592 100644 --- a/src/qt/qt_mainwindow.cpp +++ b/src/qt/qt_mainwindow.cpp @@ -1433,7 +1433,7 @@ void MainWindow::on_actionAbout_86Box_triggered() msgBox.setInformativeText(tr("An emulator of old computers\n\nAuthors: Sarah Walker, Miran Grca, Fred N. van Kempen (waltje), SA1988, Tiseno100, reenigne, leilei, JohnElliott, greatpsycho, and others.\n\nReleased under the GNU General Public License version 2 or later. See LICENSE for more information.")); msgBox.setWindowTitle("About 86Box"); msgBox.addButton("OK", QMessageBox::ButtonRole::AcceptRole); - auto webSiteButton = msgBox.addButton(QString::fromWCharArray(EMU_SITE_W), QMessageBox::ButtonRole::HelpRole); + auto webSiteButton = msgBox.addButton(EMU_SITE, QMessageBox::ButtonRole::HelpRole); webSiteButton->connect(webSiteButton, &QPushButton::released, []() { QDesktopServices::openUrl(QUrl("https://" EMU_SITE));