Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-11 01:53:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9306 from zfox23/PALVisualUpdates

Browse source 
Fix PAL scrollbar; add helper popup to ADMIN tab
This commit is contained in:
Howard Stearns 2017-01-05 13:29:21 -08:00 committed by GitHub
commit 28326ff47a
2 changed files with 71 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -104,6 +104,7 @@ Item {
border.width: 2 border.width: 2
// "ADMIN" text // "ADMIN" text
RalewaySemiBold { RalewaySemiBold {
id: adminTabText
text: "ADMIN" text: "ADMIN"
// Text size // Text size
size: hifi.fontSizes.tableHeading + 2 size: hifi.fontSizes.tableHeading + 2
@ -325,7 +326,7 @@ Item {
visible: iAmAdmin visible: iAmAdmin
color: hifi.colors.lightGrayText color: hifi.colors.lightGrayText
} }
// This Rectangle refers to the [?] popup button // This Rectangle refers to the [?] popup button next to "NAMES"
Rectangle { Rectangle {
color: hifi.colors.tableBackgroundLight color: hifi.colors.tableBackgroundLight
width: 20 width: 20
@ -353,7 +354,36 @@ Item {
onExited: helpText.color = hifi.colors.darkGray onExited: helpText.color = hifi.colors.darkGray
} }
} }
// Explanitory popup upon clicking "[?]" // This Rectangle refers to the [?] popup button next to "ADMIN"
Rectangle {
visible: iAmAdmin
color: adminTab.color
width: 20
height: 28
anchors.right: adminTab.right
anchors.rightMargin: 31
anchors.top: adminTab.top
anchors.topMargin: 2
RalewayRegular {
id: adminHelpText
text: "[?]"
size: hifi.fontSizes.tableHeading + 2
font.capitalization: Font.AllUppercase
color: hifi.colors.redHighlight
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
anchors.fill: parent
}
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.LeftButton
hoverEnabled: true
onClicked: adminPopup.visible = true
onEntered: adminHelpText.color = "#94132e"
onExited: adminHelpText.color = hifi.colors.redHighlight
}
}
// Explanitory popup upon clicking "[?]" next to "NAMES"
Item { Item {
visible: false visible: false
id: namesPopup id: namesPopup
@ -392,6 +422,44 @@ Item {
} }
} }
} }
// Explanitory popup upon clicking "[?]" next to "ADMIN"
Item {
visible: false
id: adminPopup
anchors.fill: pal
Rectangle {
anchors.fill: parent
color: "black"
opacity: 0.5
radius: hifi.dimensions.borderRadius
}
Rectangle {
width: Math.max(parent.width * 0.75, 400)
height: adminPopupText.contentHeight*1.5
anchors.centerIn: parent
radius: hifi.dimensions.borderRadius
color: "white"
FiraSansSemiBold {
id: adminPopupText
text: 'Silencing a user mutes their microphone. Silenced users can unmute themselves by clicking the "UNMUTE" button on their HUD.\n\n' +
"Banning a user will remove them from this domain and prevent them from returning. You can un-ban users from your domain's settings page."
size: hifi.fontSizes.textFieldInput
color: hifi.colors.darkGray
horizontalAlignment: Text.AlignHCenter
anchors.fill: parent
anchors.leftMargin: 15
anchors.rightMargin: 15
wrapMode: Text.WordWrap
}
}
MouseArea {
anchors.fill: parent
acceptedButtons: Qt.LeftButton
onClicked: {
adminPopup.visible = false
}
}
}
function findSessionIndex(sessionId, optionalData) { // no findIndex in .qml function findSessionIndex(sessionId, optionalData) { // no findIndex in .qml
var data = optionalData || userModelData, length = data.length; var data = optionalData || userModelData, length = data.length;

2
interface/resources/qml/styles-uit/HifiConstants.qml
View file

@ -95,7 +95,7 @@ Item {
readonly property color tableRowDarkEven: "#1c1c1c" // Equivalent to "#a6181818" over #404040 background readonly property color tableRowDarkEven: "#1c1c1c" // Equivalent to "#a6181818" over #404040 background
readonly property color tableBackgroundLight: tableRowLightEven readonly property color tableBackgroundLight: tableRowLightEven
readonly property color tableBackgroundDark: tableRowDarkEven readonly property color tableBackgroundDark: tableRowDarkEven
readonly property color tableScrollHandleLight: tableRowLightOdd readonly property color tableScrollHandleLight: "#8F8F8F"
readonly property color tableScrollHandleDark: "#707070" readonly property color tableScrollHandleDark: "#707070"
readonly property color tableScrollBackgroundLight: tableRowLightEven readonly property color tableScrollBackgroundLight: tableRowLightEven
readonly property color tableScrollBackgroundDark: "#323232" readonly property color tableScrollBackgroundDark: "#323232"