fixed ticket #132 and backported(frontported?) fix for #27 from version 3.4

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

3 files changed, 38 insertions, 7 deletions

diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index 5eada0dbe..185beb370 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -1426,8 +1426,11 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg)
 	int type = msg->msg->console()->applyHighlighting(pOut,KVI_OUT_ACTION,msg->pSource->nick(),msg->pSource->user(),msg->pSource->host(),szData);
 
 	if(type < 0)return; // event stopped the message!
-	if(type == KVI_OUT_HIGHLIGHT)
+
+//fix for bug #132 : open the notifier on every /me
+/*	if(type == KVI_OUT_HIGHLIGHT)
 	{
+*/
 		if(!pOut->hasAttention())
 		{
 			if(KVI_OPTION_BOOL(KviOption_boolFlashWindowOnHighlightedMessages))
@@ -1442,7 +1445,7 @@ void KviServerParser::parseCtcpRequestAction(KviCtcpMessage *msg)
 				g_pApp->notifierMessage(pOut,KVI_OPTION_MSGTYPE(KVI_OUT_ACTION).pixId(),szMsg,90);
 			}
 		}
-	}
+//	}
 
 	if(bTargetFound)
 	{
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 75bacd393..548b94011 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -91,13 +91,19 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name)
 	g->addWidget(m_pGroupBox,1,0,1,2);
 //	g->addMultiCellWidget(m_pGroupBox,1,1,0,1);
 
-	m_pJoinButton = new QPushButton(__tr2qs("&Join"),this);
+	KviTalHBox * hb = new KviTalHBox(this);
+	hb->setSpacing(4);
+
+	g->addWidget(hb,2,0,1,2,Qt::AlignHCenter);
+
+	m_pJoinButton = new QPushButton(__tr2qs("&Join"),hb);
 	// Join on return pressed
 	m_pJoinButton->setDefault(true);
 	connect(m_pJoinButton,SIGNAL(clicked()),this,SLOT(joinClicked()));
 
-g->addWidget(m_pJoinButton,2,0,1,2,Qt::AlignHCenter);
-//	g->addMultiCellWidget(m_pJoinButton,2,2,0,1,Qt::AlignHCenter);
+	m_pRegButton = new QPushButton(__tr2qs("&Register"),hb);
+	// Join on return pressed
+	connect(m_pRegButton,SIGNAL(clicked()),this,SLOT(regClicked()));
 
 	m_pShowAtStartupCheck = new QCheckBox(__tr2qs("Show this window after connecting"),this);
 	m_pShowAtStartupCheck->setChecked(KVI_OPTION_BOOL(KviOption_boolShowChannelsJoinOnIrc));
@@ -172,7 +178,6 @@ void KviChannelsJoinWindow::fillListView()
 		}
 	}
 
-	// FIXME: Registered channels go here!
 	par = new KviTalTreeWidgetItem(m_pListView,__tr2qs("Registered Channels"));
 	par->setExpanded(true);
 
@@ -220,9 +225,13 @@ void KviChannelsJoinWindow::enableJoin()
 	if(c)
 	{
 		if(tmp.isEmpty())
+		{
 			m_pJoinButton->setEnabled(false);
-		else
+			m_pRegButton->setEnabled(false);
+		} else {
 			m_pJoinButton->setEnabled(true);
+			m_pRegButton->setEnabled(true);
+		}
 	} else {
 		m_pListView->setEnabled(false);
 		m_pGroupBox->setEnabled(false);
@@ -254,6 +263,23 @@ void KviChannelsJoinWindow::joinClicked()
 	m_pPass->setText("");
 }
 
+void KviChannelsJoinWindow::regClicked()
+{
+	KviStr tmp = m_pChannelEdit->text();
+	QList<QModelIndex> index;
+
+	if(tmp.isEmpty())return;
+
+	KviStr command(KviStr::Format,"regchan.add %s",tmp.ptr());
+
+	KviConsole * c = g_pApp->topmostConnectedConsole();
+	if(!c)return; // no connection
+	KviWindow * w = g_pActiveWindow;
+	if(w->console() != c)w = c;
+	KviKvsScript::run(command.ptr(),w);
+	fillListView();
+}
+
 /*
 void KviChannelsJoinWindow::whoClicked()
 {
diff --git a/src/modules/channelsjoin/channelsjoinwindow.h b/src/modules/channelsjoin/channelsjoinwindow.h
index c99d8eba3..faeba523f 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.h
+++ b/src/modules/channelsjoin/channelsjoinwindow.h
@@ -50,6 +50,7 @@ protected:
 	QCheckBox   * m_pShowAtStartupCheck;
 	QCheckBox   * m_pCloseAfterJoinCheck;
 	QPushButton * m_pJoinButton;
+	QPushButton * m_pRegButton;
 	KviConsole  * m_pConsole;
 public:
 	virtual void closeEvent(QCloseEvent *e);
@@ -63,6 +64,7 @@ protected slots:
 	void editReturnPressed();
 	void cancelClicked();
 	void joinClicked();
+	void regClicked();
 //	void whoClicked();
 //	void namesClicked();
 };