History

Enabled 'Enter' to open the chat. Deleted the now obsolete ChatEntry.

Dimitar Dobrev committed 12 years ago

Commit 4c26f021 parent cc8d0526 files · +14 −180Browse files

Showing the changes to interface/src/Menu.cpp (1 of 6 files). Show all

Unified · Split

interface/src/Menu.cpp+5−1
@@ -163,7 +163,11 @@ Menu::Menu() : · 162 unmodified lines
163 addActionToQMenuAndActionHash(toolsMenu, MenuOption::MetavoxelEditor, 0, this, SLOT(showMetavoxelEditor()));163 addActionToQMenuAndActionHash(toolsMenu, MenuOption::MetavoxelEditor, 0, this, SLOT(showMetavoxelEditor()));
164 addActionToQMenuAndActionHash(toolsMenu, MenuOption::FstUploader, 0, Application::getInstance(), SLOT(uploadFST()));164 addActionToQMenuAndActionHash(toolsMenu, MenuOption::FstUploader, 0, Application::getInstance(), SLOT(uploadFST()));
165 165
166 _chatAction = addActionToQMenuAndActionHash(toolsMenu, MenuOption::Chat, 0, this, SLOT(showChat()));166 _chatAction = addActionToQMenuAndActionHash(toolsMenu,
167 MenuOption::Chat,
168 Qt::Key_Return,
169 this,
170 SLOT(showChat()));
167#ifdef HAVE_QXMPP171#ifdef HAVE_QXMPP
168 const QXmppClient& xmppClient = XmppClient::getInstance().getXMPPClient();172 const QXmppClient& xmppClient = XmppClient::getInstance().getXMPPClient();
169 toggleChat();173 toggleChat();