[QTerm-cvs] SF.net SVN: qterm:[1127] trunk/qterm-qt4/src

[<hep...@us...>]

Revision: 1127
          http://qterm.svn.sourceforge.net/qterm/?rev=1127&view=rev
Author:   hephooey
Date:     2010-01-09 07:35:07 +0000 (Sat, 09 Jan 2010)

Log Message:
-----------
Split exitQTerm, still some duplicated code left

Modified Paths:
--------------
    trunk/qterm-qt4/src/qtermframe.cpp
    trunk/qterm-qt4/src/qtermframe.h

Modified: trunk/qterm-qt4/src/qtermframe.cpp
===================================================================
--- trunk/qterm-qt4/src/qtermframe.cpp	2010-01-09 06:37:34 UTC (rev 1126)
+++ trunk/qterm-qt4/src/qtermframe.cpp	2010-01-09 07:35:07 UTC (rev 1127)
@@ -246,7 +246,7 @@
     }
 }
 
-void Frame::exitQTerm()
+void Frame::confirmExitQTerm()
 {
     QList<QVariant> sites;
     QList<QMdiSubWindow *> windows = m_MdiArea->subWindowList();
@@ -264,7 +264,21 @@
             return;
         }
     }
+    exitQTerm();
+}
 
+void Frame::exitQTerm()
+{
+    QList<QVariant> sites;
+    QList<QMdiSubWindow *> windows = m_MdiArea->subWindowList();
+    QStringList titleList;
+    for (int i = 0; i < int(windows.count()); ++i) {
+        if ((qobject_cast<Window *>(windows.at(i)->widget()))->isConnected()) {
+            titleList << windows.at(i)->windowTitle();
+            sites << qobject_cast<Window *>(windows.at(i)->widget())->index();
+        }
+    }
+
     while ( wndmgr->count() > 0)
     {
         Window * active_window = wndmgr->activeWindow();
@@ -451,7 +465,7 @@
             }
         }
     }
-    exitQTerm();
+    confirmExitQTerm();
     clse->ignore();
 }
 
@@ -1036,7 +1050,7 @@
     connect(m_addressAction, SIGNAL(triggered()), this, SLOT(addressBook()));
     connect(m_quickConnectAction, SIGNAL(triggered()), this, SLOT(quickLogin()));
     connect(m_printAction, SIGNAL(triggered()), this, SLOT(printScreen()));
-    connect(m_exitAction, SIGNAL(triggered()), this, SLOT(exitQTerm()));
+    connect(m_exitAction, SIGNAL(triggered()), this, SLOT(confirmExitQTerm()));
 
     connect(m_copyAction, SIGNAL(triggered()), this, SLOT(copy()));
     connect(m_pasteAction, SIGNAL(triggered()), this, SLOT(paste()));
@@ -1365,7 +1379,6 @@
     tray->setContextMenu(trayMenu);
     connect(tray, SIGNAL(activated(QSystemTrayIcon::ActivationReason)),
             this, SLOT(trayActivated(QSystemTrayIcon::ActivationReason)));
-//  connect(tray, SIGNAL(closed()), this, SLOT(exitQTerm()));
 
     tray->show();
 }
@@ -1382,7 +1395,7 @@
         trayMenu->addAction(tr("&Hide"), this, SLOT(trayHide()));
     trayMenu->addSeparator();
     trayMenu->addAction(tr("&About"), this, SLOT(aboutQTerm()));
-    trayMenu->addAction(tr("&Exit"), this, SLOT(exitQTerm()));
+    trayMenu->addAction(tr("&Exit"), this, SLOT(confirmExitQTerm()));
 }
 
 void Frame::trayActivated(QSystemTrayIcon::ActivationReason reason)

Modified: trunk/qterm-qt4/src/qtermframe.h
===================================================================
--- trunk/qterm-qt4/src/qtermframe.h	2010-01-09 06:37:34 UTC (rev 1126)
+++ trunk/qterm-qt4/src/qtermframe.h	2010-01-09 07:35:07 UTC (rev 1127)
@@ -42,6 +42,11 @@
     void popupFocusIn(Window * window = 0);
     void buzz();
     QMenu * genPopupMenu(QWidget * owner);
+
+public slots:
+    void confirmExitQTerm();
+    void exitQTerm();
+
 signals:
     void bossColor();
     void scrollChanged();
@@ -52,7 +57,6 @@
     // Menu
     void addressBook();
     void quickLogin();
-    void exitQTerm();
 
     void selectionChanged(int);
     void aboutQTerm();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.