prep audio menu

This commit is contained in:
Zach Pomerantz 2017-06-05 16:24:00 -04:00
parent 7cb38d22c3
commit d8815d1dce
4 changed files with 48 additions and 12 deletions

View file

@ -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

View file

@ -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 {
}
}
}
*/

View file

@ -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 {}
}

View file

@ -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);
});