Showing the changes to interface/src/Menu.cpp (1 of 14 files). Show all
Unified · Split
| @@ -129,7 +129,10 @@ Menu::Menu() : · 128 unmodified lines | ||
| 129 | 129 | this, |
| 130 | 130 | SLOT(goTo())); |
| 131 | 131 | |
| 132 | − | |
| 132 | + addDisabledActionAndSeparator(fileMenu, "Upload/Browse"); | |
| 133 | + addActionToQMenuAndActionHash(fileMenu, MenuOption::UploaderAvatarHead, 0, Application::getInstance(), SLOT(uploadFST())); | |
| 134 | + addActionToQMenuAndActionHash(fileMenu, MenuOption::UploaderAvatarSkeleton, 0, Application::getInstance(), SLOT(uploadFST())); | |
| 135 | + | |
| 133 | 136 | addDisabledActionAndSeparator(fileMenu, "Settings"); |
| 134 | 137 | addActionToQMenuAndActionHash(fileMenu, MenuOption::SettingsImport, 0, this, SLOT(importSettings())); |
| 135 | 138 | addActionToQMenuAndActionHash(fileMenu, MenuOption::SettingsExport, 0, this, SLOT(exportSettings())); |
| @@ -161,7 +164,6 @@ Menu::Menu() : · 25 unmodified lines | ||
| 161 | 164 | |
| 162 | 165 | QMenu* toolsMenu = addMenu("Tools"); |
| 163 | 166 | addActionToQMenuAndActionHash(toolsMenu, MenuOption::MetavoxelEditor, 0, this, SLOT(showMetavoxelEditor())); |
| 164 | − addActionToQMenuAndActionHash(toolsMenu, MenuOption::FstUploader, 0, Application::getInstance(), SLOT(uploadFST())); | |
| 165 | 167 | |
| 166 | 168 | _chatAction = addActionToQMenuAndActionHash(toolsMenu, |
| 167 | 169 | MenuOption::Chat, |
| @@ -1044,22 +1046,20 @@ void Menu::showChat() { · 876 unmodified lines | ||
| 1044 | 1046 | if (!_chatWindow) { |
| 1045 | 1047 | _chatWindow = new ChatWindow(); |
| 1046 | 1048 | QMainWindow* mainWindow = Application::getInstance()->getWindow(); |
| 1047 | − _chatWindow->setGeometry(mainWindow->width() - _chatWindow->width(), | |
| 1048 | − mainWindow->geometry().y(), | |
| 1049 | − _chatWindow->width(), | |
| 1050 | − mainWindow->height()); | |
| 1051 | − } | |
| 1052 | − if (!_chatWindow->isVisible()) { | |
| 1053 | − _chatWindow->show(); | |
| 1049 | + QBoxLayout* boxLayout = static_cast<QBoxLayout*>(mainWindow->centralWidget()->layout()); | |
| 1050 | + boxLayout->addWidget(_chatWindow, 0, Qt::AlignRight); | |
| 1051 | + } else { | |
| 1052 | + if (!_chatWindow->isVisible()) { | |
| 1053 | + _chatWindow->show(); | |
| 1054 | + } | |
| 1054 | 1055 | } |
| 1055 | − _chatWindow->raise(); | |
| 1056 | 1056 | } |
| 1057 | 1057 | |
| 1058 | 1058 | void Menu::toggleChat() { |
| 1059 | 1059 | #ifdef HAVE_QXMPP |
| 1060 | 1060 | _chatAction->setEnabled(XmppClient::getInstance().getXMPPClient().isConnected()); |
| 1061 | 1061 | if (!_chatAction->isEnabled() && _chatWindow) { |
| 1062 | − _chatWindow->close(); | |
| 1062 | + _chatWindow->hide(); | |
| 1063 | 1063 | } |
| 1064 | 1064 | #endif |
| 1065 | 1065 | } |