Mirrors/overte-Armored-Dragon
3
0
Fork 0
mirror of https://github.com/Armored-Dragon/overte.git synced 2025-03-11 16:13:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Cleanup

Browse source
This commit is contained in:
Zach Fox 2017-01-18 12:54:48 -08:00
parent e9d3c36873
commit f8dd7f5433
2 changed files with 15 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -221,9 +221,9 @@ Item {
anchors.fill: parent anchors.fill: parent
acceptedButtons: Qt.LeftButton acceptedButtons: Qt.LeftButton
hoverEnabled: true hoverEnabled: true
onClicked: letterbox("This user is an admin on this domain. Admins can <b>Silence</b> and <b>Ban</b> other users at their discretion - so be extra nice!", onClicked: letterbox(hifi.glyphs.question,
hifi.glyphs.question, "Domain Admin",
"Domain Admin") "This user is an admin on this domain. Admins can <b>Silence</b> and <b>Ban</b> other users at their discretion - so be extra nice!")
onEntered: adminLabelQuestionMarkText.color = "#94132e" onEntered: adminLabelQuestionMarkText.color = "#94132e"
onExited: adminLabelQuestionMarkText.color = hifi.colors.redHighlight onExited: adminLabelQuestionMarkText.color = hifi.colors.redHighlight
} }

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

@ -41,10 +41,10 @@ Rectangle {
id: letterboxMessage id: letterboxMessage
z: 999 // Force the popup on top of everything else z: 999 // Force the popup on top of everything else
} }
function letterbox(message, headerGlyph, headerText) { function letterbox(headerGlyph, headerText, message) {
letterboxMessage.text = message
letterboxMessage.headerGlyph = headerGlyph letterboxMessage.headerGlyph = headerGlyph
letterboxMessage.headerText = headerText letterboxMessage.headerText = headerText
letterboxMessage.text = message
letterboxMessage.visible = true letterboxMessage.visible = true
letterboxMessage.popupRadius = 0 letterboxMessage.popupRadius = 0
} }
@ -372,11 +372,11 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
acceptedButtons: Qt.LeftButton acceptedButtons: Qt.LeftButton
hoverEnabled: true hoverEnabled: true
onClicked: letterbox("Bold names in the list are <b>avatar display names</b>.<br>" + onClicked: letterbox(hifi.glyphs.question,
"Display Names",
"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." + "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.", "<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 onEntered: helpText.color = hifi.colors.baseGrayHighlight
onExited: helpText.color = hifi.colors.darkGray onExited: helpText.color = hifi.colors.darkGray
} }
@ -405,10 +405,10 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
acceptedButtons: Qt.LeftButton acceptedButtons: Qt.LeftButton
hoverEnabled: true 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>" + onClicked: letterbox(hifi.glyphs.question,
"<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.", "Admin Actions",
hifi.glyphs.question, "<b>Silence</b> mutes a user's microphone. Silenced users can unmute themselves by clicking &quot;UNMUTE&quot; on their toolbar.<br><br>" +
"Admin Actions") "<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.")
onEntered: adminHelpText.color = "#94132e" onEntered: adminHelpText.color = "#94132e"
onExited: adminHelpText.color = hifi.colors.redHighlight onExited: adminHelpText.color = hifi.colors.redHighlight
} }
@ -453,9 +453,9 @@ Rectangle {
var selected = message.params[1]; var selected = message.params[1];
var userIndex = findSessionIndex(sessionIds[0]); var userIndex = findSessionIndex(sessionIds[0]);
if (sessionIds.length > 1) { 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) { } 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 { } else {
if (selected) { if (selected) {
table.selection.clear(); // for now, no multi-select table.selection.clear(); // for now, no multi-select