diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml index a600d1b59f..3183f8b6ce 100644 --- a/interface/resources/qml/hifi/NameCard.qml +++ b/interface/resources/qml/hifi/NameCard.qml @@ -18,11 +18,16 @@ Row { // Spacing spacing: 10; // Anchors - anchors.topMargin: 10; - anchors.leftMargin: 10; - anchors.verticalCenter: parent.verticalCenter; + anchors.top: parent.top; + anchors { + topMargin: (parent.height - contentHeight)/2; + bottomMargin: (parent.height - contentHeight)/2; + leftMargin: 10; + rightMargin: 10; + } // Properties + property int contentHeight: 50; property string displayName: ""; property string userName: ""; property int displayTextHeight: 18; @@ -31,8 +36,8 @@ Row { Column { id: avatarImage; // Size - width: 50; - height: width; + height: contentHeight; + width: height; Rectangle { radius: parent.width*0.5; color: "#AAA5AD"; @@ -44,12 +49,11 @@ Row { Column { id: textContainer; // Size - width: parent.width - avatarImage.width - parent.anchors.leftMargin*2 - parent.spacing; - // Anchors - anchors.verticalCenter: parent.verticalCenter; + width: parent.width - avatarImage.width - parent.anchors.leftMargin - parent.anchors.rightMargin - parent.spacing; + height: contentHeight; // DisplayName Text - RalewaySemiBold { + FiraSansSemiBold { id: displayNameText; // Properties text: thisNameCard.displayName; @@ -63,7 +67,7 @@ Row { } // UserName Text - RalewayLight { + FiraSansSemiBold { id: userNameText; // Properties text: thisNameCard.userName; @@ -84,11 +88,11 @@ Row { } // VU Meter - Hifi.AvatarInputs { + Rectangle { id: nameCardVUMeter; objectName: "AvatarInputs"; width: parent.width; - height: 30; + height: 4; // Avatar Audio VU Meter Item { id: controls; diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index 1c7fa067f6..a977a77f64 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -28,6 +28,8 @@ import QtQuick 2.5 import QtQuick.Controls 1.4 +import "../styles-uit" +import "../controls-uit" as HifiControls Rectangle { id: pal; @@ -35,10 +37,10 @@ Rectangle { width: parent.width; height: parent.height; // Properties - property int myCardHeight: 75; - property int rowHeight: 65; - property int separatorColWidth: 30; - property int actionButtonWidth: 50; + property int myCardHeight: 70; + property int rowHeight: 70; + property int separatorColWidth: 10; + property int actionButtonWidth: 55; property int nameCardWidth: width - separatorColWidth- actionButtonWidth*(table.columnCount - 2); // "-2" for Name and Separator cols; // This contains the current user's NameCard and will contain other information in the future @@ -50,8 +52,6 @@ Rectangle { // Anchors anchors.top: pal.top; anchors.left: pal.left; - anchors.topMargin: 10; - anchors.bottomMargin: anchors.topMargin; // This NameCard refers to the current user's NameCard (the one above the table) NameCard { id: myCard; @@ -66,7 +66,7 @@ Rectangle { } } // This TableView refers to the table (below the current user's NameCard) - TableView { + HifiControls.Table { id: table; // Size height: pal.height - myInfo.height; @@ -81,29 +81,41 @@ Rectangle { TableViewColumn { role: "displayName"; - title: "Name"; - width: nameCardWidth + title: "NAMES"; + width: nameCardWidth; + movable: false; + } + TableViewColumn { + role: "personalMute"; + title: "MUTE" + width: actionButtonWidth; + movable: false; } TableViewColumn { role: "ignore"; - title: "Ignore" - width: actionButtonWidth + title: "IGNORE"; + width: actionButtonWidth; + movable: false; } TableViewColumn { title: ""; - width: separatorColWidth + width: separatorColWidth; + resizable: false; + movable: false; } TableViewColumn { visible: iAmAdmin; role: "mute"; - title: "Mute"; - width: actionButtonWidth + title: "SILENCE"; + width: actionButtonWidth; + movable: false; } TableViewColumn { visible: iAmAdmin; role: "kick"; - title: "Ban" - width: actionButtonWidth + title: "BAN" + width: actionButtonWidth; + movable: false; } model: userModel; @@ -127,9 +139,6 @@ Rectangle { id: itemCell; property bool isCheckBox: typeof(styleData.value) === 'boolean'; property bool isSeparator: styleData.value === ''; - // Anchors - anchors.topMargin: 10; - anchors.bottomMargin: anchors.topMargin; // This NameCard refers to the cell that contains an avatar's // DisplayName and UserName NameCard { @@ -248,7 +257,7 @@ Rectangle { datum[property] = false; } } - ['ignore', 'spacer', 'mute', 'kick'].forEach(init); + ['personalMute', 'ignore', 'spacer', 'mute', 'kick'].forEach(init); datum.userIndex = userIndex++; userModel.append(datum); }); diff --git a/scripts/system/pal.js b/scripts/system/pal.js index e5d28e4174..916556fdd7 100644 --- a/scripts/system/pal.js +++ b/scripts/system/pal.js @@ -79,7 +79,7 @@ ExtendedOverlay.applyPickRay = function (pickRay, cb) { // cb(overlay) on the on var pal = new OverlayWindow({ title: 'People Action List', source: 'hifi/Pal.qml', - width: 480, + width: 580, height: 640, visible: false }); @@ -144,7 +144,8 @@ function usernameFromIDReply(id, username, machineFingerprint) { // Set the data to contain specific strings. data = ['', username] } else { - // Set the data to contain the ID and the username+ID concat string. + // Set the data to contain the ID and the username (if we have one) + // or fingerprint (if we don't have a username) string. data = [id, username || machineFingerprint]; } print('Username Data:', JSON.stringify(data));