← Back to branch summary

~ubuntu-branches/ubuntu/saucy/kvirc/saucy

« back to all changes in this revision

Viewing changes to src/modules/dcc/DccVideoWindow.cpp

  • Committer: Package Import Robot
  • Author(s): Mark Purcell
  • Date: 2013-05-18 19:36:33 UTC
  • mfrom: (22.1.4 sid)
  • Revision ID: package-import@ubuntu.com-20130518193633-kuhzryg7jstqvxpr
Tags: 4:4.2.0-2
Upload to unstable 

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/modules/dcc/DccVideoWindow.cpp
422
422
        m_fd = KVI_INVALID_SOCKET;
423
423
}
424
424
 
425
 
DccVideoWindow::DccVideoWindow(KviMainWindow *pFrm,DccDescriptor * dcc,const char * name)
426
 
: DccWindow(KviWindow::DccVideo,pFrm,name,dcc)
 
425
DccVideoWindow::DccVideoWindow(DccDescriptor * dcc,const char * name)
 
426
: DccWindow(KviWindow::DccVideo,name,dcc)
427
427
{
428
428
        m_pDescriptor = dcc;
429
429
        m_pSlaveThread = 0;
450
450
        m_pLayout = new QGridLayout(m_pContainerWidget);
451
451
        m_pContainerWidget->setLayout(m_pLayout);
452
452
 
453
 
        m_pIrcView  = new KviIrcView(this,pFrm,this);
 
453
        m_pIrcView  = new KviIrcView(this,this);
454
454
        connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
455
455
        m_pInput    = new KviInput(this);
456
456
 
711
711
                                                KviCString buf(KviCString::Format,"%s\r\n",encrypted.ptr());
712
712
                                                m_tmpTextDataOut.append(buf.ptr(), buf.len());
713
713
                                                if(bUserFeedback)
714
 
                                                        m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
 
714
                                                        g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
715
715
                                                                m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
716
716
                                                                m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsoleWindow::NoNotifications);
717
717
                                        }
723
723
                                                if(bUserFeedback)
724
724
                                                {
725
725
                                                        QString encr = decodeText(encrypted.ptr());
726
 
                                                        m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
 
726
                                                        g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
727
727
                                                                m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
728
728
                                                                m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsoleWindow::NoNotifications);
729
729
                                                }
746
746
                                m_tmpTextDataOut.append(buf.ptr(), buf.len());
747
747
 
748
748
                                if(bUserFeedback)
749
 
                                        m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
 
749
                                        g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
750
750
                                                m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
751
751
                                                m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsoleWindow::NoNotifications);
752
752
                                return;
758
758
        m_tmpTextDataOut.append(buf.ptr(), buf.len());
759
759
 
760
760
        if(bUserFeedback)
761
 
                m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
 
761
                g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
762
762
                        m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
763
763
                        m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsoleWindow::NoNotifications);
764
764
}
822
822
                                                d.cutLeft(6);
823
823
                                        d.stripLeftWhiteSpace();
824
824
                                        output(KVI_OUT_ACTION,"%Q %s",&(m_pDescriptor->szNick),d.ptr());
825
 
                                        if(!hasAttention())
 
825
                                        if(!hasAttention(KviWindow::MainWindowIsVisible))
826
826
                                        {
827
827
                                                if(KVI_OPTION_BOOL(KviOption_boolFlashDccChatWindowOnNewMessages))
828
828
                                                {
853
853
                                                                case KviCryptEngine::DecryptOkWasPlainText:
854
854
                                                                        if(!KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnDCCChatMessage,this,QString(decryptedStuff.ptr()),m_pDescriptor->idString()))
855
855
                                                                        {
856
 
                                                                                m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG,
 
856
                                                                                g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG,
857
857
                                                                                        m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szUser.toUtf8().data(),
858
858
                                                                                        m_pDescriptor->szHost.toUtf8().data(),decryptedStuff.ptr());
859
859
                                                                        }
876
876
                                                // FIXME!
877
877
                                                if(!KVS_TRIGGER_EVENT_2_HALTED(KviEvent_OnDCCChatMessage,this,QString(d.ptr()),m_pDescriptor->idString()))
878
878
                                                {
879
 
                                                        m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG,
 
879
                                                        g_pMainWindow->firstConsole()->outputPrivmsg(this,KVI_OUT_DCCCHATMSG,
880
880
                                                                m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szUser.toUtf8().data(),
881
881
                                                                m_pDescriptor->szHost.toUtf8().data(),d.ptr());
882
 
                                                        if(!hasAttention())
 
882
                                                        if(!hasAttention(KviWindow::MainWindowIsVisible))
883
883
                                                        {
884
884
                                                                if(KVI_OPTION_BOOL(KviOption_boolFlashDccChatWindowOnNewMessages))
885
885
                                                                {