From 0c1671973ce209b8d8e9cda771200cdacd1307bb Mon Sep 17 00:00:00 2001 From: waddlesplash Date: Thu, 10 Sep 2015 23:02:47 -0400 Subject: [PATCH] DolphinQt: Rewrite About dialog to match the new DolphinWX one. --- Source/Core/DolphinQt/AboutDialog.cpp | 14 +- Source/Core/DolphinQt/AboutDialog.ui | 175 +++++++++++++++------- Source/Core/DolphinQt/Utils/Resources.cpp | 1 + Source/Core/DolphinQt/Utils/Resources.h | 1 + 4 files changed, 134 insertions(+), 57 deletions(-) diff --git a/Source/Core/DolphinQt/AboutDialog.cpp b/Source/Core/DolphinQt/AboutDialog.cpp index 55f18377cc..6059e0db1a 100644 --- a/Source/Core/DolphinQt/AboutDialog.cpp +++ b/Source/Core/DolphinQt/AboutDialog.cpp @@ -11,6 +11,7 @@ #include "Common/Common.h" #include "DolphinQt/AboutDialog.h" +#include "DolphinQt/Utils/Resources.h" #include "DolphinQt/Utils/Utils.h" DAboutDialog::DAboutDialog(QWidget* parent_widget) @@ -18,12 +19,19 @@ DAboutDialog::DAboutDialog(QWidget* parent_widget) { setWindowModality(Qt::WindowModal); setAttribute(Qt::WA_DeleteOnClose); + setWindowFlags(windowFlags() & ~Qt::WindowContextHelpButtonHint); m_ui = std::make_unique(); m_ui->setupUi(this); - m_ui->label->setText(m_ui->label->text().arg(SC(scm_desc_str), - SL("2014"), SC(scm_branch_str), SC(scm_rev_git_str), - SL(__DATE__), SL(__TIME__))); + m_ui->lblGitRev->setText(SC(scm_desc_str)); + m_ui->lblGitInfo->setText(m_ui->lblGitInfo->text().arg(SC(scm_branch_str), SC(scm_rev_git_str), + SL(__DATE__), SL(__TIME__))); + m_ui->lblFinePrint->setText(m_ui->lblFinePrint->text().arg(SL("2015"))); + m_ui->lblLicenseAuthorsSupport->setText(m_ui->lblLicenseAuthorsSupport->text() + .arg(SL("https://github.com/dolphin-emu/dolphin/blob/master/license.txt")) + .arg(SL("https://github.com/dolphin-emu/dolphin/graphs/contributors")) + .arg(SL("https://forums.dolphin-emu.org/"))); + m_ui->lblLogo->setPixmap(Resources::GetPixmap(Resources::DOLPHIN_LOGO_LARGE)); } DAboutDialog::~DAboutDialog() diff --git a/Source/Core/DolphinQt/AboutDialog.ui b/Source/Core/DolphinQt/AboutDialog.ui index df77fa4686..d2fad473bc 100644 --- a/Source/Core/DolphinQt/AboutDialog.ui +++ b/Source/Core/DolphinQt/AboutDialog.ui @@ -2,14 +2,6 @@ DAboutDialog - - - 0 - 0 - 504 - 458 - - 0 @@ -19,67 +11,142 @@ About Dolphin - - - + + + 22 + + + 18 + + + 13 + + + - <big><b>Dolphin</b></big> %1<br> -© 2003-%2 Dolphin Team<br> -Branch: %3<br> -Revision: %4<br> -Compiled: %5 @ %6<br> -Dolphin is a GameCube/Wii emulator, which was originally written by<br>F|RES and ector. Today Dolphin is an open source project with many<br> contributors, too many to list. If interested, just go check out <a href="https://github.com/dolphin-emu/dolphin">the project<br>page</a>.<br> -<br> -Special thanks to Bushing, Costis, CrowTRobo, Marcan, Segher, Titanik,<br>or9, and Hotquik for their reverse engineering and docs/demos.<br> -<br> -Big thanks to Gilles Mouchard whose Microlib PPC emulator gave our<br> development a kickstart.<br> -<br> -Thanks to Frank Wille for his PowerPC disassembler, which or9 and we<br> modified to include Gekko specifics.<br> -<br> -Thanks to hcs/destop for their GC ADPCM decoder.<br> -<br> -We are not affiliated with Nintendo in any way. GameCube and Wii are<br> trademarks of Nintendo. This emulator should not be used to play games<br>you do not legally own. + <a href="%1">License</a> | <a href="%2">Authors</a> | <a href="%3">Support</a> Qt::RichText - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - true - - - - Qt::Horizontal + + + + + 7 + - - QDialogButtonBox::Ok + + Branch: %1 +Revision: %2 +Compiled: %3 @ %4 + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + + 0 + 0 + + + + 16 + + + + + + + Check for updates: <a href="https://dolphin-emu.org/download">dolphin-emu.org/download</a> + + + Qt::RichText + + + true + + + + + + + + 31 + + + + Dolphin + + + Qt::PlainText + + + + + + + + 7 + + + + © 2003-%1 Dolphin Team. “GameCube” and “Wii” are trademarks of Nintendo. Dolphin is not affiliated with Nintendo in any way. + + + Qt::PlainText + + + Qt::AlignCenter + + + + + + + + 9 + 75 + false + true + + + + <git shortrev> + + + Qt::PlainText + + + Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse + + + + + + + Dolphin is a free and open-source GameCube and Wii emulator. +This software should not be used to play games you do not legally own. + + + Qt::PlainText - - - buttonBox - accepted() - DAboutDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - + diff --git a/Source/Core/DolphinQt/Utils/Resources.cpp b/Source/Core/DolphinQt/Utils/Resources.cpp index 25a9c4abfd..58024d7646 100644 --- a/Source/Core/DolphinQt/Utils/Resources.cpp +++ b/Source/Core/DolphinQt/Utils/Resources.cpp @@ -55,6 +55,7 @@ void Resources::Init() m_pixmaps.resize(NUM_ICONS); m_pixmaps[DOLPHIN_LOGO].load(GIFN("Dolphin")); + m_pixmaps[DOLPHIN_LOGO_LARGE].load(GIFN("dolphin_logo")); UpdatePixmaps(); } diff --git a/Source/Core/DolphinQt/Utils/Resources.h b/Source/Core/DolphinQt/Utils/Resources.h index 530f365e1f..66b4907473 100644 --- a/Source/Core/DolphinQt/Utils/Resources.h +++ b/Source/Core/DolphinQt/Utils/Resources.h @@ -41,6 +41,7 @@ public: MEMCARD, HOTKEYS, DOLPHIN_LOGO, + DOLPHIN_LOGO_LARGE, BANNER_MISSING, NUM_ICONS };