mirror of
https://github.com/overte-org/overte.git
synced 2025-07-29 21:34:53 +02:00
Merge pull request #1155 from digisomni/fix/kick-pal
Update Pal.qml for new Ban button
This commit is contained in:
commit
1751a59c00
1 changed files with 5 additions and 4 deletions
|
@ -478,7 +478,7 @@ Rectangle {
|
||||||
visible: iAmAdmin;
|
visible: iAmAdmin;
|
||||||
role: "mute";
|
role: "mute";
|
||||||
title: "SILENCE";
|
title: "SILENCE";
|
||||||
width: actionButtonWidth;
|
width: actionButtonWidth - 8;
|
||||||
movable: false;
|
movable: false;
|
||||||
resizable: false;
|
resizable: false;
|
||||||
}
|
}
|
||||||
|
@ -608,7 +608,7 @@ Rectangle {
|
||||||
enabled: !nameCard.isReplicated;
|
enabled: !nameCard.isReplicated;
|
||||||
anchors.verticalCenter: itemCell.verticalCenter;
|
anchors.verticalCenter: itemCell.verticalCenter;
|
||||||
anchors.left: parent.left;
|
anchors.left: parent.left;
|
||||||
anchors.leftMargin: styleData.role === "kick" ? 4 : 18;
|
anchors.leftMargin: styleData.role === "kick" ? 1 : 14;
|
||||||
width: 32;
|
width: 32;
|
||||||
height: 32;
|
height: 32;
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
@ -640,7 +640,7 @@ Rectangle {
|
||||||
enabled: !nameCard.isReplicated;
|
enabled: !nameCard.isReplicated;
|
||||||
anchors.verticalCenter: itemCell.verticalCenter;
|
anchors.verticalCenter: itemCell.verticalCenter;
|
||||||
anchors.left: parent.left;
|
anchors.left: parent.left;
|
||||||
anchors.leftMargin: actionButton.width + 14;
|
anchors.leftMargin: actionButton.width + 3;
|
||||||
width: 32;
|
width: 32;
|
||||||
height: 32;
|
height: 32;
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
@ -755,7 +755,8 @@ Rectangle {
|
||||||
onClicked: letterbox(hifi.glyphs.question,
|
onClicked: letterbox(hifi.glyphs.question,
|
||||||
"Admin Actions",
|
"Admin Actions",
|
||||||
"<b>Silence</b> mutes a user's microphone. Silenced users can unmute themselves by clicking "UNMUTE" on their toolbar.<br><br>" +
|
"<b>Silence</b> mutes a user's microphone. Silenced users can unmute themselves by clicking "UNMUTE" 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 (left)</b> identifies a user by username (if applicable) and machine fingerprint, then removes them from this domain and prevents them from returning. Admins can un-ban users from the Server Domain Settings page.<br><br>" +
|
||||||
|
"<b>Hard Ban (right)</b> identifies a user by username (if applicable), machine fingerprint, and IP address, then removes them from this domain and prevents them from returning. Admins can un-ban users from the Server Domain Settings page.");
|
||||||
onEntered: adminHelpText.color = "#94132e";
|
onEntered: adminHelpText.color = "#94132e";
|
||||||
onExited: adminHelpText.color = hifi.colors.redHighlight;
|
onExited: adminHelpText.color = hifi.colors.redHighlight;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue