diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml
index 745c100202..6fa3a46dca 100644
--- a/interface/resources/qml/hifi/NameCard.qml
+++ b/interface/resources/qml/hifi/NameCard.qml
@@ -221,9 +221,9 @@ Item {
anchors.fill: parent
acceptedButtons: Qt.LeftButton
hoverEnabled: true
- onClicked: letterbox("This user is an admin on this domain. Admins can Silence and Ban other users at their discretion - so be extra nice!",
- hifi.glyphs.question,
- "Domain Admin")
+ onClicked: letterbox(hifi.glyphs.question,
+ "Domain Admin",
+ "This user is an admin on this domain. Admins can Silence and Ban other users at their discretion - so be extra nice!")
onEntered: adminLabelQuestionMarkText.color = "#94132e"
onExited: adminLabelQuestionMarkText.color = hifi.colors.redHighlight
}
diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml
index fe14016931..0c4b26a1fe 100644
--- a/interface/resources/qml/hifi/Pal.qml
+++ b/interface/resources/qml/hifi/Pal.qml
@@ -41,10 +41,10 @@ Rectangle {
id: letterboxMessage
z: 999 // Force the popup on top of everything else
}
- function letterbox(message, headerGlyph, headerText) {
- letterboxMessage.text = message
+ function letterbox(headerGlyph, headerText, message) {
letterboxMessage.headerGlyph = headerGlyph
letterboxMessage.headerText = headerText
+ letterboxMessage.text = message
letterboxMessage.visible = true
letterboxMessage.popupRadius = 0
}
@@ -372,11 +372,11 @@ Rectangle {
anchors.fill: parent
acceptedButtons: Qt.LeftButton
hoverEnabled: true
- onClicked: letterbox("Bold names in the list are avatar display names.
" +
+ onClicked: letterbox(hifi.glyphs.question,
+ "Display Names",
+ "Bold names in the list are avatar display names.
" +
"If a display name isn't set, a unique session display name is assigned." +
- "
Administrators of this domain can also see the username or machine ID associated with each avatar present.",
- hifi.glyphs.question,
- "Display Names")
+ "
Administrators of this domain can also see the username or machine ID associated with each avatar present.")
onEntered: helpText.color = hifi.colors.baseGrayHighlight
onExited: helpText.color = hifi.colors.darkGray
}
@@ -405,10 +405,10 @@ Rectangle {
anchors.fill: parent
acceptedButtons: Qt.LeftButton
hoverEnabled: true
- onClicked: letterbox("Silence mutes a user's microphone. Silenced users can unmute themselves by clicking "UNMUTE" on their toolbar.
" +
- "Ban 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")
+ onClicked: letterbox(hifi.glyphs.question,
+ "Admin Actions",
+ "Silence mutes a user's microphone. Silenced users can unmute themselves by clicking "UNMUTE" on their toolbar.
" +
+ "Ban removes a user from this domain and prevents them from returning. Admins can un-ban users from the Sandbox Domain Settings page.")
onEntered: adminHelpText.color = "#94132e"
onExited: adminHelpText.color = hifi.colors.redHighlight
}
@@ -453,9 +453,9 @@ Rectangle {
var selected = message.params[1];
var userIndex = findSessionIndex(sessionIds[0]);
if (sessionIds.length > 1) {
- letterbox('Only one user can be selected at a time.', "", "");
+ letterbox("", "", 'Only one user can be selected at a time.');
} else if (userIndex < 0) {
- letterbox('The last editor is not among this list of users.', "", "");
+ letterbox("", "", 'The last editor is not among this list of users.');
} else {
if (selected) {
table.selection.clear(); // for now, no multi-select