mirror of
https://github.com/dolphin-emu/dolphin.git
synced 2024-11-15 05:47:56 -07:00
Merge pull request #2833 from waddlesplash/dolphin-qt
DolphinQt: Rewrite 'About' dialog to match the new WX one.
This commit is contained in:
commit
4de2bd3be4
@ -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<Ui::DAboutDialog>();
|
||||
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),
|
||||
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()
|
||||
|
@ -2,14 +2,6 @@
|
||||
<ui version="4.0">
|
||||
<class>DAboutDialog</class>
|
||||
<widget class="QDialog" name="DAboutDialog">
|
||||
<property name="geometry">
|
||||
<rect>
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>504</width>
|
||||
<height>458</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Fixed">
|
||||
<horstretch>0</horstretch>
|
||||
@ -19,67 +11,142 @@
|
||||
<property name="windowTitle">
|
||||
<string>About Dolphin</string>
|
||||
</property>
|
||||
<layout class="QVBoxLayout" name="verticalLayout">
|
||||
<item>
|
||||
<widget class="QLabel" name="label">
|
||||
<layout class="QGridLayout" name="gridLayout">
|
||||
<property name="rightMargin">
|
||||
<number>22</number>
|
||||
</property>
|
||||
<property name="horizontalSpacing">
|
||||
<number>18</number>
|
||||
</property>
|
||||
<property name="verticalSpacing">
|
||||
<number>13</number>
|
||||
</property>
|
||||
<item row="5" column="1">
|
||||
<widget class="QLabel" name="lblLicenseAuthorsSupport">
|
||||
<property name="text">
|
||||
<string><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.</string>
|
||||
<string><a href="%1">License</a> | <a href="%2">Authors</a> | <a href="%3">Support</a></string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::RichText</enum>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item>
|
||||
<widget class="QDialogButtonBox" name="buttonBox">
|
||||
<property name="orientation">
|
||||
<enum>Qt::Horizontal</enum>
|
||||
<item row="2" column="1">
|
||||
<widget class="QLabel" name="lblGitInfo">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>7</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="standardButtons">
|
||||
<set>QDialogButtonBox::Ok</set>
|
||||
<property name="text">
|
||||
<string>Branch: %1
|
||||
Revision: %2
|
||||
Compiled: %3 @ %4</string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::PlainText</enum>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="0" rowspan="6">
|
||||
<widget class="QLabel" name="lblLogo">
|
||||
<property name="sizePolicy">
|
||||
<sizepolicy hsizetype="Fixed" vsizetype="Preferred">
|
||||
<horstretch>0</horstretch>
|
||||
<verstretch>0</verstretch>
|
||||
</sizepolicy>
|
||||
</property>
|
||||
<property name="margin">
|
||||
<number>16</number>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="3" column="1">
|
||||
<widget class="QLabel" name="lblChkForUpdates">
|
||||
<property name="text">
|
||||
<string>Check for updates: <a href="https://dolphin-emu.org/download">dolphin-emu.org/download</a></string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::RichText</enum>
|
||||
</property>
|
||||
<property name="openExternalLinks">
|
||||
<bool>true</bool>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="0" column="1">
|
||||
<widget class="QLabel" name="lblDolphin">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>31</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>Dolphin</string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::PlainText</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="6" column="0" colspan="2">
|
||||
<widget class="QLabel" name="lblFinePrint">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>7</pointsize>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string>© 2003-%1 Dolphin Team. “GameCube” and “Wii” are trademarks of Nintendo. Dolphin is not affiliated with Nintendo in any way.</string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::PlainText</enum>
|
||||
</property>
|
||||
<property name="alignment">
|
||||
<set>Qt::AlignCenter</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QLabel" name="lblGitRev">
|
||||
<property name="font">
|
||||
<font>
|
||||
<pointsize>9</pointsize>
|
||||
<weight>75</weight>
|
||||
<italic>false</italic>
|
||||
<bold>true</bold>
|
||||
</font>
|
||||
</property>
|
||||
<property name="text">
|
||||
<string notr="true"><git shortrev></string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::PlainText</enum>
|
||||
</property>
|
||||
<property name="textInteractionFlags">
|
||||
<set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="4" column="1">
|
||||
<widget class="QLabel" name="lblAbout">
|
||||
<property name="text">
|
||||
<string>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.</string>
|
||||
</property>
|
||||
<property name="textFormat">
|
||||
<enum>Qt::PlainText</enum>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
</layout>
|
||||
</widget>
|
||||
<resources/>
|
||||
<connections>
|
||||
<connection>
|
||||
<sender>buttonBox</sender>
|
||||
<signal>accepted()</signal>
|
||||
<receiver>DAboutDialog</receiver>
|
||||
<slot>accept()</slot>
|
||||
<hints>
|
||||
<hint type="sourcelabel">
|
||||
<x>248</x>
|
||||
<y>254</y>
|
||||
</hint>
|
||||
<hint type="destinationlabel">
|
||||
<x>157</x>
|
||||
<y>274</y>
|
||||
</hint>
|
||||
</hints>
|
||||
</connection>
|
||||
</connections>
|
||||
<connections/>
|
||||
</ui>
|
||||
|
@ -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();
|
||||
}
|
||||
|
||||
|
@ -39,6 +39,7 @@ public:
|
||||
MEMCARD,
|
||||
HOTKEYS,
|
||||
DOLPHIN_LOGO,
|
||||
DOLPHIN_LOGO_LARGE,
|
||||
BANNER_MISSING,
|
||||
NUM_ICONS
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user