summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opieirc/ircchannellist.cpp8
-rw-r--r--noncore/net/opieirc/ircchanneltab.cpp14
-rw-r--r--noncore/net/opieirc/irctab.cpp10
-rw-r--r--noncore/net/opieirc/mainwindow.cpp12
4 files changed, 25 insertions, 19 deletions
diff --git a/noncore/net/opieirc/ircchannellist.cpp b/noncore/net/opieirc/ircchannellist.cpp
index 8cf144e..3982f30 100644
--- a/noncore/net/opieirc/ircchannellist.cpp
+++ b/noncore/net/opieirc/ircchannellist.cpp
@@ -1,29 +1,29 @@
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
#include "ircchannellist.h"
#include "ircchannelperson.h"
IRCChannelList::IRCChannelList(IRCChannel *channel, QWidget *parent, const char *name, WFlags f) : QListBox(parent, name, f) {
m_channel = channel;
}
void IRCChannelList::update() {
- QPixmap op = Resource::loadPixmap("opieirc/op");
- QPixmap hop = Resource::loadPixmap("opieirc/hop");
- QPixmap voice = Resource::loadPixmap("opieirc/voice");
+ QPixmap op = Opie::Core::OResource::loadPixmap( "opieirc/op" );
+ QPixmap hop = Opie::Core::OResource::loadPixmap( "opieirc/hop" );
+ QPixmap voice = Opie::Core::OResource::loadPixmap( "opieirc/voice" );
QListIterator<IRCChannelPerson> it = m_channel->people();
clear();
for (; it.current(); ++it) {
IRCChannelPerson *person = it.current();
if (person->flags() & IRCChannelPerson::PERSON_FLAG_OP) {
insertItem(op, "1" + person->nick());
} else if (person->flags() & IRCChannelPerson::PERSON_FLAG_HALFOP) {
insertItem(op, "2" + person->nick());
} else if (person->flags() & IRCChannelPerson::PERSON_FLAG_VOICE) {
insertItem(voice, "3" + person->nick());
} else {
insertItem("4" + person->nick());
}
}
sort();
adjustNicks();
diff --git a/noncore/net/opieirc/ircchanneltab.cpp b/noncore/net/opieirc/ircchanneltab.cpp
index 3272a8a..707e17f 100644
--- a/noncore/net/opieirc/ircchanneltab.cpp
+++ b/noncore/net/opieirc/ircchanneltab.cpp
@@ -1,17 +1,17 @@
-#include <qpe/resource.h>
+#include <opie2/oresource.h>
#include <qwhatsthis.h>
#include <qhbox.h>
#include <qdict.h>
#include "ircchanneltab.h"
#include "ircservertab.h"
#include "ircmessageparser.h"
#include <opie2/odebug.h>
QDict<QString> IRCChannelTab::m_queuedMessages (17);
IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainWindow *mainWindow, QWidget *parent, const char *name, WFlags f) : IRCTab(parent, name, f) {
m_mainWindow = mainWindow;
m_parentTab = parentTab;
m_channel = channel;
m_description->setText(tr("Talking on channel") + " <b>" + channel->channelname() + "</b>");
@@ -30,37 +30,41 @@ IRCChannelTab::IRCChannelTab(IRCChannel *channel, IRCServerTab *parentTab, MainW
m_list->update();
m_list->setMaximumWidth(LISTWIDTH);
m_field = new IRCHistoryLineEdit(this);
connect(m_field, SIGNAL(nextTab()), this, SIGNAL(nextTab()));
connect(m_field, SIGNAL(prevTab()), this, SIGNAL(prevTab()));
connect(m_field, SIGNAL(closeTab()), this, SLOT(remove()));
connect(this, SIGNAL(editFocus()), m_field, SLOT(setEditFocus()));
QWhatsThis::add(m_field, tr("Type your message here to participate in the channel discussion"));
m_popup = new QPopupMenu(m_list);
m_lines = 0;
/* Required so that embedded-style "right" clicks work */
QPEApplication::setStylusOperation(m_list->viewport(), QPEApplication::RightOnHold);
connect(m_list, SIGNAL(mouseButtonPressed(int,QListBoxItem*,const QPoint&)), this, SLOT(mouseButtonPressed(int,QListBoxItem*,const QPoint&)));
/* Construct the popup menu */
//QPopupMenu *ctcpMenu = new QPopupMenu(m_list);
- m_popup->insertItem(Resource::loadPixmap("opieirc/query"), tr("Query"), this, SLOT(popupQuery()));
+ m_popup->insertItem(Opie::Core::OResource::loadPixmap("opieirc/query",Opie::Core::OResource::SmallIcon),
+ tr("Query"), this, SLOT(popupQuery()));
m_popup->insertSeparator();
- m_popup->insertItem(Resource::loadPixmap("opieirc/ping"), tr("Ping"), this, SLOT(popupPing()));
- m_popup->insertItem(Resource::loadPixmap("opieirc/version"), tr("Version"), this, SLOT(popupVersion()));
- m_popup->insertItem(Resource::loadPixmap("opieirc/whois"), tr("Whois"), this, SLOT(popupWhois()));
+ m_popup->insertItem(Opie::Core::OResource::loadPixmap("opieirc/ping",Opie::Core::OResource::SmallIcon),
+ tr("Ping"), this, SLOT(popupPing()));
+ m_popup->insertItem(Opie::Core::OResource::loadPixmap("opieirc/version",Opie::Core::OResource::SmallIcon),
+ tr("Version"), this, SLOT(popupVersion()));
+ m_popup->insertItem(Opie::Core::OResource::loadPixmap("opieirc/whois",Opie::Core::OResource::SmallIcon),
+ tr("Whois"), this, SLOT(popupWhois()));
//m_popup->insertItem(ctcpMenu, "CTCP");
connect(m_mainWindow, SIGNAL(updateScroll()), this, SLOT(scrolling()));
m_layout->add(hbox);
hbox->show();
m_layout->add(m_field);
m_field->setFocus();
m_field->setActiveWindow();
connect(m_field, SIGNAL(returnPressed()), this, SLOT(processCommand()));
connect(m_list, SIGNAL(doubleClicked ( QListBoxItem * ) ), this, SLOT(popupQuery( QListBoxItem * ) ));
settingsChanged();
if(m_queuedMessages[m_channel->channelname()]) {
appendText(*m_queuedMessages[m_channel->channelname()]);
delete m_queuedMessages[m_channel->channelname()];
m_queuedMessages.remove(m_channel->channelname());
diff --git a/noncore/net/opieirc/irctab.cpp b/noncore/net/opieirc/irctab.cpp
index aee33c4..2f459a9 100644
--- a/noncore/net/opieirc/irctab.cpp
+++ b/noncore/net/opieirc/irctab.cpp
@@ -1,24 +1,23 @@
#include "irctab.h"
#include "mainwindow.h"
#include <opie2/okeyconfigmanager.h>
+#include <opie2/oresource.h>
#include <qpe/applnk.h>
-#include <qpe/resource.h>
-
#include <qpushbutton.h>
#include <qwhatsthis.h>
QString IRCTab::m_errorColor;
QString IRCTab::m_serverColor;
QString IRCTab::m_textColor;
QString IRCTab::m_backgroundColor;
QString IRCTab::m_selfColor;
QString IRCTab::m_otherColor;
QString IRCTab::m_notificationColor;
int IRCTab::m_maxLines;
static bool g_useTime = false;
@@ -31,36 +30,35 @@ void IRCTab::setUseTimeStamps( bool b ) {
QString IRCTab::appendTimestamp( const QString& text ) {
return g_useTime ?
"[" +QTime::currentTime().toString()+"]" + text + "\n" :
text + "\n";
}
IRCTab::IRCTab(QWidget *parent, const char *name, WFlags f) : QWidget(parent, name, f) {
m_layout = new QVBoxLayout(this);
QHBoxLayout *descLayout = new QHBoxLayout(m_layout);
descLayout->setMargin(5);
m_description = new QLabel(tr("Missing description"), this);
QWhatsThis::add(m_description, tr("Description of the tab's content"));
descLayout->addWidget(m_description);
descLayout->setStretchFactor(m_description, 5);
- QPixmap pic;
- pic.convertFromImage( Resource::loadImage( "close" ).smoothScale( AppLnk::smallIconSize(), AppLnk::smallIconSize() ) );
- QPushButton *close = new QPushButton(pic, QString::null, this);
- close->setMaximumWidth( close->height() );
+ QPushButton *close = new QPushButton( Opie::Core::OResource::loadPixmap( "close", Opie::Core::OResource::SmallIcon ),
+ QString::null, this);
+ close->setFixedSize( AppLnk::smallIconSize(), AppLnk::smallIconSize() );
QWhatsThis::add(close, tr("Close this tab"));
connect(close, SIGNAL(clicked()), this, SLOT(remove()));
descLayout->addWidget(close);
descLayout->setStretchFactor(m_description, 1);
}
void IRCTab::setID(int id) {
m_id = id;
}
int IRCTab::id() {
return m_id;
}
void IRCTab::showEvent( QShowEvent *ev ) {
diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp
index 3d60107..5edcf66 100644
--- a/noncore/net/opieirc/mainwindow.cpp
+++ b/noncore/net/opieirc/mainwindow.cpp
@@ -1,52 +1,56 @@
-#include <qmenubar.h>
-#include <qpe/resource.h>
#include <opie2/odebug.h>
+#include <opie2/oresource.h>
+#include <qmenubar.h>
#include <qwhatsthis.h>
#include "mainwindow.h"
#include "ircservertab.h"
#include "dcctransfertab.h"
#include "ircserverlist.h"
#include "ircsettings.h"
#include <stdio.h>
QString MainWindow::appCaption() {
return QObject::tr("Opie IRC");
}
MainWindow::MainWindow(QWidget *parent, const char *name, WFlags) : QMainWindow(parent, name, WStyle_ContextHelp) {
setCaption(tr("IRC Client"));
m_tabWidget = new IRCTabWidget(this);
QWhatsThis::add(m_tabWidget, tr("Server connections, channels, queries and other things will be placed here"));
connect(m_tabWidget, SIGNAL(currentChanged(QWidget*)), this, SLOT(selected(QWidget*)));
setCentralWidget(m_tabWidget);
setToolBarsMovable(FALSE);
QMenuBar *menuBar = new QMenuBar(this);
QPopupMenu *irc = new QPopupMenu(this);
menuBar->insertItem(tr("IRC"), irc);
- QAction *a = new QAction(tr("New connection"), Resource::loadPixmap("pass"), QString::null, 0, this, 0);
+ QAction *a = new QAction( tr("New connection"),
+ Opie::Core::OResource::loadPixmap( "pass", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
connect(a, SIGNAL(activated()), this, SLOT(newConnection()));
a->setWhatsThis(tr("Create a new connection to an IRC server"));
a->addTo(irc);
- a = new QAction(tr("Settings"), Resource::loadPixmap("SettingsIcon"), QString::null, 0, this, 0);
+ a = new QAction( tr("Settings"),
+ Opie::Core::OResource::loadPixmap( "SettingsIcon", Opie::Core::OResource::SmallIcon ),
+ QString::null, 0, this, 0 );
a->setWhatsThis(tr("Configure OpieIRC's behavior and appearance"));
connect(a, SIGNAL(activated()), this, SLOT(settings()));
a->addTo(irc);
m_dccTab = 0;
loadSettings();
}
/*IRCTabWidget MainWindow::getTabWidget(){
return m_tabWidget;
} */
void MainWindow::loadSettings() {
Config config("OpieIRC");
config.setGroup("OpieIRC");
IRCTab::m_backgroundColor = config.readEntry("BackgroundColor", "#FFFFFF");
IRCTab::m_textColor = config.readEntry("TextColor", "#000000");