fix for #307

updated sourcesdate
note: you need to restore the default script to get this working

git-svn-id: https://svn.kvirc.de/svn/branches/kvirc/3.4@2927 17fca916-40b9-46aa-a4ea-0a15b648b75c

diff --git a/data/defscript/events.kvs b/data/defscript/events.kvs
index 575cfc3938073f1be144fb2717323ca1ce2b11b0..bc0a350abe7438c60e2bad1bb60fe8d6f8dbf435 100644 (file)
--- a/data/defscript/events.kvs
+++ b/data/defscript/events.kvs
@@ -79,6 +79,14 @@ event(OnQueryWindowCreated,default)
        }
 }
 
+event(OnDCCChatWindowCreated,default)
+{
+       button(w,Logging,119,Logging)
+       {
+               popup -p=$0,$1 logging;
+       }
+}
+
 event(OnChannelNickLinkClick,default)
 {
        if($0 != "") window.insertInInputText $window $0$option(stringNickCompletionPostfix);

diff --git a/src/kvilib/config/kvi_sourcesdate.h b/src/kvilib/config/kvi_sourcesdate.h
index a3df8e1631c03dc3a9cddc0fe63d746f7c4213e5..a05c4c2d1b261ee76e07fc78c1e086517525d87e 100644 (file)
--- a/src/kvilib/config/kvi_sourcesdate.h
+++ b/src/kvilib/config/kvi_sourcesdate.h
@@ -27,8 +27,8 @@
 
 #include "kvi_settings.h"
 
-#define KVI_SOURCES_DATE "20081123"
-#define KVI_SOURCES_DATE_NUMERIC 0x20081123
+#define KVI_SOURCES_DATE "20081128"
+#define KVI_SOURCES_DATE_NUMERIC 0x20081128
 
 // this is the date of the sources before that we should force a setup
 // this is usually changed only when a setup is really needed because

diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 1a3b700b2c2e30b57206c00e70927f6d9a5884d4..dd0774ee9f5de82122384eb5c583f91fb77ae064 100644 (file)
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -89,18 +89,28 @@ extern KviDccBroker * g_pDccBroker;
 KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
 : KviDccWindow(KVI_WINDOW_TYPE_DCCCHAT,pFrm,name,dcc)
 {
-       m_pTopSplitter = new QSplitter(Qt::Horizontal,this,"top_splitter");
-       KviThemedLabel * dummy;
-       dummy = new KviThemedLabel(m_pTopSplitter,"dummy_label");
-       KviTalVBox * box = new KviTalVBox(m_pTopSplitter);
+       m_pButtonBox = new KviTalHBox(this);
+
+       m_pLabel = new KviThemedLabel(m_pButtonBox,"dcc_chat_label");
+       m_pLabel->setAutoHeight(1);
+       m_pLabel->setText(name);
+       m_pButtonBox->setStretchFactor(m_pLabel,1);
+
+       m_pButtonContainer= new KviTalHBox(m_pButtonBox);
+       createTextEncodingButton(m_pButtonContainer);
+
+#ifdef COMPILE_USE_QT4
+       m_pSplitter = new QSplitter(Qt::Horizontal,this,"main_splitter");
+#else
+       m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter");
+#endif
+       m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this);
+       connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
 
 #ifdef COMPILE_CRYPT_SUPPORT
-       createCryptControllerButton(box);
+       createCryptControllerButton(m_pButtonContainer);
 #endif
 
-       m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter");
-       m_pIrcView  = new KviIrcView(m_pSplitter,pFrm,this);
-       connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
        m_pInput    = new KviInput(this);
 
        //setFocusHandler(m_pInput,this);
@@ -482,8 +492,8 @@ bool KviDccChat::event(QEvent *e)
 void KviDccChat::resizeEvent(QResizeEvent *e)
 {
        int hght = m_pInput->heightHint();
-       int hght2 = m_pTopSplitter->sizeHint().height();
-       m_pTopSplitter->setGeometry(0,0,width(),hght2);
+       int hght2 = m_pButtonBox->sizeHint().height();
+       m_pButtonBox->setGeometry(0,0,width(),hght2);
        m_pSplitter->setGeometry(0,hght2,width(),height() - (hght + hght2));
        m_pInput->setGeometry(0,height() - hght,width(),hght);
 }

diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/chat.h
index d309d1482b51e94059c7cfa57e0c78f563201d57..3fa3074ea8229bfbdac11de3ab1f0419c79f963f 100644 (file)
--- a/src/modules/dcc/chat.h
+++ b/src/modules/dcc/chat.h
@@ -69,11 +69,14 @@ class KviDccChat : public KviDccWindow
 public:
        KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name);
        ~KviDccChat();
+       QFrame * buttonContainer() { return m_pButtonContainer; };
 protected:
        KviDccChatThread       * m_pSlaveThread;
-       QSplitter              * m_pTopSplitter;
        QString                  m_szTarget;
        QString                  m_szLocalNick;
+       KviThemedLabel         * m_pLabel;
+       KviTalHBox             * m_pButtonBox;
+       KviTalHBox             * m_pButtonContainer;
 protected:
        virtual const QString & target();
        virtual void fillCaptionBuffers();