Add Qt logo to About Qt... action

[quassel.git] / src / qtui / mainwin.cpp

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 8287ddd..0a3147f 100644 (file)
--- 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"
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 #include "mainwin.h"

-
+#include <QDir>

 #include "aboutdlg.h"
 #include "action.h"
 #include "actioncollection.h"
 #include "aboutdlg.h"
 #include "action.h"
 #include "actioncollection.h"


@@ -83,6 +83,8 @@ MainWin::MainWin(QWidget *parent)
     QApplication::setStyle(style);
   }
 
     QApplication::setStyle(style);
   }
 

+  QApplication::setQuitOnLastWindowClosed(false);
+

   setWindowTitle("Quassel IRC");
   setWindowIconText("Quassel IRC");
   updateIcon();
   setWindowTitle("Quassel IRC");
   setWindowIconText("Quassel IRC");
   updateIcon();


@@ -140,7 +142,6 @@ void MainWin::init() {
   setDisconnectedState();  // Disable menus and stuff
 
   show();
   setDisconnectedState();  // Disable menus and stuff
 
   show();

-

   showCoreConnectionDlg(true); // autoconnect if appropriate
 }
 
   showCoreConnectionDlg(true); // autoconnect if appropriate
 }
 


@@ -195,7 +196,7 @@ void MainWin::setupActions() {
   // Help
   coll->addAction("AboutQuassel", new Action(SmallIcon("quassel"), tr("&About Quassel..."), coll,
                                               this, SLOT(showAboutDlg())));
   // 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())));
                                          qApp, SLOT(aboutQt())));
   coll->addAction("DebugNetworkModel", new Action(SmallIcon("tools-report-bug"), tr("Debug &NetworkModel"), coll,
                                        this, SLOT(on_actionDebugNetworkModel_triggered())));


@@ -598,6 +599,7 @@ void MainWin::closeEvent(QCloseEvent *event) {
     event->ignore();
   } else {
     event->accept();
     event->ignore();
   } else {
     event->accept();

+    QApplication::quit();

   }
 }
 
   }
 }