Showing the changes to interface/src/Menu.cpp (1 of 92 files). Show all
Unified · Split
| @@ -33,6 +33,8 @@ · 32 unmodified lines | ||
| 33 | 33 | #include <AddressManager.h> |
| 34 | 34 | #include <DependencyManager.h> |
| 35 | 35 | #include <MainWindow.h> |
| 36 | +#include <GlowEffect.h> | |
| 37 | +#include <PathUtils.h> | |
| 36 | 38 | #include <UUID.h> |
| 37 | 39 | #include <UserActivityLogger.h> |
| 38 | 40 | #include <XmppClient.h> |
| @@ -55,7 +57,6 @@ · 16 unmodified lines | ||
| 55 | 57 | #include "ui/LoginDialog.h" |
| 56 | 58 | #include "ui/NodeBounds.h" |
| 57 | 59 | |
| 58 | − | |
| 59 | 60 | Menu* Menu::_instance = NULL; |
| 60 | 61 | |
| 61 | 62 | Menu* Menu::getInstance() { |
| @@ -247,7 +248,7 @@ Menu::Menu() : · 185 unmodified lines | ||
| 247 | 248 | connect(&xmppClient, &QXmppClient::connected, this, &Menu::toggleChat); |
| 248 | 249 | connect(&xmppClient, &QXmppClient::disconnected, this, &Menu::toggleChat); |
| 249 | 250 | |
| 250 | − QDir::setCurrent(Application::resourcesPath()); | |
| 251 | + QDir::setCurrent(PathUtils::resourcesPath()); | |
| 251 | 252 | // init chat window to listen chat |
| 252 | 253 | _chatWindow = new ChatWindow(Application::getInstance()->getWindow()); |
| 253 | 254 | #endif |
| @@ -425,7 +426,8 @@ Menu::Menu() : · 171 unmodified lines | ||
| 425 | 426 | true, |
| 426 | 427 | appInstance, |
| 427 | 428 | SLOT(setRenderVoxels(bool))); |
| 428 | − addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::EnableGlowEffect, 0, true); | |
| 429 | + addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::EnableGlowEffect, 0, true, | |
| 430 | + DependencyManager::get<GlowEffect>(), SLOT(toggleGlowEffect(bool))); | |
| 429 | 431 | |
| 430 | 432 | addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Wireframe, Qt::ALT | Qt::Key_W, false); |
| 431 | 433 | addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools, Qt::SHIFT | Qt::Key_L, this, SLOT(lodTools())); |