Mirrors/overte-JulianGro
3
0
Fork 0
mirror of https://github.com/JulianGro/overte.git synced 2025-08-09 15:18:52 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'tablet-ui' of github.com:highfidelity/hifi into tablet-ui-reenable-web-lasers

Browse source
This commit is contained in:
Seth Alves 2017-01-05 14:35:14 -08:00
commit bacaadc7ca
3 changed files with 19 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/tablet/TabletButton.qml
View file

@ -6,6 +6,8 @@ Item {
property var uuid; property var uuid;
property string text: "EDIT" property string text: "EDIT"
property string icon: "icons/edit-icon.svg" property string icon: "icons/edit-icon.svg"
property string activeText: tabletButton.text
property string activeIcon: tabletButton.icon
property bool isActive: false property bool isActive: false
property bool inDebugMode: false property bool inDebugMode: false
property bool isEntered: false property bool isEntered: false
@ -170,12 +172,18 @@ Item {
PropertyChanges { PropertyChanges {
target: text target: text
color: "#333333" color: "#333333"
text: tabletButton.activeText
} }
PropertyChanges { PropertyChanges {
target: iconColorOverlay target: iconColorOverlay
color: "#333333" color: "#333333"
} }
PropertyChanges {
target: icon
source: "../../../" + tabletButton.activeIcon
}
}, },
State { State {
name: "hover active state" name: "hover active state"

9
scripts/system/mute.js
View file

@ -15,16 +15,15 @@
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
function muteURL() {
return "icons/tablet-icons/" + (AudioDevice.getMuted() ? "mic-a.svg" : "mic-i.svg");
}
var button = tablet.addButton({ var button = tablet.addButton({
icon: "icons/tablet-icons/mic-a.svg", icon: "icons/tablet-icons/mic-a.svg",
text: "MUTE" text: "MUTE",
activeIcon: "icons/tablet-icons/mic-i.svg",
activeText: "UNMUTE"
}); });
function onMuteToggled() { function onMuteToggled() {
button.editProperties({icon: muteURL()}); button.editProperties({isActive: AudioDevice.getMuted()});
} }
onMuteToggled(); onMuteToggled();
function onClicked(){ function onClicked(){

16
scripts/system/tablet-ui/tabletUI.js
View file

@ -46,6 +46,12 @@
} }
function updateShowTablet() { function updateShowTablet() {
if (tabletShown) {
var currentMicLevel = getMicLevel();
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
tablet.updateAudioBar(currentMicLevel);
}
if (HMD.showTablet && !tabletShown) { if (HMD.showTablet && !tabletShown) {
showTabletUI(); showTabletUI();
} else if (!HMD.showTablet && tabletShown) { } else if (!HMD.showTablet && tabletShown) {
@ -60,8 +66,7 @@
Messages.subscribe("toggleHand"); Messages.subscribe("toggleHand");
Messages.messageReceived.connect(toggleHand); Messages.messageReceived.connect(toggleHand);
Script.update.connect(updateShowTablet); Script.setInterval(updateShowTablet, 100);
// Script.setInterval(updateShowTablet, 1000);
// Initialise variables used to calculate audio level // Initialise variables used to calculate audio level
var accumulatedLevel = 0.0; var accumulatedLevel = 0.0;
@ -90,12 +95,5 @@
return micLevel; return micLevel;
} }
Script.setInterval(function() {
if (tabletShown) {
var currentMicLevel = getMicLevel();
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");
tablet.updateAudioBar(currentMicLevel);
}
}, MIC_LEVEL_UPDATE_INTERVAL_MS);
}()); // END LOCAL_SCOPE }()); // END LOCAL_SCOPE