From 9d19aa3c796eab7810e2129b9073fd38f071bcbe Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 17 Jan 2017 17:39:13 -0800 Subject: [PATCH] Checkpoint --- .../resources/qml/hifi/LetterboxMessage.qml | 112 +++++++++--------- interface/resources/qml/hifi/NameCard.qml | 4 +- interface/resources/qml/hifi/Pal.qml | 6 +- 3 files changed, 65 insertions(+), 57 deletions(-) diff --git a/interface/resources/qml/hifi/LetterboxMessage.qml b/interface/resources/qml/hifi/LetterboxMessage.qml index 4172939a8a..c1063ea61c 100644 --- a/interface/resources/qml/hifi/LetterboxMessage.qml +++ b/interface/resources/qml/hifi/LetterboxMessage.qml @@ -19,6 +19,7 @@ Item { property alias headerText: headerText.text property real popupRadius: hifi.dimensions.borderRadius property real headerTextPixelSize: 22 + property real popupTextPixelSize: 16 FontLoader { id: ralewayRegular; source: "../../fonts/Raleway-Regular.ttf"; } FontLoader { id: ralewaySemiBold; source: "../../fonts/Raleway-SemiBold.ttf"; } visible: false @@ -32,73 +33,76 @@ Item { } Rectangle { width: Math.max(parent.width * 0.75, 400) - height: contentContainer.height*1.5 + height: childrenRect.height + 50 anchors.centerIn: parent radius: popupRadius color: "white" - Item { + Column { id: contentContainer + width: parent.width - 60 anchors.centerIn: parent - anchors.margins: 20 - height: childrenRect.height - Item { + spacing: 20 + Row { id: popupHeaderContainer - visible: headerText.text !== "" || glyphText.text !== "" - // Size - width: parent.width - height: childrenRect.height - // Anchors - anchors.top: parent.top - anchors.left: parent.left - // Header Glyph - HiFiGlyphs { - id: headerGlyph - visible: headerText.text !== "" - // Text Size - size: headerTextPixelSize * 2.5 - // Anchors - anchors.top: parent.top - anchors.left: parent.left - anchors.rightMargin: 5 - // Style - horizontalAlignment: Text.AlignHCenter - verticalAlignment: Text.AlignVCenter - color: hifi.colors.darkGray + visible: headerText.text !== "" || headerGlyph.text !== "" + height: 30 + Column { + // Header Glyph + HiFiGlyphs { + id: headerGlyph + visible: headerGlyph.text !== "" + // Size + height: parent.parent.height + // Anchors + anchors.left: parent.left + anchors.leftMargin: -15 + // Text Size + size: headerTextPixelSize*2.5 + // Style + horizontalAlignment: Text.AlignHLeft + verticalAlignment: Text.AlignVCenter + color: hifi.colors.darkGray + } } + Column { + // Header Text + Text { + id: headerText + visible: headerText.text !== "" + // Size + height: parent.parent.height + // Anchors + anchors.left: parent.left + anchors.leftMargin: -15 + // Text Size + font.pixelSize: headerTextPixelSize + // Style + font.family: ralewaySemiBold.name + color: hifi.colors.darkGray + horizontalAlignment: Text.AlignHLeft + verticalAlignment: Text.AlignVCenter + wrapMode: Text.WordWrap + textFormat: Text.StyledText + } + } + } + Row { + // Popup Text Text { - id: headerText - visible: headerGlyph.text !== "" - // Text Size - font.pixelSize: headerTextPixelSize - // Anchors - anchors.top: parent.top - anchors.left: headerGlyph.right - // Style - font.family: ralewaySemiBold.name - color: hifi.colors.darkGray + id: popupText + // Size + width: parent.parent.width + // Text alignment verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter + horizontalAlignment: Text.AlignHLeft + // Style + font.pixelSize: popupTextPixelSize + font.family: ralewayRegular.name + color: hifi.colors.darkGray wrapMode: Text.WordWrap textFormat: Text.StyledText } } - Text { - id: popupText - // Anchors - anchors.top: popupHeaderContainer.visible ? popupHeaderContainer.anchors.bottom : parent.top - anchors.left: parent.left - anchors.right: parent.right - anchors.bottom: parent.bottom - // Text alignment - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignHCenter - // Style - font.pixelSize: hifi.fontSizes.textFieldInput - font.family: ralewayRegular.name - color: hifi.colors.darkGray - wrapMode: Text.WordWrap - textFormat: Text.StyledText - } } } MouseArea { diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml index 83cdcda504..c0b8d1c614 100644 --- a/interface/resources/qml/hifi/NameCard.qml +++ b/interface/resources/qml/hifi/NameCard.qml @@ -220,7 +220,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("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") 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 5277d97e2c..273fc0b73c 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -403,8 +403,10 @@ Rectangle { anchors.fill: parent acceptedButtons: Qt.LeftButton hoverEnabled: true - onClicked: letterbox('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.)", "", "") + 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") onEntered: adminHelpText.color = "#94132e" onExited: adminHelpText.color = hifi.colors.redHighlight }