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

Merge remote-tracking branch 'upstream/master' into fullscreenstaticonqt

Browse Source
This commit is contained in:
Cacodemon345
2022-02-16 16:16:04 +06:00
parent 9e0ca23060 6a6187e104
commit e90ad59074
10 changed files with 87 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/qt/qt_mainwindow.cpp
View File

@@ -1434,10 +1434,10 @@ 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("86box.net", QMessageBox::ButtonRole::HelpRole);
auto webSiteButton = msgBox.addButton(EMU_SITE_W, QMessageBox::ButtonRole::HelpRole);
webSiteButton->connect(webSiteButton, &QPushButton::released, []()
{
QDesktopServices::openUrl(QUrl("https://86box.net/"));
QDesktopServices::openUrl(QUrl("https://" EMU_SITE));
});
#ifdef RELEASE_BUILD
msgBox.setIconPixmap(QIcon(":/settings/win/icons/86Box-green.ico").pixmap(32, 32));
@@ -1454,7 +1454,7 @@ void MainWindow::on_actionAbout_86Box_triggered()
void MainWindow::on_actionDocumentation_triggered()
{
QDesktopServices::openUrl(QUrl("https://86box.readthedocs.io"));
QDesktopServices::openUrl(QUrl(EMU_DOCS_URL));
}
void MainWindow::on_actionCGA_PCjr_Tandy_EGA_S_VGA_overscan_triggered() {