From b538ec203da0ad5f6ea00dc4340dac7af0169b90 Mon Sep 17 00:00:00 2001 From: Fabio Bas Date: Sun, 1 Jan 2012 16:43:23 +0000 Subject: - Happy new year! - Some parts of kvirc still refered to KviMainWindow as frame(), m_pFrm, etc.. => fixed - Some parts of kvirc were still coded as if more than one KviMainWindows could exists => fixed, this involved changing KviWindows's ctor and removing KviWindow::frame(), thus the big change - The trayicon module still called itself (and was called) dockextension, and was built to support more than one KviMainWindows => renamed and fixed - Modified KviWindow::hasAttention so that is can be used everywhere instead of mixing different ways to check if a notificationm should popup - should fix #1221 and hopefully introduce little to no bugs git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@6010 17fca916-40b9-46aa-a4ea-0a15b648b75c --- src/modules/dcc/DccVideoWindow.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/modules/dcc/DccVideoWindow.cpp') diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp index 166043a16..e2d5055a9 100644 --- a/src/modules/dcc/DccVideoWindow.cpp +++ b/src/modules/dcc/DccVideoWindow.cpp @@ -422,8 +422,8 @@ exit_dcc: m_fd = KVI_INVALID_SOCKET; } -DccVideoWindow::DccVideoWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name) -: DccWindow(KviWindow::DccVideo,pFrm,name,dcc) +DccVideoWindow::DccVideoWindow(DccDescriptor * dcc,const char * name) +: DccWindow(KviWindow::DccVideo,name,dcc) { m_pDescriptor = dcc; m_pSlaveThread = 0; @@ -450,7 +450,7 @@ DccVideoWindow::DccVideoWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const cha m_pLayout = new QGridLayout(m_pContainerWidget); m_pContainerWidget->setLayout(m_pLayout); - m_pIrcView = new KviIrcView(this,pFrm,this); + m_pIrcView = new KviIrcView(this,this); connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked())); m_pInput = new KviInput(this); @@ -822,7 +822,7 @@ bool DccVideoWindow::event(QEvent *e) d.cutLeft(6); d.stripLeftWhiteSpace(); output(KVI_OUT_ACTION,"%Q %s",&(m_pDescriptor->szNick),d.ptr()); - if(!hasAttention()) + if(!hasAttention(KviWindow::MainWindowIsVisible)) { if(KVI_OPTION_BOOL(KviOption_boolFlashDccChatWindowOnNewMessages)) { @@ -879,7 +879,7 @@ bool DccVideoWindow::event(QEvent *e) m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG, m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szUser.toUtf8().data(), m_pDescriptor->szHost.toUtf8().data(),d.ptr()); - if(!hasAttention()) + if(!hasAttention(KviWindow::MainWindowIsVisible)) { if(KVI_OPTION_BOOL(KviOption_boolFlashDccChatWindowOnNewMessages)) { -- cgit v1.3.1-10-gc9f91