diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml index 88ecededd1..f547975533 100644 --- a/interface/resources/qml/hifi/NameCard.qml +++ b/interface/resources/qml/hifi/NameCard.qml @@ -91,7 +91,7 @@ Item { enabled: selected || isMyCard; hoverEnabled: enabled onClicked: { - userInfoViewer.url = "http://highfidelity.com/users/" + userName; + userInfoViewer.url = defaultBaseUrl + "/users/" + userName; userInfoViewer.visible = true; } } @@ -116,12 +116,12 @@ Item { id: myDisplayName visible: isMyCard // Size - width: parent.width - avatarImage.width - anchors.leftMargin*2 - anchors.rightMargin; + width: parent.width - avatarImage.width - anchors.leftMargin - anchors.rightMargin*2; height: 40 // Anchors anchors.top: avatarImage.top anchors.left: avatarImage.right - anchors.leftMargin: 5; + anchors.leftMargin: avatarImage.visible ? 5 : 0; anchors.rightMargin: 5; // Style color: myDisplayNameMouseArea.containsMouse ? hifi.colors.lightGrayText : hifi.colors.textFieldLightBackground @@ -293,7 +293,7 @@ Item { FiraSansRegular { id: userNameText // Properties - text: thisNameCard.userName + text: thisNameCard.userName === "Unknown user" ? "not logged in" : thisNameCard.userName; elide: Text.ElideRight visible: thisNameCard.userName !== ""; // Size diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index 43e874dc57..762a0a14c7 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -941,7 +941,7 @@ Rectangle { Rectangle { id: navigationContainer; visible: userInfoViewer.visible; - height: 75; + height: 70; anchors { top: parent.top; left: parent.left; @@ -1018,7 +1018,7 @@ Rectangle { left: parent.left; right: parent.right; } - height: 25; + height: 30; width: parent.width; FiraSansRegular { @@ -1125,6 +1125,7 @@ Rectangle { break; case 'connections': var data = message.params; + console.log('Got connection data: ', JSON.stringify(data)); connectionsUserModelData = data; sortConnectionsModel(); connectionsLoading.visible = false; diff --git a/scripts/system/pal.js b/scripts/system/pal.js index ff0fb80c4d..ec0d19962c 100644 --- a/scripts/system/pal.js +++ b/scripts/system/pal.js @@ -261,6 +261,7 @@ function fromQml(message) { // messages are {method, params}, like json-rpc. See UserActivityLogger.palAction("refresh_nearby", ""); break; case 'refreshConnections': + print('Refreshing Connections...'); getConnectionData(); UserActivityLogger.palAction("refresh_connections", ""); break;