From db22fa9eec728540f6f6ed32d3b52d1f9fd18bea Mon Sep 17 00:00:00 2001
From: Wayne Chen <wayne@highfidelity.io>
Date: Mon, 18 Mar 2019 09:22:06 -0700
Subject: [PATCH] show up audio screen using Settings > Audio

---
 .../resources/qml/hifi/dialogs/Audio.qml      | 27 -------------------
 interface/src/Menu.cpp                        | 10 ++++---
 2 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 interface/resources/qml/hifi/dialogs/Audio.qml

diff --git a/interface/resources/qml/hifi/dialogs/Audio.qml b/interface/resources/qml/hifi/dialogs/Audio.qml
deleted file mode 100644
index 4ce9e14c42..0000000000
--- a/interface/resources/qml/hifi/dialogs/Audio.qml
+++ /dev/null
@@ -1,27 +0,0 @@
-//
-// Audio.qml
-//
-// Created by Zach Pomerantz on 6/12/2017
-// Copyright 2017 High Fidelity, Inc.
-//
-//  Distributed under the Apache License, Version 2.0.
-//  See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
-//
-
-import "../../windows"
-import "../audio"
-
-ScrollingWindow {
-    id: root;
-
-    resizable: true;
-    destroyOnHidden: true;
-    width: 400;
-    height: 577;
-    minSize: Qt.vector2d(400, 500);
-
-    Audio { id: audio; width: root.width }
-
-    objectName: "AudioDialog";
-    title: audio.title;
-}
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 810e21daf5..394c07e842 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -270,10 +270,14 @@ Menu::Menu() {
     // Settings > Audio...
     action = addActionToQMenuAndActionHash(settingsMenu, "Audio...");
     connect(action, &QAction::triggered, [] {
-        static const QUrl widgetUrl("hifi/dialogs/Audio.qml");
         static const QUrl tabletUrl("hifi/audio/Audio.qml");
-        static const QString name("AudioDialog");
-        qApp->showDialog(widgetUrl, tabletUrl, name);
+        auto tablet = DependencyManager::get<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
+        auto hmd = DependencyManager::get<HMDScriptingInterface>();
+        tablet->pushOntoStack(tabletUrl);
+
+        if (!hmd->getShouldShowTablet()) {
+            hmd->toggleShouldShowTablet();
+        }
     });
 
     // Settings > Graphics...