Showing the changes to interface/src/Menu.cpp (1 of 86 files). Show all
Unified · Split
| @@ -170,7 +170,11 @@ Menu::Menu() : · 169 unmodified lines | |||
| 170 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::MetavoxelEditor, 0, this, SLOT(showMetavoxelEditor())); | 170 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::MetavoxelEditor, 0, this, SLOT(showMetavoxelEditor())); |
| 171 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::FstUploader, 0, Application::getInstance(), SLOT(uploadFST())); | 171 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::FstUploader, 0, Application::getInstance(), SLOT(uploadFST())); |
| 172 | 172 | ||
| 173 | _chatAction = addActionToQMenuAndActionHash(toolsMenu, MenuOption::Chat, 0, this, SLOT(showChat())); | 173 | _chatAction = addActionToQMenuAndActionHash(toolsMenu, |
| 174 | MenuOption::Chat, | ||
| 175 | Qt::Key_Return, | ||
| 176 | this, | ||
| 177 | SLOT(showChat())); | ||
| 174 | #ifdef HAVE_QXMPP | 178 | #ifdef HAVE_QXMPP |
| 175 | const QXmppClient& xmppClient = XmppClient::getInstance().getXMPPClient(); | 179 | const QXmppClient& xmppClient = XmppClient::getInstance().getXMPPClient(); |
| 176 | toggleChat(); | 180 | toggleChat(); |
| @@ -717,8 +721,8 @@ void Menu::editPreferences() { · 540 unmodified lines | |||
| 717 | form->addRow("Faceshift Eye Deflection:", faceshiftEyeDeflection); | 721 | form->addRow("Faceshift Eye Deflection:", faceshiftEyeDeflection); |
| 718 | 722 | ||
| 719 | QSpinBox* fieldOfView = new QSpinBox(); | 723 | QSpinBox* fieldOfView = new QSpinBox(); |
| 720 | fieldOfView->setMaximum(180); | 724 | fieldOfView->setMaximum(180.f); |
| 721 | fieldOfView->setMinimum(1); | 725 | fieldOfView->setMinimum(1.f); |
| 722 | fieldOfView->setValue(_fieldOfView); | 726 | fieldOfView->setValue(_fieldOfView); |
| 723 | form->addRow("Vertical Field of View (Degrees):", fieldOfView); | 727 | form->addRow("Vertical Field of View (Degrees):", fieldOfView); |
| 724 | 728 | ||