summaryrefslogtreecommitdiff
Side-by-side diff
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
@@ -10,9 +10,9 @@ IRCTab::IRCTab(QWidget *parent, const char *name, WFlags f) : QWidget(parent, na
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
@@ -18,17 +18,11 @@ MainWindow::MainWindow(QWidget *parent, const char *name, WFlags f) : QMainWindo
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
@@ -38,15 +32,8 @@ void MainWindow::closeTab() {
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);
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
@@ -36,12 +36,10 @@ public:
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 */