From d8815d1dce3ad8550e1a61443efc6fae78c63146 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zmp@umich.edu>
Date: Mon, 5 Jun 2017 16:24:00 -0400
Subject: [PATCH] prep audio menu

---
 .../qml/dialogs/PreferencesDialog.qml         |  3 ++
 interface/resources/qml/hifi/Audio.qml        | 23 ++++++++++++++
 .../resources/qml/hifi/dialogs/Audio.qml      | 30 ++++++++++++-------
 interface/src/Menu.cpp                        |  4 +--
 4 files changed, 48 insertions(+), 12 deletions(-)

diff --git a/interface/resources/qml/dialogs/PreferencesDialog.qml b/interface/resources/qml/dialogs/PreferencesDialog.qml
index e16f3aa12d..71d1a20f85 100644
--- a/interface/resources/qml/dialogs/PreferencesDialog.qml
+++ b/interface/resources/qml/dialogs/PreferencesDialog.qml
@@ -25,6 +25,7 @@ ScrollingWindow {
     height: 577
     property var sections: []
     property var showCategories: []
+    property bool showFooter: true
     minSize: Qt.vector2d(400, 500)
 
     HifiConstants { id: hifi }
@@ -94,6 +95,8 @@ ScrollingWindow {
     }
 
     footer: Row {
+        visible: root.showFooter
+
         anchors {
             top: parent.top
             right: parent.right
diff --git a/interface/resources/qml/hifi/Audio.qml b/interface/resources/qml/hifi/Audio.qml
index 66760ff290..12bf0afe65 100644
--- a/interface/resources/qml/hifi/Audio.qml
+++ b/interface/resources/qml/hifi/Audio.qml
@@ -17,9 +17,31 @@ import QtGraphicalEffects 1.0
 
 import "../styles-uit"
 import "../controls-uit" as HifiControls
+import "../windows"
 
 import "components"
 
+Rectangle {
+    id: audio;
+
+    HifiConstants { id: hifi; }
+
+    property var eventBridge;
+    property string title: "Audio Settings"
+    signal sendToScript(var message);
+
+    color: "#404040";
+
+    Text {
+        text: "ZZMP"
+    }
+
+    ListView {
+        model: Audio.devices.input
+    }
+}
+
+/*
 Rectangle {
     id: audio;
 
@@ -254,3 +276,4 @@ Rectangle {
         }
     }
 }
+*/
diff --git a/interface/resources/qml/hifi/dialogs/Audio.qml b/interface/resources/qml/hifi/dialogs/Audio.qml
index 20f6601288..0b3620f12e 100644
--- a/interface/resources/qml/hifi/dialogs/Audio.qml
+++ b/interface/resources/qml/hifi/dialogs/Audio.qml
@@ -1,11 +1,21 @@
-//
-//  Audio.qml
-//
-//  Created by Zach Pomerantz on 28/5/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 QtQuick 2.5
+import Qt.labs.settings 1.0
 
-// TODO
+import "../../dialogs"
+import "../"
+
+PreferencesDialog {
+    id: root
+    objectName: "AudioDialog"
+    title: "Audio Settings"
+    showFooter: false
+    property var settings: Settings {
+        category: root.objectName
+        property alias x: root.x
+        property alias y: root.y
+        property alias width: root.width
+        property alias height: root.height
+    }
+
+    Audio {}
+}
diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp
index 62f67a0beb..9bf4c934ba 100644
--- a/interface/src/Menu.cpp
+++ b/interface/src/Menu.cpp
@@ -290,8 +290,8 @@ Menu::Menu() {
     action = addActionToQMenuAndActionHash(settingsMenu, "Audio...");
     connect(action, &QAction::triggered, [] {
         static const QUrl widgetUrl("hifi/dialogs/Audio.qml");
-        static const QUrl tabletUrl("../../hifi/dialogs/Audio.qml");
-        static const QString name("Audio");
+        static const QUrl tabletUrl("../../hifi/Audio.qml");
+        static const QString name("AudioDialog");
         qApp->showDialog(widgetUrl, tabletUrl, name);
     });