Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-04-23 09:33:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Alan's feedback

Browse source
This commit is contained in:
Zach Fox 2017-01-17 17:58:01 -08:00
parent 9d19aa3c79
commit d067ba7dcc
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/LetterboxMessage.qml
View file

@ -33,7 +33,7 @@ Item {
}
Rectangle {
width: Math.max(parent.width * 0.75, 400)
height: childrenRect.height + 50
height: contentContainer.height + 50
anchors.centerIn: parent
radius: popupRadius
color: "white"

2
interface/resources/qml/hifi/NameCard.qml
View file

@ -261,7 +261,7 @@ Item {
Rectangle {
id: nameCardVUMeter
// Size
width: isMyCard ? myDisplayName.width - 20 : ((gainSlider.value - gainSlider.minimumValue)/(gainSlider.maximumValue - gainSlider.minimumValue)) * parent.width
width: isMyCard ? myDisplayName.width - 70 : ((gainSlider.value - gainSlider.minimumValue)/(gainSlider.maximumValue - gainSlider.minimumValue)) * parent.width
height: 8
// Anchors
anchors.top: userNameSpacer.bottom

10
interface/resources/qml/hifi/Pal.qml
View file

@ -372,9 +372,11 @@ Rectangle {
anchors.fill: parent
acceptedButtons: Qt.LeftButton
hoverEnabled: true
onClicked: letterbox("Bold names in the list are Avatar Display Names.\n" +
"If a Display Name isn't set, a unique Session Display Name is assigned." +
"\n\nAdministrators of this domain can also see the Username or Machine ID associated with each avatar present.", "", "")
onClicked: letterbox("Bold names in the list are <b>avatar display names</b>.<br>" +
"If a display name isn't set, a unique <b>session display name</b> is assigned." +
"<br><br>Administrators of this domain can also see the <b>username</b> or <b>machine ID</b> associated with each avatar present.",
hifi.glyphs.question,
"Display Names")
onEntered: helpText.color = hifi.colors.baseGrayHighlight
onExited: helpText.color = hifi.colors.darkGray
}
@ -404,7 +406,7 @@ Rectangle {
acceptedButtons: Qt.LeftButton
hoverEnabled: true
onClicked: letterbox("<b>Silence</b> mutes a user's microphone. Silenced users can unmute themselves by clicking &quot;UNMUTE&quot; on their toolbar.<br><br>" +
"<b>Ban</b> removes a user from this domain and prevents them from returning. Admins can un-ban users from the Sandbox Domain Settings Page.)",
"<b>Ban</b> removes a user from this domain and prevents them from returning. Admins can un-ban users from the Sandbox Domain Settings page.",
hifi.glyphs.question,
"Admin Actions")
onEntered: adminHelpText.color = "#94132e"