StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

OSX: Remove dead code and make Widget own all their actions

Browse Source
This commit is contained in:
TheSpiritXIII 2015-07-17 08:20:47 -04:00
parent 49071baac7
commit b9882c3680
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/widget/widget.cpp
View File

@ -303,11 +303,13 @@ void Widget::init()
QAction* addContactAction = contactMenu->menu()->addAction(tr("Add Contact..."));
connect(addContactAction, &QAction::triggered, this, &Widget::onAddClicked);
QAction* nextConversationAction = Nexus::getInstance().windowMenu->addAction(tr("Next Conversation"));
QAction* nextConversationAction = new QAction(tr("Next Conversation"), this);
Nexus::getInstance().windowMenu->addAction(nextConversationAction);
nextConversationAction->setShortcut(QKeySequence::SelectNextPage);
connect(nextConversationAction, &QAction::triggered, this, &Widget::nextContact);
QAction* previousConversationAction = Nexus::getInstance().windowMenu->addAction(tr("Previous Conversation"));
QAction* previousConversationAction = new QAction(tr("Previous Conversation"), this);
Nexus::getInstance().windowMenu->addAction(previousConversationAction);
previousConversationAction->setShortcut(QKeySequence::SelectPreviousPage);
connect(previousConversationAction, &QAction::triggered, this, &Widget::previousContact);
@ -415,11 +417,6 @@ Widget::~Widget()
delete trayMenu;
delete ui;
instance = nullptr;
#ifdef Q_OS_MAC
//Nexus::getInstance().globalMenuBar->clear();
//Nexus::getInstance().globalMenuBar->addMenu(Nexus::getInstance().windowMenu);
#endif
}
Widget* Widget::getInstance()