aboutsummaryrefslogtreecommitdiffstats
path: root/src/modules/dcc
diff options
context:
space:
mode:
Diffstat (limited to 'src/modules/dcc')
-rw-r--r--src/modules/dcc/canvas.cpp10
-rw-r--r--src/modules/dcc/canvas.h2
-rw-r--r--src/modules/dcc/chat.cpp36
-rw-r--r--src/modules/dcc/chat.h2
-rw-r--r--src/modules/dcc/video.cpp36
-rw-r--r--src/modules/dcc/video.h2
6 files changed, 53 insertions, 35 deletions
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index 4038e969e..2d66a98a0 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -156,13 +156,15 @@
buffer.sprintf("%s_%s_%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
}
- void KviDccCanvas::ownMessage(const char * text)
+ void KviDccCanvas::ownMessage(const char * text, bool bUserFeedback)
{
KviStr buf(KviStr::Format,"%s\r\n",text);
// m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),text);
+
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),text);
}
void KviDccCanvas::ownAction(const char * text)
diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/canvas.h
index 3853a33c2..6447fbac9 100644
--- a/src/modules/dcc/canvas.h
+++ b/src/modules/dcc/canvas.h
@@ -58,7 +58,7 @@
virtual void resizeEvent(QResizeEvent *e);
virtual QSize sizeHint() const;
virtual bool event(QEvent *e);
- virtual void ownMessage(const char *text);
+ virtual void ownMessage(const char *text, bool bUserFeedback = true);
virtual void ownAction(const char *text);
protected slots:
void handleMarshalError(int err);
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 7c8c09fee..bf78c5857 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -290,7 +290,7 @@ void KviDccChat::getBaseLogFileName(QString &buffer)
buffer.sprintf("%s_%s_%s",m_pDescriptor->szNick.toUtf8().data(),m_pDescriptor->szIp.toUtf8().data(),m_pDescriptor->szPort.toUtf8().data());
}
-void KviDccChat::ownMessage(const QString &text)
+void KviDccChat::ownMessage(const QString &text, bool bUserFeedback)
{
if(!m_pSlaveThread)
{
@@ -317,19 +317,23 @@ void KviDccChat::ownMessage(const QString &text)
{
KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
}
break;
case KviCryptEngine::Encoded:
{
KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
- QString encr = decodeText(encrypted.ptr());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ {
+ QString encr = decodeText(encrypted.ptr());
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications);
+ }
}
break;
default: // also case KviCryptEngine::EncryptError
@@ -347,9 +351,11 @@ void KviDccChat::ownMessage(const QString &text)
KviStr buf(KviStr::Format,"%s\r\n",d);
QString tmp = text.right(text.length() - 1);
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications);
+
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications);
return;
}
}
@@ -357,9 +363,11 @@ void KviDccChat::ownMessage(const QString &text)
#endif
KviStr buf(KviStr::Format,"%s\r\n",d);
m_pSlaveThread->sendRawData(buf.ptr(),buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
+
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
}
const QString & KviDccChat::localNick()
diff --git a/src/modules/dcc/chat.h b/src/modules/dcc/chat.h
index 930a7e81e..e4050e6cd 100644
--- a/src/modules/dcc/chat.h
+++ b/src/modules/dcc/chat.h
@@ -87,7 +87,7 @@ protected:
virtual QSize sizeHint() const;
virtual const QString & localNick();
virtual bool event(QEvent *e);
- virtual void ownMessage(const QString &text);
+ virtual void ownMessage(const QString &text, bool bUserFeedback = true);
virtual void ownAction(const QString &text);
virtual void triggerCreationEvents();
virtual void triggerDestructionEvents();
diff --git a/src/modules/dcc/video.cpp b/src/modules/dcc/video.cpp
index 7d6bd6833..131ce71dc 100644
--- a/src/modules/dcc/video.cpp
+++ b/src/modules/dcc/video.cpp
@@ -636,7 +636,7 @@ QPixmap * KviDccVideo::myIconPtr()
return g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCVOICE);
}
-void KviDccVideo::ownMessage(const QString &text)
+void KviDccVideo::ownMessage(const QString &text, bool bUserFeedback)
{
if(!m_pSlaveThread)
{
@@ -663,19 +663,23 @@ void KviDccVideo::ownMessage(const QString &text)
{
KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
m_tmpTextDataOut.append(buf.ptr(), buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSGCRYPTED,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
}
break;
case KviCryptEngine::Encoded:
{
KviStr buf(KviStr::Format,"%s\r\n",encrypted.ptr());
m_tmpTextDataOut.append(buf.ptr(), buf.len());
- QString encr = decodeText(encrypted.ptr());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications);
+ if(bUserFeedback)
+ {
+ QString encr = decodeText(encrypted.ptr());
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),encr,KviConsole::NoNotifications);
+ }
}
break;
default: // also case KviCryptEngine::EncryptError
@@ -693,9 +697,11 @@ void KviDccVideo::ownMessage(const QString &text)
KviStr buf(KviStr::Format,"%s\r\n",d);
QString tmp = text.right(text.length() - 1);
m_tmpTextDataOut.append(buf.ptr(), buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications);
+
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),tmp,KviConsole::NoNotifications);
return;
}
}
@@ -703,9 +709,11 @@ void KviDccVideo::ownMessage(const QString &text)
#endif
KviStr buf(KviStr::Format,"%s\r\n",d);
m_tmpTextDataOut.append(buf.ptr(), buf.len());
- m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
- m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
- m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
+
+ if(bUserFeedback)
+ m_pFrm->firstConsole()->outputPrivmsg(this,KVI_OUT_OWNPRIVMSG,
+ m_pDescriptor->szLocalNick.toUtf8().data(),m_pDescriptor->szLocalUser.toUtf8().data(),
+ m_pDescriptor->szLocalHost.toUtf8().data(),text,KviConsole::NoNotifications);
}
const QString & KviDccVideo::localNick()
diff --git a/src/modules/dcc/video.h b/src/modules/dcc/video.h
index f385ef8f0..311c38d50 100644
--- a/src/modules/dcc/video.h
+++ b/src/modules/dcc/video.h
@@ -134,7 +134,7 @@ protected:
void stopTalking();
void startConnection();
virtual const QString & localNick();
- virtual void ownMessage(const QString &text);
+ virtual void ownMessage(const QString &text, bool bUserFeedback = true);
virtual void ownAction(const QString &text);
protected slots:
void handleMarshalError(int err);
generated by cgit v1.3.1-10-gc9f91 (git 2.54.0) at 2026-08-08 06:25:47 +0000