qtui: Fix icons in the AboutDlg

With the icon reorganization, no aliases are created inside resource
files anymore. Explicitly put the Breeze and Oxygen Quassel pixmaps
for the AboutDlg into pics/ and add it to the :pics/ resource.

Remove pics/quassel.png which was shipped, but not actually used
due to it missing from the resource file.

diff --git a/pics/pics.qrc b/pics/pics.qrc
index da6473d..80bbbbb 100644 (file)
--- a/pics/pics.qrc
+++ b/pics/pics.qrc
@@ -1,8 +1,10 @@
 <RCC>
   <qresource prefix="/pics">
     <file>kde-vdg.png</file>
+    <file>quassel-64.svg</file>
     <file>quassel-eye.png</file>
     <file>quassel-logo.png</file>
+    <file>quassel-oxygen-32.png</file>
     <file>qt-logo.png</file>
     <file>qt-logo-32.png</file>
   </qresource>

diff --git a/pics/quassel-64.svg b/pics/quassel-64.svg
new file mode 100644 (file)
index 0000000..bd6666e
--- /dev/null
+++ b/pics/quassel-64.svg
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 108 108" version="1.1" width="64px" height="64px">
+  <defs>
+    <linearGradient id="gradientBackground" x2="5" gradientUnits="userSpaceOnUse" y2="103">
+      <stop id="gradientBackgroundStart" stop-color="#2883f2" offset="0"/>
+      <stop id="gradientBackgroundEnd" stop-color="#0c56b2" offset="1"/>
+    </linearGradient>
+    <linearGradient id="gradientLongShadow" y2="5" gradientUnits="userSpaceOnUse" y1="5" x2="103" x1="5">
+      <stop stop-color="#1a237e" stop-opacity=".25" offset="0"/>
+      <stop stop-opacity="0" offset="1"/>
+    </linearGradient>
+    <radialGradient id="gradientFinish" gradientUnits="userSpaceOnUse" cy="0" cx="0" r="108">
+      <stop stop-color="#fff" stop-opacity=".1" offset="0"/>
+      <stop stop-color="#fff" stop-opacity="0" offset="1"/>
+    </radialGradient>
+    <filter id="blurShadow" color-interpolation-filters="linearRGB">
+      <feGaussianBlur stdDeviation="2"/>
+    </filter>
+  </defs>
+  <path fill="url(#gradientBackground)" d="M5,5 103,5 103,79.5 81,79.5 81,103 54,79.5 5,79.5 Z"/>
+  <path fill="#ffffff" fill-opacity=".2" d="M5,5 103,5 103,6 5,6 Z" />
+  <path fill="#212121" fill-opacity=".2" d="M5,78.5 54,78.5 81,102 81,78.5 103,78.5 103,79.5 81,79.5 81,103 54,79.5 5,79.5 Z"/>
+  <path fill="url(#gradientLongShadow)" d="M34.91 61.09 a 27,27 0 0,1 38.18,-38.18 L 103,52.82 103,79.5 81,79.5 81,103 54,79.5 53.32,79.5" />
+  <path filter="url(#blurShadow)" fill-opacity=".25" fill="#000000" d="M27 42a 27,27 0 1,0 54,0 h-7 a20,20 0 0,1 -40,0 a20,20 0 0,1 40,0 h7 a 27,27 0 1,0 -54,0 M57.34 50.84 a 5.5,5.5 0 1,0 11,0 a 5.5,5.5 0 1,0 -11,0" />
+  <path fill="#ffffff" d="M27 42a 27,27 0 1,0 54,0 h-7 a20,20 0 0,1 -40,0 a20,20 0 0,1 40,0 h7 a 27,27 0 1,0 -54,0 M57.34 50.84 a 5.5,5.5 0 1,0 11,0 a 5.5,5.5 0 1,0 -11,0" />
+  <path fill="#e5e5e5" d="M34 41.5 v0.5 a 20,20 0 0,1 40,0 v-0.5 a 20,20 0 1,0 -40,0 h-7 v0.5 a 27,27 0 1,0 54,0 v-0.5 a 27,27 0 0,1 -54,0 M57.34 50.34 v0.5 a 5.5,5.5 0 1,0 11,0 v-0.5 a 5.5,5.5 0 0,1 -11,0" />
+  <path fill="url(#gradientFinish)" d="M5,5 103,5 103,79.5 81,79.5 81,103 54,79.5 5,79.5 Z"/>
+</svg>

diff --git a/pics/quassel-oxygen-32.png b/pics/quassel-oxygen-32.png
new file mode 100644 (file)
index 0000000..0b21525
Binary files /dev/null and b/pics/quassel-oxygen-32.png differ

diff --git a/pics/quassel.png b/pics/quassel.png
deleted file mode 100644 (file)
index c6566e4..0000000
Binary files a/pics/quassel.png and /dev/null differ

diff --git a/src/qtui/aboutdlg.cpp b/src/qtui/aboutdlg.cpp
index 6b775b7..02f2a6a 100644 (file)
--- a/src/qtui/aboutdlg.cpp
+++ b/src/qtui/aboutdlg.cpp
@@ -33,7 +33,7 @@ AboutDlg::AboutDlg(QWidget *parent)
     AboutData::setQuasselPersons(_aboutData);
 
     ui.setupUi(this);
-    ui.quasselLogo->setPixmap(QIcon(":/icons/quassel-64.png").pixmap(64)); // don't let the icon theme affect our logo here
+    ui.quasselLogo->setPixmap(QPixmap{":/pics/quassel-64.svg"});  // don't let the icon theme affect our logo here
 
     ui.versionLabel->setText(QString(tr("<b>Version:</b> %1<br><b>Version date:</b> %2<br><b>Protocol version:</b> %3"))
         .arg(Quassel::buildInfo().fancyVersionString)
@@ -101,9 +101,9 @@ QString AboutDlg::thanksTo() const
                                  "<td><b>John \"nox\" Hand</b></td></tr>"
               "<tr><td><i>" + tr("for the original Quassel logo - The All-Seeing Eye") + "</i></td></tr>"
               "<tr/>"
-              "<tr><td rowspan='2' valign='middle'><img src=':/icons/quassel-32.png'></td>"
+              "<tr><td rowspan='2' valign='middle'><img src=':/pics/quassel-oxygen-32.png'></td>"
                                  "<td><b>Nuno Pinheiro</b></td></tr>"
-              "<tr><td><i>" + tr("for the current Quassel logo") + "</i></td></tr>"
+              "<tr><td><i>" + tr("for the Oxygen Quassel logo") + "</i></td></tr>"
               "<tr/>"
               "<tr><td rowspan='2' valign='middle'><img src=':/pics/kde-vdg.png'></td>"
                                  "<td><b><a href='https://vdesign.kde.org'>The KDE Visual Design Group</a></b></td></tr>"