From: Thomas R. <dre...@us...> - 2003-04-27 20:56:18
|
Update of /cvsroot/licq/qt-gui/src In directory sc8-pr-cvs1:/tmp/cvs-serv4477 Modified Files: usereventdlg.cpp mainwin.cpp Log Message: - fixes a issue with tabbed chatting: "when doubleclicking on a contact list user which has a non-active tab, it created a funny new dialog" - replaces some tabs with spaces, makes code in mainwin better readable Index: usereventdlg.cpp =================================================================== RCS file: /cvsroot/licq/qt-gui/src/usereventdlg.cpp,v retrieving revision 1.120 retrieving revision 1.121 diff -u -d -r1.120 -r1.121 --- usereventdlg.cpp 27 Apr 2003 16:44:31 -0000 1.120 +++ usereventdlg.cpp 27 Apr 2003 20:48:08 -0000 1.121 @@ -1841,8 +1841,7 @@ UserSendCommon* e = NULL; QWidget *parent = NULL; #if QT_VERSION >= 300 - if (mainwin->userEventTabDlg && - mainwin->userEventTabDlg->tabIsSelected(this)) + if (mainwin->userEventTabDlg && mainwin->userEventTabDlg->tabExists(this)) parent = mainwin->userEventTabDlg; #endif switch(id) Index: mainwin.cpp =================================================================== RCS file: /cvsroot/licq/qt-gui/src/mainwin.cpp,v retrieving revision 1.283 retrieving revision 1.284 diff -u -d -r1.283 -r1.284 --- mainwin.cpp 27 Apr 2003 16:44:31 -0000 1.283 +++ mainwin.cpp 27 Apr 2003 20:48:08 -0000 1.284 @@ -2313,34 +2313,34 @@ for (; it.current(); ++it) if ((*it)->Uin() == nUin) { - e = static_cast<UserSendCommon*>(*it); + e = static_cast<UserSendCommon*>(*it); #if QT_VERSION >= 300 - if (userEventTabDlg && userEventTabDlg->tabExists(e)) - { - userEventTabDlg->show(); - userEventTabDlg->selectTab(e); - userEventTabDlg->raise(); + if (userEventTabDlg && userEventTabDlg->tabExists(e)) + { + userEventTabDlg->show(); + userEventTabDlg->selectTab(e); + userEventTabDlg->raise(); #ifdef USE_KDE - KWin::setActiveWindow(userEventTabDlg->winId()); + KWin::setActiveWindow(userEventTabDlg->winId()); #endif - } - else + } + else #endif - { - e->show(); - if (!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon")) - { - e->raise(); + { + e->show(); + if (!qApp->activeWindow() || !qApp->activeWindow()->inherits("UserEventCommon")) + { + e->raise(); #ifdef USE_KDE - KWin::setActiveWindow(e->winId()); + KWin::setActiveWindow(e->winId()); #endif - } - } - return e; - } - } - } - default: + } + } + return e; + } + } + } + default: break; } |