X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmainwin.cpp;h=e977c6f741b35e0bcc38e67a49ddf31c89215340;hb=30c2dcaf2c892b14e7072057ced4d2fdaaceb9eb;hp=27661b47de438f53b5e095436bd13c228a5fb85b;hpb=3dc3a2e7f8cfb2387bf34b38dd6efadbd2ae4b1c;p=quassel.git

diff --git a/src/qtui/mainwin.cpp b/src/qtui/mainwin.cpp
index 27661b47..e977c6f7 100644
--- a/src/qtui/mainwin.cpp
+++ b/src/qtui/mainwin.cpp
@@ -21,6 +21,7 @@
 
 #include "mainwin.h"
 
+#include "aboutdlg.h"
 #include "chatwidget.h"
 #include "bufferview.h"
 #include "chatline-old.h"
@@ -104,13 +105,17 @@ void MainWin::init() {
   ui.bufferWidget->setSelectionModel(Client::bufferModel()->standardSelectionModel());
 
 #ifdef SPUTDEV
-  showSettingsDlg();
+  //showSettingsDlg();
+  //showAboutDlg();
 #endif
 
 }
 
 MainWin::~MainWin() {
-
+  QtUiSettings s;
+  s.setValue("MainWinSize", size());
+  s.setValue("MainWinPos", pos());
+  s.setValue("MainWinState", saveState());
 }
 
 void MainWin::setupMenus() {
@@ -120,6 +125,7 @@ void MainWin::setupMenus() {
   //connect(ui.actionNetworkList, SIGNAL(triggered()), this, SLOT(showServerList()));
   connect(ui.actionSettingsDlg, SIGNAL(triggered()), this, SLOT(showSettingsDlg()));
   connect(ui.actionDebug_Console, SIGNAL(triggered()), this, SLOT(showDebugConsole()));
+  connect(ui.actionAboutQuassel, SIGNAL(triggered()), this, SLOT(showAboutDlg()));
   connect(ui.actionAboutQt, SIGNAL(triggered()), QApplication::instance(), SLOT(aboutQt()));
 
   actionEditNetworks = new QAction(QIcon(":/22x22/actions/configure"), tr("Edit &Networks..."), this);
@@ -332,8 +338,12 @@ void MainWin::showDebugConsole() {
   debugConsole->show();
 }
 
-void MainWin::closeEvent(QCloseEvent *event)
-{
+void MainWin::showAboutDlg() {
+  AboutDlg dlg(this);
+  dlg.exec();
+}
+
+void MainWin::closeEvent(QCloseEvent *event) {
   QtUiSettings s;
   if(s.value("UseSystemTrayIcon").toBool() && s.value("MinimizeOnClose").toBool()) {
     toggleVisibility();
@@ -341,13 +351,6 @@ void MainWin::closeEvent(QCloseEvent *event)
   } else {
     event->accept();
   }
-  //if (userReallyWantsToQuit()) {
-  s.setValue("MainWinSize", size());
-  s.setValue("MainWinPos", pos());
-  s.setValue("MainWinState", saveState());
-  //} else {
-  //  event->ignore();
-  //}
 }
 
 void MainWin::systrayActivated( QSystemTrayIcon::ActivationReason activationReason) {