Merge pull request #6836 from ZappoMan/menuGroups

wire up audio show level meter menu

interface/resources/qml/AvatarInputs.qml

@@ -86,7 +86,7 @@ Hifi.AvatarInputs {
         id: controls
         width: root.mirrorWidth
         height: 44
-        visible: !root.isHMD
+        visible: root.showAudioTools
         anchors.top: mirror.bottom
 
         Rectangle {

interface/src/Menu.cpp

@@ -156,9 +156,8 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(audioMenu, MenuOption::MuteAudio, Qt::CTRL | Qt::Key_M, false, 
         audioIO.data(), SLOT(toggleMute()));
 
-    // Audio > Level Meter  [advanced] -- FIXME: needs implementation
-    auto levelMeterAction = addCheckableActionToQMenuAndActionHash(audioMenu, "Level Meter", 0, false, NULL, NULL, UNSPECIFIED_POSITION, "Advanced");
-    levelMeterAction->setDisabled(true);
+    // Audio > Show Level Meter
+    addCheckableActionToQMenuAndActionHash(audioMenu, MenuOption::AudioTools, 0, true);
 
 
     // Avatar menu ----------------------------------
@@ -325,8 +324,10 @@ Menu::Menu() {
     // Developer > Render >>>
     MenuWrapper* renderOptionsMenu = developerMenu->addMenu("Render");
     addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Atmosphere, 0, true);
+    addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::WorldAxes);
     addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::DebugAmbientOcclusion);
     addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Antialiasing);
+    addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars, 0, true);
 
     // Developer > Render > Ambient Light
     MenuWrapper* ambientLightMenu = renderOptionsMenu->addMenu(MenuOption::RenderAmbientLight);
@@ -357,15 +358,8 @@ Menu::Menu() {
     resolutionGroup->addAction(addCheckableActionToQMenuAndActionHash(resolutionMenu, MenuOption::RenderResolutionThird, 0, false));
     resolutionGroup->addAction(addCheckableActionToQMenuAndActionHash(resolutionMenu, MenuOption::RenderResolutionQuarter, 0, false));
 
-    // Developer > Render > Stars
-    addCheckableActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::Stars,
-        0, // QML Qt::Key_Asterisk,
-        true);
-
     // Developer > Render > LOD Tools
-    addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools,
-        0, // QML Qt::SHIFT | Qt::Key_L,
-        dialogsManager.data(), SLOT(lodTools()));
+    addActionToQMenuAndActionHash(renderOptionsMenu, MenuOption::LodTools, 0, dialogsManager.data(), SLOT(lodTools()));
 
     // Developer > Assets >>>
     MenuWrapper* assetDeveloperMenu = developerMenu->addMenu("Assets");
@@ -498,6 +492,12 @@ Menu::Menu() {
     MenuWrapper* leapOptionsMenu = handOptionsMenu->addMenu("Leap Motion");
     addCheckableActionToQMenuAndActionHash(leapOptionsMenu, MenuOption::LeapMotionOnHMD, 0, false);
 
+    // Developer > Entities >>>
+    MenuWrapper* entitiesOptionsMenu = developerMenu->addMenu("Entities");
+    addActionToQMenuAndActionHash(entitiesOptionsMenu, MenuOption::OctreeStats, 0,
+        dialogsManager.data(), SLOT(octreeStatsDetails()));
+    addCheckableActionToQMenuAndActionHash(entitiesOptionsMenu, MenuOption::ShowRealtimeEntityStats);
+
     // Developer > Network >>>
     MenuWrapper* networkMenu = developerMenu->addMenu("Network");
     addActionToQMenuAndActionHash(networkMenu, MenuOption::ReloadContent, 0, qApp, SLOT(reloadResourceCaches()));
@@ -514,12 +514,14 @@ Menu::Menu() {
         dialogsManager.data(), SLOT(cachesSizeDialog()));
     addActionToQMenuAndActionHash(networkMenu, MenuOption::DiskCacheEditor, 0,
         dialogsManager.data(), SLOT(toggleDiskCacheEditor()));
-
     addActionToQMenuAndActionHash(networkMenu, MenuOption::ShowDSConnectTable, 0,
         dialogsManager.data(), SLOT(showDomainConnectionDialog()));
+    addActionToQMenuAndActionHash(networkMenu, MenuOption::BandwidthDetails, 0,
+        dialogsManager.data(), SLOT(bandwidthDetails()));
 
-    // Developer > Timing and Stats >>>
-    MenuWrapper* timingMenu = developerMenu->addMenu("Timing and Stats");
+
+    // Developer > Timing >>>
+    MenuWrapper* timingMenu = developerMenu->addMenu("Timing");
     MenuWrapper* perfTimerMenu = timingMenu->addMenu("Performance Timer");
     addCheckableActionToQMenuAndActionHash(perfTimerMenu, MenuOption::DisplayDebugTimingDetails, 0, false);
     addCheckableActionToQMenuAndActionHash(perfTimerMenu, MenuOption::OnlyDisplayTopTen, 0, true);
@@ -534,7 +536,6 @@ Menu::Menu() {
     addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::PipelineWarnings);
     addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::LogExtraTimings);
     addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::SuppressShortTimings);
