summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2009-11-10 22:19:13 (GMT)
committerRemko Tronçon <git@el-tramo.be>2009-11-10 22:19:13 (GMT)
commitd6322619cdfd34e62126cd9b8a09d95316fff6ae (patch)
tree2ef9efa89bc96f011ba8c49f36a884a22e3b974e
parentf76e39f30966279a10a9ba97271cebdc3cba2c4d (diff)
downloadswift-d6322619cdfd34e62126cd9b8a09d95316fff6ae.zip
swift-d6322619cdfd34e62126cd9b8a09d95316fff6ae.tar.bz2
Remove "Add Contact" button from roster.
-rw-r--r--Swift/QtUI/QtMainWindow.cpp10
-rw-r--r--Swift/QtUI/QtMainWindow.h1
2 files changed, 3 insertions, 8 deletions
diff --git a/Swift/QtUI/QtMainWindow.cpp b/Swift/QtUI/QtMainWindow.cpp
index 2643a1b..701b1d2 100644
--- a/Swift/QtUI/QtMainWindow.cpp
+++ b/Swift/QtUI/QtMainWindow.cpp
@@ -42,13 +42,6 @@ QtMainWindow::QtMainWindow(QtTreeWidgetFactory *treeWidgetFactory) : QWidget() {
treeWidget_ = dynamic_cast<QtTreeWidget*>(treeWidgetFactory->createTreeWidget());
contactTabLayout->addWidget(treeWidget_);
- bottomBar_ = new QToolBar(this);
- contactTabLayout->addWidget(bottomBar_);
-
- addAction_ = new QAction("Add Contact", this);
- bottomBar_->addAction(addAction_);
- connect(addAction_, SIGNAL(triggered(bool)), this, SLOT(handleAddActionTriggered(bool)));
-
tabs_->addTab(contactsTabWidget_, "Contacts");
eventView_ = new EventView(this);
@@ -70,6 +63,9 @@ QtMainWindow::QtMainWindow(QtTreeWidgetFactory *treeWidgetFactory) : QWidget() {
QAction* joinMUCAction = new QAction("Join chatroom", this);
connect(joinMUCAction, SIGNAL(triggered()), SLOT(handleJoinMUCAction()));
chatMenu->addAction(joinMUCAction);
+ addAction_ = new QAction("Add Contact", this);
+ connect(addAction_, SIGNAL(triggered(bool)), this, SLOT(handleAddActionTriggered(bool)));
+ chatMenu->addAction(addAction_);
QAction* signOutAction = new QAction("Sign Out", this);
connect(signOutAction, SIGNAL(triggered()), SLOT(handleSignOutAction()));
chatMenu->addAction(signOutAction);
diff --git a/Swift/QtUI/QtMainWindow.h b/Swift/QtUI/QtMainWindow.h
index e0b4305..9f06dc8 100644
--- a/Swift/QtUI/QtMainWindow.h
+++ b/Swift/QtUI/QtMainWindow.h
@@ -47,7 +47,6 @@ namespace Swift {
QPushButton* mucButton_;
QtTreeWidget* treeWidget_;
QtRosterHeader* meView_;
- QToolBar* bottomBar_;
QAction* addAction_;
QTabWidget* tabs_;
QWidget* contactsTabWidget_;