History

Merge branch 'master' of https://github.com/highfidelity/hifi into applications_diet

Atlante45 committed 11 years ago

Commit 11a2eca2 parents 2039895 7632dbe92 files · +607 −340Browse files

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

Unified · Split

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