-    addCheckableActionToQMenuAndActionHash(timingMenu, MenuOption::ShowRealtimeEntityStats);
 
     // Developer > Audio >>>
     MenuWrapper* audioDebugMenu = developerMenu->addMenu("Audio");
@@ -571,6 +572,10 @@ Menu::Menu() {
         audioScopeFramesGroup->addAction(fiftyFrames);
     }
 
+    // Developer > Audio > Audio Network Stats...
+    addActionToQMenuAndActionHash(audioDebugMenu, MenuOption::AudioNetworkStats, 0,
+        dialogsManager.data(), SLOT(audioStatsDetails()));
+
     // Developer > Physics >>>
     MenuWrapper* physicsOptionsMenu = developerMenu->addMenu("Physics");
     addCheckableActionToQMenuAndActionHash(physicsOptionsMenu, MenuOption::PhysicsShowOwned);
@@ -588,22 +593,6 @@ Menu::Menu() {
     // Developer > Stats
     addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::Stats);
 
-    // Developer > Audio Stats...
-    addActionToQMenuAndActionHash(developerMenu, MenuOption::AudioNetworkStats, 0,
-        dialogsManager.data(), SLOT(audioStatsDetails()));
-
-    // Developer > Bandwidth Stats...
-    addActionToQMenuAndActionHash(developerMenu, MenuOption::BandwidthDetails, 0,
-        dialogsManager.data(), SLOT(bandwidthDetails()));
-
-    // Developer > Entity Stats...
-    addActionToQMenuAndActionHash(developerMenu, MenuOption::OctreeStats, 0,
-        dialogsManager.data(), SLOT(octreeStatsDetails()));
-
-    // Developer > World Axes
-    addCheckableActionToQMenuAndActionHash(developerMenu, MenuOption::WorldAxes);
-
-
 
 #if 0 ///  -------------- REMOVED FOR NOW --------------
     addDisabledActionAndSeparator(navigateMenu, "History");

interface/src/Menu.h

@@ -156,6 +156,7 @@ namespace MenuOption {
     const QString AssetMigration = "ATP Asset Migration";
     const QString Atmosphere = "Atmosphere";
     const QString Attachments = "Attachments...";
+    const QString AudioNetworkStats = "Audio Network Stats";
     const QString AudioNoiseReduction = "Audio Noise Reduction";
     const QString AudioScope = "Show Scope";
     const QString AudioScopeFiftyFrames = "Fifty";
@@ -163,8 +164,8 @@ namespace MenuOption {
     const QString AudioScopeFrames = "Display Frames";
     const QString AudioScopePause = "Pause Scope";
     const QString AudioScopeTwentyFrames = "Twenty";
-    const QString AudioNetworkStats = "Audio Network Stats";
     const QString AudioStatsShowInjectedStreams = "Audio Stats Show Injected Streams";
+    const QString AudioTools = "Show Level Meter";
     const QString AutoMuteAudio = "Auto Mute Microphone";
     const QString AvatarReceiveStats = "Show Receive Stats";
     const QString Back = "Back";

interface/src/ui/AvatarInputs.cpp

@@ -67,6 +67,7 @@ void AvatarInputs::update() {
     AI_UPDATE(cameraEnabled, !Menu::getInstance()->isOptionChecked(MenuOption::NoFaceTracking));
     AI_UPDATE(cameraMuted, Menu::getInstance()->isOptionChecked(MenuOption::MuteFaceTracking));
     AI_UPDATE(isHMD, qApp->isHMDMode());
+    AI_UPDATE(showAudioTools, Menu::getInstance()->isOptionChecked(MenuOption::AudioTools));
 
     auto audioIO = DependencyManager::get<AudioClient>();
     const float AUDIO_METER_AVERAGING = 0.5;

interface/src/ui/AvatarInputs.h

@@ -17,7 +17,7 @@
 public: \
     type name() { return _##name; }; \
 private: \
-    type _##name{ initialValue }; 
+    type _##name{ initialValue };
 
 class AvatarInputs : public QQuickItem {
     Q_OBJECT
@@ -31,6 +31,7 @@ class AvatarInputs : public QQuickItem {
     AI_PROPERTY(bool, mirrorVisible, false)
     AI_PROPERTY(bool, mirrorZoomed, true)
     AI_PROPERTY(bool, isHMD, false)
+    AI_PROPERTY(bool, showAudioTools, true)
 
 public:
     static AvatarInputs* getInstance();
@@ -46,6 +47,7 @@ signals:
     void mirrorVisibleChanged();
     void mirrorZoomedChanged();
     void isHMDChanged();
+    void showAudioToolsChanged();
 
 protected:
     Q_INVOKABLE void resetSensors();