diff --git a/interface/resources/icons/tablet-icons/users-i.svg b/interface/resources/icons/tablet-icons/users-i.svg new file mode 100644 index 0000000000..aa34dd35f9 --- /dev/null +++ b/interface/resources/icons/tablet-icons/users-i.svg @@ -0,0 +1,30 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/interface/resources/qml/hifi/tablet/Tablet.qml b/interface/resources/qml/hifi/tablet/Tablet.qml index 128b3a1fd6..8f0b591da8 100644 --- a/interface/resources/qml/hifi/tablet/Tablet.qml +++ b/interface/resources/qml/hifi/tablet/Tablet.qml @@ -76,86 +76,75 @@ Item { anchors.topMargin: 0 anchors.top: parent.top - Row { - id: rowAudio1 - height: parent.height - anchors.topMargin: 0 - anchors.top: parent.top - anchors.leftMargin: 30 + + Image { + id: muteIcon + width: 40 + height: 40 + source: "../../../icons/tablet-mute-icon.svg" + anchors.verticalCenter: parent.verticalCenter + } + + Item { + id: item1 + width: 170 + height: 10 anchors.left: parent.left - anchors.rightMargin: 30 - anchors.right: parent.right - spacing: 5 - - Image { - id: muteIcon - width: 40 - height: 40 - source: "../../../icons/tablet-mute-icon.svg" - anchors.verticalCenter: parent.verticalCenter + anchors.leftMargin: 50 + anchors.verticalCenter: parent.verticalCenter + Rectangle { + id: audioBarBase + color: "#333333" + radius: 5 + anchors.fill: parent } - - Item { - id: item1 - width: 170 - height: 10 + Rectangle { + id: audioBarMask + width: parent.width * tablet.micLevel + color: "#333333" + radius: 5 + anchors.bottom: parent.bottom + anchors.bottomMargin: 0 + anchors.top: parent.top + anchors.topMargin: 0 anchors.left: parent.left - anchors.leftMargin: 50 - anchors.verticalCenter: parent.verticalCenter - Rectangle { - id: audioBarBase - color: "#333333" - radius: 5 - anchors.fill: parent - } - Rectangle { - id: audioBarMask - width: parent.width * tablet.micLevel - color: "#333333" - radius: 5 - anchors.bottom: parent.bottom - anchors.bottomMargin: 0 - anchors.top: parent.top - anchors.topMargin: 0 - anchors.left: parent.left - anchors.leftMargin: 0 - } - LinearGradient { - anchors.fill: audioBarMask - source: audioBarMask - start: Qt.point(0, 0) - end: Qt.point(170, 0) - gradient: Gradient { - GradientStop { - position: 0 - color: "#2c8e72" - } - GradientStop { - position: 0.8 - color: "#1fc6a6" - } - GradientStop { - position: 0.81 - color: "#ea4c5f" - } - GradientStop { - position: 1 - color: "#ea4c5f" - } + anchors.leftMargin: 0 + } + LinearGradient { + anchors.fill: audioBarMask + source: audioBarMask + start: Qt.point(0, 0) + end: Qt.point(170, 0) + gradient: Gradient { + GradientStop { + position: 0 + color: "#2c8e72" + } + GradientStop { + position: 0.8 + color: "#1fc6a6" + } + GradientStop { + position: 0.81 + color: "#ea4c5f" + } + GradientStop { + position: 1 + color: "#ea4c5f" } } } + } - RalewaySemiBold { - id: usernameText - text: tablet.parent.parent.username - anchors.verticalCenter: parent.verticalCenter - anchors.right: parent.right - anchors.rightMargin: 0 - horizontalAlignment: Text.AlignRight - font.pixelSize: 20 - color: "#afafaf" - } + RalewaySemiBold { + id: usernameText + text: tablet.parent.parent.username + anchors.verticalCenter: parent.verticalCenter + anchors.right: parent.right + anchors.rightMargin: 20 + horizontalAlignment: Text.AlignRight + font.pixelSize: 20 + color: "#afafaf" } } diff --git a/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml b/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml index 8b1a62e0ed..32e34e279b 100644 --- a/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml +++ b/interface/resources/qml/hifi/tablet/TabletMouseHandler.qml @@ -63,7 +63,9 @@ Item { result.append({"name": item.title, "item": item}) break; case MenuItemType.Item: - result.append({"name": item.text, "item": item}) + if (item.text !== "Users Online") { + result.append({"name": item.text, "item": item}) + } break; case MenuItemType.Separator: result.append({"name": "", "item": item}) diff --git a/scripts/defaultScripts.js b/scripts/defaultScripts.js index bd3131f4ff..bb96fe96cf 100644 --- a/scripts/defaultScripts.js +++ b/scripts/defaultScripts.js @@ -14,13 +14,17 @@ var DEFAULT_SCRIPTS = [ "system/progress.js", "system/away.js", - "system/users.js", "system/mute.js", - "system/goto.js", "system/hmd.js", + "system/menu.js", + "system/bubble.js", + "system/snapshot.js", + "system/help.js", + "system/pal.js", //"system/mod.js", // older UX, if you prefer + "system/goto.js", "system/marketplaces/marketplaces.js", "system/edit.js", - "system/pal.js", //"system/mod.js", // older UX, if you prefer + "system/users.js", "system/selectAudioDevice.js", "system/notifications.js", "system/controllers/controllerDisplayManager.js", @@ -32,11 +36,7 @@ var DEFAULT_SCRIPTS = [ "system/controllers/toggleAdvancedMovementForHandControllers.js", "system/dialTone.js", "system/firstPersonHMD.js", - "system/snapshot.js", - "system/help.js", - "system/bubble.js", - "system/tablet-ui/tabletUI.js", - "system/menu.js" + "system/tablet-ui/tabletUI.js" ]; // add a menu item for debugging diff --git a/scripts/system/users.js b/scripts/system/users.js index ce795b38e5..369d1399eb 100644 --- a/scripts/system/users.js +++ b/scripts/system/users.js @@ -34,7 +34,7 @@ if (Settings.getValue("HUDUIEnabled")) { } else { tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); button = tablet.addButton({ - icon: "icons/tablet-icons/people-i.svg", + icon: "icons/tablet-icons/users-i.svg", text: "Users", isActive: Menu.isOptionChecked(MENU_ITEM) });