Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2009-11-10 22:19:13 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2009-11-10 22:19:13 (GMT) |
| commit | d6322619cdfd34e62126cd9b8a09d95316fff6ae (patch) | |
| tree | 2ef9efa89bc96f011ba8c49f36a884a22e3b974e /Swift | |
| parent | f76e39f30966279a10a9ba97271cebdc3cba2c4d (diff) | |
| download | swift-d6322619cdfd34e62126cd9b8a09d95316fff6ae.zip swift-d6322619cdfd34e62126cd9b8a09d95316fff6ae.tar.bz2 | |
Remove "Add Contact" button from roster.
Diffstat (limited to 'Swift')
| -rw-r--r-- | Swift/QtUI/QtMainWindow.cpp | 10 | ||||
| -rw-r--r-- | Swift/QtUI/QtMainWindow.h | 1 |
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 @@ -39,19 +39,12 @@ QtMainWindow::QtMainWindow(QtTreeWidgetFactory *treeWidgetFactory) : QWidget() { contactTabLayout->setSpacing(0); contactTabLayout->setContentsMargins(0, 0, 0, 0); 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); tabs_->addTab(eventView_, "Events"); @@ -67,12 +60,15 @@ QtMainWindow::QtMainWindow(QtTreeWidgetFactory *treeWidgetFactory) : QWidget() { QMenu* chatMenu = new QMenu(tr("Chat"), this); menus_.push_back(chatMenu); 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); } void QtMainWindow::handleAddActionTriggered(bool checked) { 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 @@ -44,13 +44,12 @@ namespace Swift { std::vector<QMenu*> menus_; QLineEdit* muc_; QLineEdit* mucNick_; QPushButton* mucButton_; QtTreeWidget* treeWidget_; QtRosterHeader* meView_; - QToolBar* bottomBar_; QAction* addAction_; QTabWidget* tabs_; QWidget* contactsTabWidget_; QWidget* eventsTabWidget_; EventView* eventView_; }; |