-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
@@ -5,5 +5,6 @@
 
 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));
 }
 
@@ -31,8 +32,11 @@ IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *pa
     m_layout->add(m_field);
     connect(m_field, SIGNAL(returnPressed()), this, SLOT(processCommand()));
-    m_field->setFocus();
     connect(m_session, SIGNAL(outputReady(IRCOutput)), this, SLOT(display(IRCOutput)));
     connect(m_mainWindow, SIGNAL(updateScroll()), this, SLOT(scrolling()));
     settingsChanged();
+
+    m_field->setFocus();
+    m_field->setActiveWindow();
+
 }
 
@@ -44,5 +48,8 @@ void IRCServerTab::scrolling(){
 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) {
         int firstBreak = txt.find('\n');
@@ -235,9 +242,9 @@ void IRCServerTab::remove() {
         m_channelTabs.first();
         while (m_channelTabs.current() != 0) {
-            m_mainWindow->killTab(m_channelTabs.current());
+            m_mainWindow->killTab(m_channelTabs.current(), true);
         }
         m_queryTabs.first();
         while (m_queryTabs.current() != 0) {
-            m_mainWindow->killTab(m_queryTabs.current());
+            m_mainWindow->killTab(m_queryTabs.current(), true);
         }
         m_mainWindow->killTab(this);
@@ -273,9 +280,9 @@ void IRCServerTab::display(IRCOutput output) {
                 m_channelTabs.first();
                 while (m_channelTabs.current() != 0) {
-                    m_mainWindow->killTab(m_channelTabs.current());
+                    m_mainWindow->killTab(m_channelTabs.current(), true);
                 }
                 m_queryTabs.first();
                 while (m_queryTabs.current() != 0) {
-                    m_mainWindow->killTab(m_queryTabs.current());
+                    m_mainWindow->killTab(m_queryTabs.current(), true);
                 }
                 m_mainWindow->killTab(this);
@@ -313,5 +320,5 @@ void IRCServerTab::display(IRCOutput output) {
                 IRCChannelTab *channelTab = getTabForChannel((IRCChannel *)output.getParam(0));
                 if (channelTab)
-                    m_mainWindow->killTab(channelTab);
+                    m_mainWindow->killTab(channelTab, true);
             }
             break;
@@ -320,5 +327,5 @@ void IRCServerTab::display(IRCOutput output) {
                 IRCChannelTab *channelTab = getTabForChannel((IRCChannel *)output.getParam(0));
                 if (channelTab)
-                    m_mainWindow->killTab(channelTab);
+                    m_mainWindow->killTab(channelTab, true);
             }
             break;