From 38e26ec3aadcfab41492fff2a5b2ad455e0ce3a8 Mon Sep 17 00:00:00 2001
From: Linda Lapinlampi <linda@lindalap.fi>
Date: Sat, 31 Dec 2022 01:14:31 +0000
Subject: [PATCH] ui/aboutdialog: Use Qt::TextBrowserInteraction

There was no desirable reason to have TextSelectableByKeyboard for
links in the "About Doomseeker" window. At worst, this would start a
text selection first on an URI, then pressing the Enter key would close
the window instead of opening the user's mail user agent (MUA). (This
may still occur, but the visual hint of tab selector is now less
suspectible to error and misunderstanding.)

Qt::TextBrowserInteraction defaults to TextSelectableByMouse |
LinksAccessibleByMouse | LinksAccessibleByKeyboard. This commit makes
use of that for the three links in this window, which will behave much
more similarly compared to the fourth IP2C Database URL in the window.

See: #4070
---
 src/core/gui/aboutdialog.ui | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/core/gui/aboutdialog.ui b/src/core/gui/aboutdialog.ui
index a948c900..2da8f0da 100644
--- a/src/core/gui/aboutdialog.ui
+++ b/src/core/gui/aboutdialog.ui
@@ -181,7 +181,7 @@
           <bool>true</bool>
          </property>
          <property name="textInteractionFlags">
-          <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+          <set>Qt::TextBrowserInteraction</set>
          </property>
         </widget>
        </item>
@@ -252,7 +252,7 @@
             <bool>true</bool>
            </property>
            <property name="textInteractionFlags">
-            <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+            <set>Qt::TextBrowserInteraction</set>
            </property>
           </widget>
          </item>
@@ -268,7 +268,7 @@
             <bool>true</bool>
            </property>
            <property name="textInteractionFlags">
-            <set>Qt::LinksAccessibleByKeyboard|Qt::LinksAccessibleByMouse|Qt::TextBrowserInteraction|Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+            <set>Qt::TextBrowserInteraction</set>
            </property>
           </widget>
          </item>
-- 
2.39.0

From 1c275454132f6c00f2c64a9157a6a44509a548a7 Mon Sep 17 00:00:00 2001
From: Linda Lapinlampi <linda@lindalap.fi>
Date: Sat, 31 Dec 2022 01:49:49 +0000
Subject: [PATCH 2/2] ui/aboutdialog: Merge name and email address labels

The email address is now part of the maintainer name label, for better
(or worse) mouse text selection.

This is partly experimental.

See: #4070
---
 src/core/gui/aboutdialog.ui | 34 ++++------------------------------
 1 file changed, 4 insertions(+), 30 deletions(-)

diff --git a/src/core/gui/aboutdialog.ui b/src/core/gui/aboutdialog.ui
index 2da8f0da..8c9ba8c4 100644
--- a/src/core/gui/aboutdialog.ui
+++ b/src/core/gui/aboutdialog.ui
@@ -226,46 +226,20 @@
        </item>
        <item>
         <layout class="QGridLayout" name="gridLayout">
-         <item row="1" column="0">
-          <widget class="QLabel" name="label_9">
-           <property name="text">
-            <string>Zalewa:</string>
-           </property>
-          </widget>
-         </item>
          <item row="0" column="0">
           <widget class="QLabel" name="label_11">
            <property name="text">
-            <string>Blzut3:</string>
-           </property>
-          </widget>
-         </item>
-         <item row="0" column="1">
-          <widget class="QLabel" name="label_10">
-           <property name="text">
-            <string>&lt;a href=&quot;mailto:admin@maniacsvault.net&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;admin@maniacsvault.net&lt;/span&gt;&lt;/a&gt;</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-           <property name="openExternalLinks">
-            <bool>true</bool>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Blzut3 &amp;lt;&lt;a href=&quot;mailto:admin@maniacsvault.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;admin@maniacsvault.com&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="textInteractionFlags">
             <set>Qt::TextBrowserInteraction</set>
            </property>
           </widget>
          </item>
-         <item row="1" column="1">
-          <widget class="QLabel" name="label_12">
+         <item row="1" column="0">
+          <widget class="QLabel" name="label_9">
            <property name="text">
-            <string>&lt;a href=&quot;mailto:zalewapl@gmail.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;zalewapl@gmail.com&lt;/span&gt;&lt;/a&gt;</string>
-           </property>
-           <property name="alignment">
-            <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-           </property>
-           <property name="openExternalLinks">
-            <bool>true</bool>
+            <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Zalewa &amp;lt;&lt;a href=&quot;mailto:zalewapl@gmail.com&quot;&gt;&lt;span style=&quot; text-decoration: underline; color:#0000ff;&quot;&gt;zalewapl@gmail.com&lt;/span&gt;&lt;/a&gt;&amp;gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
            </property>
            <property name="textInteractionFlags">
             <set>Qt::TextBrowserInteraction</set>
-- 
2.39.0