Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-10 10:34:56 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1155 from digisomni/fix/kick-pal

Browse source 
Update Pal.qml for new Ban button
This commit is contained in:
Kalila 2021-04-05 02:43:59 -04:00 committed by GitHub
commit 1751a59c00
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -478,7 +478,7 @@ Rectangle {
visible: iAmAdmin;
role: "mute";
title: "SILENCE";
width: actionButtonWidth;
width: actionButtonWidth - 8;
movable: false;
resizable: false;
}
@ -608,7 +608,7 @@ Rectangle {
enabled: !nameCard.isReplicated;
anchors.verticalCenter: itemCell.verticalCenter;
anchors.left: parent.left;
anchors.leftMargin: styleData.role === "kick" ? 4 : 18;
anchors.leftMargin: styleData.role === "kick" ? 1 : 14;
width: 32;
height: 32;
onClicked: {
@ -640,7 +640,7 @@ Rectangle {
enabled: !nameCard.isReplicated;
anchors.verticalCenter: itemCell.verticalCenter;
anchors.left: parent.left;
anchors.leftMargin: actionButton.width + 14;
anchors.leftMargin: actionButton.width + 3;
width: 32;
height: 32;
onClicked: {
@ -755,7 +755,8 @@ Rectangle {
onClicked: letterbox(hifi.glyphs.question,
"Admin Actions",
"<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 (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";
onExited: adminHelpText.color = hifi.colors.redHighlight;
}