History

Merge branch 'master' of https://github.com/worklist/hifi into 20660

Thijs Wenker committed 11 years ago

Commit 0f8cf802 parents 63f0173 53f981580 files · +2139 −880Browse files

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

Unified · Split

interface/src/Menu.cpp+3−1
@@ -16,11 +16,13 @@ · 15 unmodified lines
16#include <AddressManager.h>16#include <AddressManager.h>
17#include <AudioClient.h>17#include <AudioClient.h>
18#include <DependencyManager.h>18#include <DependencyManager.h>
19#include <display-plugins/DisplayPlugin.h>
19#include <PathUtils.h>20#include <PathUtils.h>
20#include <SettingHandle.h>21#include <SettingHandle.h>
21#include <UserActivityLogger.h>22#include <UserActivityLogger.h>
22#include <VrMenu.h>23#include <VrMenu.h>
23 24
25
24#include "Application.h"26#include "Application.h"
25#include "AccountManager.h"27#include "AccountManager.h"
26#include "audio/AudioScope.h"28#include "audio/AudioScope.h"
@@ -220,7 +222,7 @@ Menu::Menu() { · 193 unmodified lines
220 addActionToQMenuAndActionHash(toolsMenu, MenuOption::PackageModel, 0,222 addActionToQMenuAndActionHash(toolsMenu, MenuOption::PackageModel, 0,
221 qApp, SLOT(packageModel()));223 qApp, SLOT(packageModel()));
222 224
223 MenuWrapper* displayMenu = addMenu("Display");225 MenuWrapper* displayMenu = addMenu(DisplayPlugin::MENU_PATH);
224 {226 {
225 MenuWrapper* displayModeMenu = addMenu(MenuOption::OutputMenu);227 MenuWrapper* displayModeMenu = addMenu(MenuOption::OutputMenu);
226 QActionGroup* displayModeGroup = new QActionGroup(displayModeMenu);228 QActionGroup* displayModeGroup = new QActionGroup(displayModeMenu);