-Close Tab Keyboard Accelerator with delayed deletion of the tab

-Optionally add a TimeStamp to the Tab
-Remove not implemented CTCP actions from the Channel PopupMenu
-Give Focus to the Edit Line
-Some more ping handling

patch inspired and copied from zautrix fork

1 files changed, 16 insertions, 9 deletions

diff --git a/noncore/net/opieirc/ircservertab.cpp b/noncore/net/opieirc/ircservertab.cpp
index 2a34c0b..5ca7a29 100644
--- a/noncore/net/opieirc/ircservertab.cpp
+++ b/noncore/net/opieirc/ircservertab.cpp
@@ -6,3 +6,4 @@
 bool IRCServerTab::containsPing( const QString& text, IRCServerTab* tab ) {
-    return (text.find("ping") != -1 && text.find( tab->server()->nick() != -1));
+  return (text.contains(IRCMessageParser::tr("Received a CTCP PING from "))) ||
+         (text.find("ping") != -1 && text.find( tab->server()->nick() != -1));
 }
@@ -32,3 +33,2 @@ IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *pa
     connect(m_field, SIGNAL(returnPressed()), this, SLOT(processCommand()));
-    m_field->setFocus();
     connect(m_session, SIGNAL(outputReady(IRCOutput)), this, SLOT(display(IRCOutput)));
@@ -36,2 +36,6 @@ IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *pa
     settingsChanged();
+
+    m_field->setFocus();
+    m_field->setActiveWindow();
+
 }
@@ -45,3 +49,6 @@ void IRCServerTab::appendText(QString text) {
     /* not using append because it creates layout problems */
-    QString txt = m_textview->text() + text + "\n";
+    QString txt = m_textview->text() + IRCTab::appendTimestamp( text );
+
+
+
     if (m_maxLines > 0 && m_lines >= m_maxLines) {
@@ -236,3 +243,3 @@ void IRCServerTab::remove() {
         while (m_channelTabs.current() != 0) {
-            m_mainWindow->killTab(m_channelTabs.current());
+            m_mainWindow->killTab(m_channelTabs.current(), true);
         }
@@ -240,3 +247,3 @@ void IRCServerTab::remove() {
         while (m_queryTabs.current() != 0) {
-            m_mainWindow->killTab(m_queryTabs.current());
+            m_mainWindow->killTab(m_queryTabs.current(), true);
         }
@@ -274,3 +281,3 @@ void IRCServerTab::display(IRCOutput output) {
                 while (m_channelTabs.current() != 0) {
-                    m_mainWindow->killTab(m_channelTabs.current());
+                    m_mainWindow->killTab(m_channelTabs.current(), true);
                 }
@@ -278,3 +285,3 @@ void IRCServerTab::display(IRCOutput output) {
                 while (m_queryTabs.current() != 0) {
-                    m_mainWindow->killTab(m_queryTabs.current());
+                    m_mainWindow->killTab(m_queryTabs.current(), true);
                 }
@@ -314,3 +321,3 @@ void IRCServerTab::display(IRCOutput output) {
                 if (channelTab)
-                    m_mainWindow->killTab(channelTab);
+                    m_mainWindow->killTab(channelTab, true);
             }
@@ -321,3 +328,3 @@ void IRCServerTab::display(IRCOutput output) {
                 if (channelTab)
-                    m_mainWindow->killTab(channelTab);
+                    m_mainWindow->killTab(channelTab, true);
             }