-rw-r--r-- | noncore/net/opieirc/ircchanneltab.cpp | 2 | ||||
-rw-r--r-- | noncore/net/opieirc/ircservertab.cpp | 2 |
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,53 +1,55 @@ | |||
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 | ||
7 | IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) { | 9 | IRCChannelTab::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())); |
30 | connect(this, SIGNAL(editFocus()), m_field, SLOT(setEditFocus())); | 32 | connect(this, SIGNAL(editFocus()), m_field, SLOT(setEditFocus())); |
31 | 33 | ||
32 | QWhatsThis::add(m_field, tr("Type your message here to participate in the channel discussion")); | 34 | QWhatsThis::add(m_field, tr("Type your message here to participate in the channel discussion")); |
33 | m_popup = new QPopupMenu(m_list); | 35 | m_popup = new QPopupMenu(m_list); |
34 | m_lines = 0; | 36 | m_lines = 0; |
35 | /* Required so that embedded-style "right" clicks work */ | 37 | /* Required so that embedded-style "right" clicks work */ |
36 | QPEApplication::setStylusOperation(m_list->viewport(), QPEApplication::RightOnHold); | 38 | QPEApplication::setStylusOperation(m_list->viewport(), QPEApplication::RightOnHold); |
37 | connect(m_list, SIGNAL(mouseButtonPressed(int,QListBoxItem*,const QPoint&)), this, SLOT(mouseButtonPressed(int,QListBoxItem*,const QPoint&))); | 39 | connect(m_list, SIGNAL(mouseButtonPressed(int,QListBoxItem*,const QPoint&)), this, SLOT(mouseButtonPressed(int,QListBoxItem*,const QPoint&))); |
38 | /* Construct the popup menu */ | 40 | /* Construct the popup menu */ |
39 | QPopupMenu *ctcpMenu = new QPopupMenu(m_list); | 41 | QPopupMenu *ctcpMenu = new QPopupMenu(m_list); |
40 | m_popup->insertItem(Resource::loadPixmap("opieirc/query"), tr("Query"), this, SLOT(popupQuery())); | 42 | m_popup->insertItem(Resource::loadPixmap("opieirc/query"), tr("Query"), this, SLOT(popupQuery())); |
41 | ctcpMenu->insertItem(Resource::loadPixmap("opieirc/ping"), tr("Ping"), this, SLOT(popupPing())); | 43 | ctcpMenu->insertItem(Resource::loadPixmap("opieirc/ping"), tr("Ping"), this, SLOT(popupPing())); |
42 | ctcpMenu->insertItem(Resource::loadPixmap("opieirc/version"), tr("Version"), this, SLOT(popupVersion())); | 44 | ctcpMenu->insertItem(Resource::loadPixmap("opieirc/version"), tr("Version"), this, SLOT(popupVersion())); |
43 | ctcpMenu->insertItem(Resource::loadPixmap("opieirc/whois"), tr("Whois"), this, SLOT(popupWhois())); | 45 | ctcpMenu->insertItem(Resource::loadPixmap("opieirc/whois"), tr("Whois"), this, SLOT(popupWhois())); |
44 | connect(m_mainWindow, SIGNAL(updateScroll()), this, SLOT(scrolling())); | 46 | connect(m_mainWindow, SIGNAL(updateScroll()), this, SLOT(scrolling())); |
45 | m_layout->add(hbox); | 47 | m_layout->add(hbox); |
46 | hbox->show(); | 48 | hbox->show(); |
47 | m_layout->add(m_field); | 49 | m_layout->add(m_field); |
48 | m_field->setFocus(); | 50 | m_field->setFocus(); |
49 | m_field->setActiveWindow(); | 51 | m_field->setActiveWindow(); |
50 | 52 | ||
51 | connect(m_field, SIGNAL(returnPressed()), this, SLOT(processCommand())); | 53 | connect(m_field, SIGNAL(returnPressed()), this, SLOT(processCommand())); |
52 | connect(m_list, SIGNAL(doubleClicked ( QListBoxItem * ) ), this, SLOT(popupQuery( QListBoxItem * ) )); | 54 | connect(m_list, SIGNAL(doubleClicked ( QListBoxItem * ) ), this, SLOT(popupQuery( QListBoxItem * ) )); |
53 | settingsChanged(); | 55 | settingsChanged(); |
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,51 +1,53 @@ | |||
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 | ||
6 | bool IRCServerTab::containsPing( const QString& text, IRCServerTab* tab ) { | 8 | bool 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 | ||
12 | IRCServerTab::IRCServerTab(IRCServer server, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) { | 14 | IRCServerTab::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())); |
28 | connect(m_field, SIGNAL(closeTab()), this, SIGNAL(closeTab())); | 30 | connect(m_field, SIGNAL(closeTab()), this, SIGNAL(closeTab())); |
29 | connect(this, SIGNAL(editFocus()), m_field, SLOT(setEditFocus())); | 31 | connect(this, SIGNAL(editFocus()), m_field, SLOT(setEditFocus())); |
30 | 32 | ||
31 | QWhatsThis::add(m_field, tr("Type commands here. A list of available commands can be found inside the OpieIRC help")); | 33 | QWhatsThis::add(m_field, tr("Type commands here. A list of available commands can be found inside the OpieIRC help")); |
32 | m_layout->add(m_field); | 34 | m_layout->add(m_field); |
33 | connect(m_field, SIGNAL(returnPressed()), this, SLOT(processCommand())); | 35 | connect(m_field, SIGNAL(returnPressed()), this, SLOT(processCommand())); |
34 | connect(m_session, SIGNAL(outputReady(IRCOutput)), this, SLOT(display(IRCOutput))); | 36 | connect(m_session, SIGNAL(outputReady(IRCOutput)), this, SLOT(display(IRCOutput))); |
35 | connect(m_mainWindow, SIGNAL(updateScroll()), this, SLOT(scrolling())); | 37 | connect(m_mainWindow, SIGNAL(updateScroll()), this, SLOT(scrolling())); |
36 | settingsChanged(); | 38 | settingsChanged(); |
37 | 39 | ||
38 | m_field->setFocus(); | 40 | m_field->setFocus(); |
39 | m_field->setActiveWindow(); | 41 | m_field->setActiveWindow(); |
40 | 42 | ||
41 | } | 43 | } |
42 | 44 | ||
43 | void IRCServerTab::scrolling(){ | 45 | void IRCServerTab::scrolling(){ |
44 | m_textview->ensureVisible(0, m_textview->contentsHeight()); | 46 | m_textview->ensureVisible(0, m_textview->contentsHeight()); |
45 | } | 47 | } |
46 | 48 | ||
47 | 49 | ||
48 | void IRCServerTab::appendText(QString text) { | 50 | void IRCServerTab::appendText(QString text) { |
49 | /* not using append because it creates layout problems */ | 51 | /* not using append because it creates layout problems */ |
50 | QString txt = m_textview->text() + IRCTab::appendTimestamp( text ); | 52 | QString txt = m_textview->text() + IRCTab::appendTimestamp( text ); |
51 | 53 | ||