From 4bd8de6a50af1c85a0ec5fa60d11d5831db63bcc Mon Sep 17 00:00:00 2001
From: David Rosca <nowrep@gmail.com>
Date: Sat, 24 Feb 2018 10:03:41 +0100
Subject: [PATCH] AboutDialog: Replace QTextBrowser with QLabel

---
 src/lib/other/aboutdialog.cpp |  7 +++---
 src/lib/other/aboutdialog.ui  | 42 ++++++++++++++++-------------------
 themes/chrome/main.css        |  2 +-
 themes/linux/main.css         |  2 +-
 themes/mac/main.css           |  2 +-
 themes/windows/main.css       |  2 +-
 6 files changed, 27 insertions(+), 30 deletions(-)

diff --git a/src/lib/other/aboutdialog.cpp b/src/lib/other/aboutdialog.cpp
index 9816893fd..d654e7bf3 100644
--- a/src/lib/other/aboutdialog.cpp
+++ b/src/lib/other/aboutdialog.cpp
@@ -45,7 +45,7 @@ AboutDialog::~AboutDialog()
 void AboutDialog::showAbout()
 {
     QString aboutHtml;
-    aboutHtml += "<center><div style='margin:20px;'>";
+    aboutHtml += "<div style='margin:0px 20px;'>";
     aboutHtml += tr("<p><b>Application version %1</b><br/>").arg(
 #ifdef FALKON_GIT_REVISION
                        QString("%1 (%2)").arg(Qz::VERSION, FALKON_GIT_REVISION)
@@ -57,6 +57,7 @@ void AboutDialog::showAbout()
     aboutHtml += QString("<p>&copy; %1 %2<br/>").arg(Qz::COPYRIGHT, Qz::AUTHOR);
     aboutHtml += QString("<a href=%1>%1</a></p>").arg(Qz::WWWADDRESS);
     aboutHtml += "<p>" + mApp->userAgentManager()->defaultUserAgent() + "</p>";
-    aboutHtml += "</div></center>";
-    ui->textBrowser->setHtml(aboutHtml);
+    aboutHtml += "</div>";
+    ui->textLabel->setText(aboutHtml);
+    setFixedHeight(sizeHint().height());
 }
diff --git a/src/lib/other/aboutdialog.ui b/src/lib/other/aboutdialog.ui
index 8db9dafc9..17a08feb6 100644
--- a/src/lib/other/aboutdialog.ui
+++ b/src/lib/other/aboutdialog.ui
@@ -25,40 +25,36 @@
     </widget>
    </item>
    <item>
-    <widget class="QTextBrowser" name="textBrowser">
-     <property name="frameShape">
-      <enum>QFrame::NoFrame</enum>
+    <widget class="QLabel" name="textLabel">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
      </property>
-     <property name="frameShadow">
-      <enum>QFrame::Plain</enum>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
      </property>
-     <property name="horizontalScrollBarPolicy">
-      <enum>Qt::ScrollBarAlwaysOff</enum>
+     <property name="wordWrap">
+      <bool>true</bool>
      </property>
      <property name="openExternalLinks">
       <bool>true</bool>
      </property>
-     <property name="openLinks">
-      <bool>true</bool>
+     <property name="textInteractionFlags">
+      <set>Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse</set>
      </property>
     </widget>
    </item>
    <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <property name="topMargin">
-      <number>5</number>
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-     <item>
-      <widget class="QDialogButtonBox" name="buttonBox">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="standardButtons">
-        <set>QDialogButtonBox::Close</set>
-       </property>
-      </widget>
-     </item>
-    </layout>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Close</set>
+     </property>
+    </widget>
    </item>
   </layout>
  </widget>
diff --git a/themes/chrome/main.css b/themes/chrome/main.css
index 378e1d041..cab6db3d8 100644
--- a/themes/chrome/main.css
+++ b/themes/chrome/main.css
@@ -287,7 +287,7 @@ AboutDialog #label
     background: palette(window);
 }
 
-AboutDialog #textBrowser
+AboutDialog #textLabel
 {
     background: palette(window);
 }
diff --git a/themes/linux/main.css b/themes/linux/main.css
index 204f769a6..9bf664f49 100644
--- a/themes/linux/main.css
+++ b/themes/linux/main.css
@@ -216,7 +216,7 @@ AboutDialog #label
     background: palette(window);
 }
 
-AboutDialog #textBrowser
+AboutDialog #textLabel
 {
     background: palette(window);
 }
diff --git a/themes/mac/main.css b/themes/mac/main.css
index d29001e46..39193ddc2 100644
--- a/themes/mac/main.css
+++ b/themes/mac/main.css
@@ -291,7 +291,7 @@ AboutDialog #label
     background: palette(window);
 }
 
-AboutDialog #textBrowser
+AboutDialog #textLabel
 {
     background: palette(window);
 }
diff --git a/themes/windows/main.css b/themes/windows/main.css
index 87c0999a7..4a942894d 100644
--- a/themes/windows/main.css
+++ b/themes/windows/main.css
@@ -378,7 +378,7 @@ AboutDialog #label
     background: palette(window);
 }
 
-AboutDialog #textBrowser
+AboutDialog #textLabel
 {
     background: palette(window);
 }