summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieirc/ircchanneltab.cpp2
-rw-r--r--noncore/net/opieirc/ircservertab.cpp2
2 files changed, 4 insertions, 0 deletions
diff --git a/noncore/net/opieirc/ircchanneltab.cpp b/noncore/net/opieirc/ircchanneltab.cpp
index 7610058..581f9a5 100644
--- a/noncore/net/opieirc/ircchanneltab.cpp
+++ b/noncore/net/opieirc/ircchanneltab.cpp
@@ -1,29 +1,31 @@
1#include <qpe/resource.h> 1#include <qpe/resource.h>
2#include <qwhatsthis.h> 2#include <qwhatsthis.h>
3#include <qhbox.h> 3#include <qhbox.h>
4
4#include "ircchanneltab.h" 5#include "ircchanneltab.h"
5#include "ircservertab.h" 6#include "ircservertab.h"
7#include "ircmessageparser.h"
6 8
7IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) { 9IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) {
8 m_mainWindow = mainWindow; 10 m_mainWindow = mainWindow;
9 m_parentTab = parentTab; 11 m_parentTab = parentTab;
10 m_channel = channel; 12 m_channel = channel;
11 m_description->setText(tr("Talking on channel") + " <b>" + channel->channelname() + "</b>"); 13 m_description->setText(tr("Talking on channel") + " <b>" + channel->channelname() + "</b>");
12 QHBox *hbox = new QHBox(this); 14 QHBox *hbox = new QHBox(this);
13 m_textview = new QTextView(hbox); 15 m_textview = new QTextView(hbox);
14 m_textview->setHScrollBarMode(QScrollView::AlwaysOff); 16 m_textview->setHScrollBarMode(QScrollView::AlwaysOff);
15 m_textview->setVScrollBarMode(QScrollView::AlwaysOn); 17 m_textview->setVScrollBarMode(QScrollView::AlwaysOn);
16 m_listVisible = TRUE; 18 m_listVisible = TRUE;
17 m_listButton = new QPushButton(">", m_textview); 19 m_listButton = new QPushButton(">", m_textview);
18 m_listButton->setFlat( true ); 20 m_listButton->setFlat( true );
19 m_textview->setCornerWidget(m_listButton); 21 m_textview->setCornerWidget(m_listButton);
20 m_textview->setTextFormat(RichText); 22 m_textview->setTextFormat(RichText);
21 QWhatsThis::add(m_textview, tr("Channel discussion")); 23 QWhatsThis::add(m_textview, tr("Channel discussion"));
22 connect(m_listButton, SIGNAL(clicked()), this, SLOT(toggleList())); 24 connect(m_listButton, SIGNAL(clicked()), this, SLOT(toggleList()));
23 m_list = new IRCChannelList(m_channel, hbox); 25 m_list = new IRCChannelList(m_channel, hbox);
24 m_list->update(); 26 m_list->update();
25 m_list->setMaximumWidth(LISTWIDTH); 27 m_list->setMaximumWidth(LISTWIDTH);
26 m_field = new IRCHistoryLineEdit(this); 28 m_field = new IRCHistoryLineEdit(this);
27 connect(m_field, SIGNAL(nextTab()), this, SIGNAL(nextTab())); 29 connect(m_field, SIGNAL(nextTab()), this, SIGNAL(nextTab()));
28 connect(m_field, SIGNAL(prevTab()), this, SIGNAL(prevTab())); 30 connect(m_field, SIGNAL(prevTab()), this, SIGNAL(prevTab()));
29 connect(m_field, SIGNAL(closeTab()), this, SLOT(remove())); 31 connect(m_field, SIGNAL(closeTab()), this, SLOT(remove()));
diff --git a/noncore/net/opieirc/ircservertab.cpp b/noncore/net/opieirc/ircservertab.cpp
index 5ca7a29..e031d4d 100644
--- a/noncore/net/opieirc/ircservertab.cpp
+++ b/noncore/net/opieirc/ircservertab.cpp
@@ -1,27 +1,29 @@
1#include <qtextstream.h> 1#include <qtextstream.h>
2#include <qwhatsthis.h> 2#include <qwhatsthis.h>
3
3#include "ircservertab.h" 4#include "ircservertab.h"
5#include "ircmessageparser.h"
4 6
5 7
6bool IRCServerTab::containsPing( const QString& text, IRCServerTab* tab ) { 8bool IRCServerTab::containsPing( const QString& text, IRCServerTab* tab ) {
7 return (text.contains(IRCMessageParser::tr("Received a CTCP PING from "))) || 9 return (text.contains(IRCMessageParser::tr("Received a CTCP PING from "))) ||
8 (text.find("ping") != -1 && text.find( tab->server()->nick() != -1)); 10 (text.find("ping") != -1 && text.find( tab->server()->nick() != -1));
9} 11}
10 12
11 13
12IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) { 14IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) {
13 m_server = server; 15 m_server = server;
14 m_session = new IRCSession(&m_server); 16 m_session = new IRCSession(&m_server);
15 m_mainWindow = mainWindow; 17 m_mainWindow = mainWindow;
16 m_close = FALSE; 18 m_close = FALSE;
17 m_lines = 0; 19 m_lines = 0;
18 m_description->setText(tr("Connection to")+" <b>" + server.hostname() + ":" + QString::number(server.port()) + "</b>"); 20 m_description->setText(tr("Connection to")+" <b>" + server.hostname() + ":" + QString::number(server.port()) + "</b>");
19 m_textview = new QTextView(this); 21 m_textview = new QTextView(this);
20 m_textview->setHScrollBarMode(QScrollView::AlwaysOff); 22 m_textview->setHScrollBarMode(QScrollView::AlwaysOff);
21 m_textview->setVScrollBarMode(QScrollView::AlwaysOn); 23 m_textview->setVScrollBarMode(QScrollView::AlwaysOn);
22 m_textview->setTextFormat(RichText); 24 m_textview->setTextFormat(RichText);
23 QWhatsThis::add(m_textview, tr("Server messages")); 25 QWhatsThis::add(m_textview, tr("Server messages"));
24 m_layout->add(m_textview); 26 m_layout->add(m_textview);
25 m_field = new IRCHistoryLineEdit(this); 27 m_field = new IRCHistoryLineEdit(this);
26 connect(m_field, SIGNAL(nextTab()), this, SIGNAL(nextTab())); 28 connect(m_field, SIGNAL(nextTab()), this, SIGNAL(nextTab()));
27 connect(m_field, SIGNAL(prevTab()), this, SIGNAL(prevTab())); 29 connect(m_field, SIGNAL(prevTab()), this, SIGNAL(prevTab()));