aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/dcc
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/dcc')
-rw-r--r--src/modules/dcc/chat.cpp7
-rw-r--r--src/modules/dcc/dialogs.cpp13
-rw-r--r--src/modules/dcc/marshal.cpp16
-rw-r--r--src/modules/dcc/voice.cpp13
4 files changed, 30 insertions, 19 deletions
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 0968db127..a14647375 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -87,7 +87,8 @@ 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");
+ m_pTopSplitter = new QSplitter(Qt::Horizontal,this);
+ m_pTopSplitter->setObjectName("top_splitter");
KviThemedLabel * dummy;
dummy = new KviThemedLabel(m_pTopSplitter,"dummy_label");
KviTalVBox * box = new KviTalVBox(m_pTopSplitter);
@@ -275,9 +276,9 @@ void KviDccChat::fillCaptionBuffers()
m_szPlainTextCaption = tmp;
m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
- KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),tmp.toUtf8().data());
+ KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii(),tmp.toUtf8().data());
m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
- KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),tmp.toUtf8().data());
+ KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii(),tmp.toUtf8().data());
}
QPixmap * KviDccChat::myIconPtr()
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index ccc3236c5..84ca3dc18 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -33,6 +33,7 @@
#include <QEvent>
#include <QCloseEvent>
#include <QShowEvent>
+#include <QIcon>
KviDccBox::KviDccBox(KviDccBroker * br,KviDccDescriptor * dcc)
{
@@ -53,8 +54,9 @@ void KviDccBox::forgetDescriptor()
}
KviDccAcceptBox::KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const QString &text,const QString &capt)
-: QWidget(0,"dcc_accept_box") , KviDccBox(br,dcc)
+: QWidget(0) , KviDccBox(br,dcc)
{
+ setObjectName("dcc_accept_box");
QVBoxLayout * vb = new QVBoxLayout(this,4,4);
QLabel * l = new QLabel(text,this);
l->setWordWrap(true);
@@ -71,10 +73,10 @@ KviDccAcceptBox::KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const
connect(btn,SIGNAL(clicked()),this,SLOT(rejectClicked()));
hb->addWidget(btn);
- setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG)));
+ setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG))));
setWindowTitle(capt);
- l->setActiveWindow();
+ l->activateWindow();
l->setFocus();
}
@@ -113,8 +115,9 @@ void KviDccAcceptBox::showEvent(QShowEvent *e)
KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const QString &text,bool bDisableResume)
-: QWidget(0,"dcc_rename_box") , KviDccBox(br,dcc)
+: QWidget(0) , KviDccBox(br,dcc)
{
+ setObjectName("dcc_rename_box");
QVBoxLayout * vb = new QVBoxLayout(this,4,4);
QLabel * l = new QLabel(text,this);
l->setWordWrap(true);
@@ -142,7 +145,7 @@ KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const
btn->setDefault(true);
//btn->setFocus();
- setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG)));
+ setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG))));
setWindowTitle(__tr2qs_ctx("File Already Exists - KVIrc","dcc"));
}
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 06a947583..b970f6334 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -35,8 +35,9 @@
KviDccMarshal::KviDccMarshal(KviDccMarshalOutputContext * ctx)
-: QObject(0,"dcc_marshal")
+: QObject(0)
{
+ setObjectName("dcc_marshal");
m_pSn = 0;
m_fd = KVI_INVALID_SOCKET;
m_pTimeoutTimer = 0;
@@ -121,7 +122,9 @@ int KviDccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTime
if(m_pTimeoutTimer)delete m_pTimeoutTimer;
m_pTimeoutTimer = new QTimer();
connect(m_pTimeoutTimer,SIGNAL(timeout()),this,SLOT(doListen()));
- m_pTimeoutTimer->start(100,true);
+// m_pTimeoutTimer->start(100,true);
+ m_pTimeoutTimer->setInterval(199);
+ m_pTimeoutTimer->setSingleShot(true);
return KviError_success;
}
@@ -284,7 +287,9 @@ void KviDccMarshal::doListen()
{
m_pTimeoutTimer = new QTimer();
connect(m_pTimeoutTimer,SIGNAL(timeout()),this,SLOT(connectionTimedOut()));
- m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true);
+ //m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true);
+ m_pTimeoutTimer->setInterval(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000);
+ m_pTimeoutTimer->setSingleShot(true);
}
// and wait for connect
@@ -309,8 +314,9 @@ int KviDccMarshal::dccConnect(const char * ip,const char * port,bool bUseTimeout
if(m_pTimeoutTimer)delete m_pTimeoutTimer;
m_pTimeoutTimer = new QTimer();
connect(m_pTimeoutTimer,SIGNAL(timeout()),this,SLOT(doConnect()));
- m_pTimeoutTimer->start(100,true);
-
+// m_pTimeoutTimer->start(100,true);
+ m_pTimeoutTimer->setInterval(100);
+ m_pTimeoutTimer->setSingleShot(true);
return KviError_success;
}
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index a0a3c958d..d6291c8b2 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -643,7 +643,8 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
m_pDescriptor = dcc;
m_pSlaveThread = 0;
- m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter");
+ m_pSplitter = new QSplitter(Qt::Horizontal,this);
+ m_pSplitter->setObjectName("dcc_window_splitter");
m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this);
m_pHBox = new KviTalHBox(this);
@@ -681,12 +682,12 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
m_pTalkButton = new KviStyledToolButton(m_pHBox);
m_pTalkButton->setEnabled(false);
- m_pTalkButton->setToggleButton(true);
+ m_pTalkButton->setCheckable(true);
QIcon iset;
iset.addPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)),QIcon::Normal,QIcon::Off);
iset.addPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_CONNECTED)),QIcon::Normal,QIcon::On);
m_pTalkButton->setIcon(iset);
- m_pTalkButton->setUsesBigPixmap(true);
+ m_pTalkButton->setIconSize(QSize(32,32));
connect(m_pTalkButton,SIGNAL(toggled(bool)),this,SLOT(startOrStopTalking(bool)));
m_pHBox->setStretchFactor(vbox,1);
@@ -789,9 +790,9 @@ void KviDccVoice::fillCaptionBuffers()
m_szPlainTextCaption = tmp;
m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
- KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),tmp.ptr());
+ KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii(),tmp.ptr());
m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
- KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),tmp.ptr());
+ KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii(),tmp.ptr());
}
QPixmap * KviDccVoice::myIconPtr()
@@ -894,7 +895,7 @@ void KviDccVoice::handleMarshalError(int err)
QString ssss = KviError::getDescription(err);
output(KVI_OUT_DCCERROR,__tr2qs_ctx("DCC Failed: %Q","dcc"),&ssss);
m_pTalkButton->setEnabled(false);
- m_pTalkButton->setOn(false);
+ m_pTalkButton->setChecked(false);
m_pRecordingLabel->setEnabled(false);
m_pPlayingLabel->setEnabled(false);
}
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 09:27:47 +0000