From 840ac231d3c4fcb0d84931ffb906a0e83da306e2 Mon Sep 17 00:00:00 2001
From: Alison Watson <marrub.xz@gmail.com>
Date: Fri, 14 Jun 2019 13:23:16 -0400
Subject: [PATCH] tycho: reformat about window

---
 source/tycho/cc_source/menu.cc | 11 ++++++--
 source/tycho/ui/about.ui       | 47 ++++++++++++----------------------
 2 files changed, 26 insertions(+), 32 deletions(-)

diff --git a/source/tycho/cc_source/menu.cc b/source/tycho/cc_source/menu.cc
index 2c3e908..5419421 100644
--- a/source/tycho/cc_source/menu.cc
+++ b/source/tycho/cc_source/menu.cc
@@ -61,8 +61,15 @@ void Menu::openAbout()
 
    ui.setupUi(&dlg);
 
-   ui.labelVer->setText(tr(tychoVersion()));
-   ui.labelAuthors->setText(tr(tychoAuthors()).replace(':', '\n'));
+   auto text = ui.labelText->text();
+
+   text.replace("AUTHORS",
+                tr(tychoAuthors()).replace(':', ", ").toHtmlEscaped());
+   text.replace("HOMEPAGE", tr(tychoHomepage()));
+   text.replace("REPOSITORY", tr(tychoRepository()));
+   text.replace("VERSION", tr(tychoVersion()));
+
+   ui.labelText->setText(text);
 
    connect(ui.btnLicense, &QPushButton::clicked, this, [&](){
       openLicense(&dlg);
diff --git a/source/tycho/ui/about.ui b/source/tycho/ui/about.ui
index 5d52f72..68b6000 100644
--- a/source/tycho/ui/about.ui
+++ b/source/tycho/ui/about.ui
@@ -10,7 +10,7 @@
     <x>0</x>
     <y>0</y>
     <width>675</width>
-    <height>287</height>
+    <height>305</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -24,7 +24,7 @@
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
    <item>
-    <widget class="QLabel" name="label">
+    <widget class="QLabel" name="labelImage">
      <property name="text">
       <string>&lt;img src=&quot;qrc:///tycho/misc/tycho2.png&quot;/&gt;</string>
      </property>
@@ -33,38 +33,25 @@
    <item>
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
-      <widget class="QLabel" name="label_2">
+      <widget class="QLabel" name="labelText">
        <property name="text">
-        <string>&lt;h1&gt;Tycho&lt;/h1&gt;</string>
+        <string>&lt;h1&gt;Tycho&lt;/h1&gt;
+&lt;h4&gt;VERSION&lt;/h4&gt;
+&lt;p&gt;Tycho is a map editor for Marathon 2 and Marathon Infinity.&lt;/p&gt;
+&lt;p&gt;Marathon is Copyright © Bungie Software.&lt;/p&gt;
+&lt;p&gt;Tycho is public domain software under the CC0 license.&lt;/p&gt;
+&lt;p&gt;Home: &lt;a href=&quot;HOMEPAGE&quot;&gt;HOMEPAGE&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;Source code: &lt;a href=&quot;REPOSITORY&quot;&gt;REPOSITORY&lt;/a&gt;&lt;/p&gt;
+&lt;p&gt;Made by AUTHORS&lt;/p&gt;</string>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelVer">
-       <property name="text">
-        <string>VERSION NUMBER</string>
+       <property name="textFormat">
+        <enum>Qt::RichText</enum>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_4">
-       <property name="text">
-        <string>Tycho is a map editor for Marathon 2 and Marathon Infinity.</string>
+       <property name="openExternalLinks">
+        <bool>true</bool>
        </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="label_5">
-       <property name="text">
-        <string>Marathon is Copyright © Bungie Software.
-Tycho is public domain software under the CC0 license.</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="labelAuthors">
-       <property name="text">
-        <string>AUTHORS</string>
+       <property name="textInteractionFlags">
+        <set>Qt::TextBrowserInteraction</set>
        </property>
       </widget>
      </item>