summaryrefslogtreecommitdiff
authorwazlaf <wazlaf>2002-09-20 23:52:11 (UTC)
committer wazlaf <wazlaf>2002-09-20 23:52:11 (UTC)
commit0f3593c79658beef09155d71b5877a230e9bbb62 (patch) (side-by-side diff)
tree51e258fb055957a655b9cc6479721e7614036c2a
parentfb146186b2c0cef47927a75cb431713aa08da6f8 (diff)
downloadopie-0f3593c79658beef09155d71b5877a230e9bbb62.zip
opie-0f3593c79658beef09155d71b5877a230e9bbb62.tar.gz
opie-0f3593c79658beef09155d71b5877a230e9bbb62.tar.bz2
new icon, menu fixed
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/net/opieirc/irctab.cpp2
-rw-r--r--noncore/net/opieirc/mainwindow.cpp13
-rw-r--r--noncore/net/opieirc/mainwindow.h2
3 files changed, 1 insertions, 16 deletions
diff --git a/noncore/net/opieirc/irctab.cpp b/noncore/net/opieirc/irctab.cpp
index 36976ab..653a5de 100644
--- a/noncore/net/opieirc/irctab.cpp
+++ b/noncore/net/opieirc/irctab.cpp
@@ -2,18 +2,18 @@
#include <qpixmap.h>
#include <qpushbutton.h>
#include "irctab.h"
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);
descLayout->addWidget(m_description);
descLayout->setStretchFactor(m_description, 5);
QPushButton *close = new QPushButton(this);
- close->setPixmap(Resource::loadPixmap("opieirc/close"));
+ close->setPixmap(Resource::loadPixmap("close"));
connect(close, SIGNAL(clicked()), this, SLOT(remove()));
descLayout->addWidget(close);
descLayout->setStretchFactor(m_description, 1);
}
diff --git a/noncore/net/opieirc/mainwindow.cpp b/noncore/net/opieirc/mainwindow.cpp
index 3d13ee9..af4ce78 100644
--- a/noncore/net/opieirc/mainwindow.cpp
+++ b/noncore/net/opieirc/mainwindow.cpp
@@ -10,51 +10,38 @@
MainWindow::MainWindow(QWidget *parent, const char *name, WFlags f) : QMainWindow(parent, name, f) {
setCaption(tr("IRC Client"));
m_tabWidget = new QTabWidget(this);
connect(m_tabWidget, SIGNAL(currentChanged(QWidget *)), this, SLOT(tabSelected(QWidget *)));
setCentralWidget(m_tabWidget);
setToolBarsMovable(FALSE);
QPEMenuBar *menuBar = new QPEMenuBar(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);
connect(a, SIGNAL(activated()), this, SLOT(newConnection()));
a->addTo(irc);
-
- m_joinAction = new QAction(tr("Join channel"), Resource::loadPixmap("forward"), QString::null, 0, this, 0);
- m_joinAction->setEnabled(FALSE);
- connect(m_joinAction, SIGNAL(activated()), this, SLOT(join()));
- m_joinAction->addTo(irc);
}
void MainWindow::tabSelected(QWidget *) {
- m_joinAction->setEnabled(TRUE);
}
void MainWindow::closeTab() {
/* Does not directly close the tab but triggers an action
which at some point will close the tab using a callback */
IRCTab *tab = (IRCTab *)m_tabWidget->currentPage();
if (tab) {
tab->remove();
}
}
-void MainWindow::join() {
- IRCTab *tab = (IRCTab *)m_tabWidget->currentPage();
- if (tab) {
- tab->session()->join("#opie.de");
- }
-}
-
void MainWindow::addTab(IRCTab *tab) {
m_tabWidget->addTab(tab, tab->title());
m_tabWidget->showPage(tab);
tabSelected(tab);
}
void MainWindow::killTab(IRCTab *tab) {
m_tabWidget->removePage(tab);
/* there might be nicer ways to do this .. */
delete tab;
}
diff --git a/noncore/net/opieirc/mainwindow.h b/noncore/net/opieirc/mainwindow.h
index c197f5b..dcb782f 100644
--- a/noncore/net/opieirc/mainwindow.h
+++ b/noncore/net/opieirc/mainwindow.h
@@ -28,20 +28,18 @@
#include "irctab.h"
class MainWindow : public QMainWindow {
Q_OBJECT
public:
MainWindow(QWidget *parent = 0, const char *name = 0, WFlags f = 0);
void addTab(IRCTab *tab);
void killTab(IRCTab *tab);
protected slots:
void newConnection();
void closeTab();
- void join();
void tabSelected(QWidget *widget);
protected:
QTabWidget *m_tabWidget;
- QAction *m_joinAction;
};
#endif /* __MAINWINDOW_H */