Changeset 47 for psi/trunk/src

Timestamp:

Sep 10, 2006, 7:07:41 PM (19 years ago)

Author:

dmik

Message:

Psi: TabDlg: Fixed: ChatDlg::closeEvent() result (accepted or rejected) is now obeyed when chats are in the tabbed mode.

Location:

psi/trunk/src

Files:

• tabdlg.cpp (modified) (3 diffs)
• tabdlg.h (modified) (1 diff)

psi/trunk/src/tabdlg.cpp

@@ -201 +201 @@
 }
 
-void TabDlg::closeChat(ChatDlg* chat, bool doclose=true)
-{
-        chat->hide();
+bool TabDlg::closeChat(ChatDlg* chat, bool doclose=true)
+{
+        if (doclose) {
+                if (!chat->close())
+                        return false; 
+        } else {
+                chat->hide();
+        }
         disconnect ( chat, SIGNAL( captionChanged( ChatDlg*) ), this, SLOT( updateTab( ChatDlg* ) ) );
         disconnect ( chat, SIGNAL( contactIsComposing(ChatDlg*, bool) ), this, SLOT( setTabComposing( ChatDlg*, bool) ) );
@@ -212 +217 @@
         chats.remove(chat);
         chat->reparent(0,QPoint());
-        if (doclose)
-                chat->close();
         if (tabs->count()>0)
                 updateCaption();
         checkHasChats();
+        return true;
 }
 
@@ -275 +279 @@
         int count=tabs->count();
         for (int i=0;i<count;++i) {
-                closeChat();
+                if (!closeChat((ChatDlg*)(tabs->currentPage())))
+                        return;
         }
 }

psi/trunk/src/tabdlg.h

@@ -72 +72 @@
         void addChat(ChatDlg *chat);
         void setLooks();
-        void closeChat(ChatDlg*,bool);
+        bool closeChat(ChatDlg*,bool);
         void selectTab(ChatDlg*);
         void activated();