Merge pull request #2833 from waddlesplash/dolphin-qt

DolphinQt: Rewrite 'About' dialog to match the new WX one.

4 files changed, 133 insertions, 56 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<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),
-	    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 @@
 <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>&lt;big&gt;&lt;b&gt;Dolphin&lt;/b&gt;&lt;/big&gt; %1&lt;br&gt;
-© 2003-%2 Dolphin Team&lt;br&gt;
-Branch: %3&lt;br&gt;
-Revision: %4&lt;br&gt;
-Compiled: %5 @ %6&lt;br&gt;
-Dolphin is a GameCube/Wii emulator, which was originally written by&lt;br&gt;F|RES and ector. Today Dolphin is an open source project with many&lt;br&gt; contributors, too many to list. If interested, just go check out &lt;a href=&quot;https://github.com/dolphin-emu/dolphin&quot;&gt;the project&lt;br&gt;page&lt;/a&gt;.&lt;br&gt;
-&lt;br&gt;
-Special thanks to Bushing, Costis, CrowTRobo, Marcan, Segher, Titanik,&lt;br&gt;or9, and Hotquik for their reverse engineering and docs/demos.&lt;br&gt;
-&lt;br&gt;
-Big thanks to Gilles Mouchard whose Microlib PPC emulator gave our&lt;br&gt; development a kickstart.&lt;br&gt;
-&lt;br&gt;
-Thanks to Frank Wille for his PowerPC disassembler, which or9 and we&lt;br&gt; modified to include Gekko specifics.&lt;br&gt;
-&lt;br&gt;
-Thanks to hcs/destop for their GC ADPCM decoder.&lt;br&gt;
-&lt;br&gt;
-We are not affiliated with Nintendo in any way. GameCube and Wii are&lt;br&gt; trademarks of Nintendo. This emulator should not be used to play games&lt;br&gt;you do not legally own.</string>
+      <string>&lt;a href=&quot;%1&quot;&gt;License&lt;/a&gt; | &lt;a href=&quot;%2&quot;&gt;Authors&lt;/a&gt; | &lt;a href=&quot;%3&quot;&gt;Support&lt;/a&gt;</string>
      </property>
      <property name="textFormat">
       <enum>Qt::RichText</enum>
      </property>
-     <property name="alignment">
-      <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+     <property name="openExternalLinks">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item row="2" column="1">
+    <widget class="QLabel" name="lblGitInfo">
+     <property name="font">
+      <font>
+       <pointsize>7</pointsize>
+      </font>
+     </property>
+     <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: &lt;a href=&quot;https://dolphin-emu.org/download&quot;&gt;dolphin-emu.org/download&lt;/a&gt;</string>
+     </property>
+     <property name="textFormat">
+      <enum>Qt::RichText</enum>
      </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="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="standardButtons">
-      <set>QDialogButtonBox::Ok</set>
+     <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">&lt;git shortrev&gt;</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>
diff --git a/Source/Core/DolphinQt/Utils/Resources.cpp b/Source/Core/DolphinQt/Utils/Resources.cpp
index 43981954cc..4450e72dfb 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 e6c7852424..c95dbe6b25 100644
--- a/Source/Core/DolphinQt/Utils/Resources.h
+++ b/Source/Core/DolphinQt/Utils/Resources.h
@@ -39,6 +39,7 @@ public:
 		MEMCARD,
 		HOTKEYS,
 		DOLPHIN_LOGO,
+		DOLPHIN_LOGO_LARGE,
 		BANNER_MISSING,
 		NUM_ICONS
 	};