Diffstat (limited to 'noncore/net/opieirc/ircchanneltab.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opieirc/ircchanneltab.cpp | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/noncore/net/opieirc/ircchanneltab.cpp b/noncore/net/opieirc/ircchanneltab.cpp index 4a35929..3272a8a 100644 --- a/noncore/net/opieirc/ircchanneltab.cpp +++ b/noncore/net/opieirc/ircchanneltab.cpp | |||
@@ -7,6 +7,7 @@ | |||
7 | #include "ircservertab.h" | 7 | #include "ircservertab.h" |
8 | #include "ircmessageparser.h" | 8 | #include "ircmessageparser.h" |
9 | 9 | ||
10 | #include <opie2/odebug.h> | ||
10 | QDict<QString> IRCChannelTab::m_queuedMessages (17); | 11 | QDict<QString> IRCChannelTab::m_queuedMessages (17); |
11 | 12 | ||
12 | IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) { | 13 | IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) { |
@@ -41,11 +42,13 @@ IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainW | |||
41 | QPEApplication::setStylusOperation(m_list->viewport(), QPEApplication::RightOnHold); | 42 | QPEApplication::setStylusOperation(m_list->viewport(), QPEApplication::RightOnHold); |
42 | connect(m_list, SIGNAL(mouseButtonPressed(int,QListBoxItem*,const QPoint&)), this, SLOT(mouseButtonPressed(int,QListBoxItem*,const QPoint&))); | 43 | connect(m_list, SIGNAL(mouseButtonPressed(int,QListBoxItem*,const QPoint&)), this, SLOT(mouseButtonPressed(int,QListBoxItem*,const QPoint&))); |
43 | /* Construct the popup menu */ | 44 | /* Construct the popup menu */ |
44 | QPopupMenu *ctcpMenu = new QPopupMenu(m_list); | 45 | //QPopupMenu *ctcpMenu = new QPopupMenu(m_list); |
45 | m_popup->insertItem(Resource::loadPixmap("opieirc/query"), tr("Query"), this, SLOT(popupQuery())); | 46 | m_popup->insertItem(Resource::loadPixmap("opieirc/query"), tr("Query"), this, SLOT(popupQuery())); |
46 | ctcpMenu->insertItem(Resource::loadPixmap("opieirc/ping"), tr("Ping"), this, SLOT(popupPing())); | 47 | m_popup->insertSeparator(); |
47 | ctcpMenu->insertItem(Resource::loadPixmap("opieirc/version"), tr("Version"), this, SLOT(popupVersion())); | 48 | m_popup->insertItem(Resource::loadPixmap("opieirc/ping"), tr("Ping"), this, SLOT(popupPing())); |
48 | ctcpMenu->insertItem(Resource::loadPixmap("opieirc/whois"), tr("Whois"), this, SLOT(popupWhois())); | 49 | m_popup->insertItem(Resource::loadPixmap("opieirc/version"), tr("Version"), this, SLOT(popupVersion())); |
50 | m_popup->insertItem(Resource::loadPixmap("opieirc/whois"), tr("Whois"), this, SLOT(popupWhois())); | ||
51 | //m_popup->insertItem(ctcpMenu, "CTCP"); | ||
49 | connect(m_mainWindow, SIGNAL(updateScroll()), this, SLOT(scrolling())); | 52 | connect(m_mainWindow, SIGNAL(updateScroll()), this, SLOT(scrolling())); |
50 | m_layout->add(hbox); | 53 | m_layout->add(hbox); |
51 | hbox->show(); | 54 | hbox->show(); |
@@ -166,13 +169,18 @@ void IRCChannelTab::popupQuery() { | |||
166 | } | 169 | } |
167 | 170 | ||
168 | void IRCChannelTab::popupPing() { | 171 | void IRCChannelTab::popupPing() { |
169 | //HAHA, no wonder these don't work | 172 | if(m_list->currentItem() != -1) |
173 | m_parentTab->session()->sendCTCPPing(m_list->text(m_list->currentItem())); | ||
170 | } | 174 | } |
171 | 175 | ||
172 | void IRCChannelTab::popupVersion() { | 176 | void IRCChannelTab::popupVersion() { |
177 | if(m_list->currentItem() != -1) | ||
178 | m_parentTab->session()->sendCTCPRequest(m_list->text(m_list->currentItem()), "VERSION", ""); | ||
173 | } | 179 | } |
174 | 180 | ||
175 | void IRCChannelTab::popupWhois() { | 181 | void IRCChannelTab::popupWhois() { |
182 | if(m_list->currentItem() != -1) | ||
183 | m_parentTab->session()->whois(m_list->text(m_list->currentItem())); | ||
176 | } | 184 | } |
177 | 185 | ||
178 | QString IRCChannelTab::title() { | 186 | QString IRCChannelTab::title() { |