From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Sun, 16 Nov 2008 02:31:40 +0000 (+0100)
Subject: Add Qt logo to About Qt... action
X-Git-Tag: 0.3.1~23
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=d1a868e19f07cd719f958ab5d401d3c4564c91b3;ds=sidebyside

Add Qt logo to About Qt... action
---

diff --git a/pics/README.qt-logo b/pics/README.qt-logo
new file mode 100644
index 00000000..dfbb3800
--- /dev/null
+++ b/pics/README.qt-logo
@@ -0,0 +1,3 @@
+The Qt logo in qt-logo.png has been copied from Qt's source distribution
+and is hence distributed under GPL.
+All rights for this logo remain with Qt Software/Nokia.
diff --git a/pics/pics.qrc b/pics/pics.qrc
index 4ae2ef45..b3aa5290 100644
--- a/pics/pics.qrc
+++ b/pics/pics.qrc
@@ -1,5 +1,6 @@
 <RCC>
   <qresource prefix="/pics" >
     <file>quassel-large.png</file>
+    <file>qt-logo.png</file>
   </qresource>
 </RCC>
diff --git a/pics/qt-logo.png b/pics/qt-logo.png
new file mode 100644
index 00000000..00931777
Binary files /dev/null and b/pics/qt-logo.png differ
diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index e45576e1..0a3147f6 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -18,7 +18,7 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "mainwin.h"
-
+#include <QDir>
 #include "aboutdlg.h"
 #include "action.h"
 #include "actioncollection.h"
@@ -142,7 +142,6 @@ void MainWin::init() {
   setDisconnectedState();  // Disable menus and stuff
 
   show();
-
   showCoreConnectionDlg(true); // autoconnect if appropriate
 }
 
@@ -197,7 +196,7 @@ void MainWin::setupActions() {
   // Help
   coll->addAction("AboutQuassel", new Action(SmallIcon("quassel"), tr("&About Quassel..."), coll,
                                               this, SLOT(showAboutDlg())));
-  coll->addAction("AboutQt", new Action(tr("About &Qt..."), coll,
+  coll->addAction("AboutQt", new Action(QIcon(":/pics/qt-logo.png"), tr("About &Qt..."), coll,
                                          qApp, SLOT(aboutQt())));
   coll->addAction("DebugNetworkModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &NetworkModel"), coll,
                                        this, SLOT(on_actionDebugNetworkModel_triggered())));