Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 09:28:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merging from Pal_v2_Zach

Browse source
This commit is contained in:
Zach Fox 2017-03-14 14:05:50 -07:00
parent e3d0842ddc
commit 5da0dfc4ac
3 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
interface/resources/qml/hifi/NameCard.qml
View file

@ -91,7 +91,7 @@ Item {
enabled: selected || isMyCard; enabled: selected || isMyCard;
hoverEnabled: enabled hoverEnabled: enabled
onClicked: { onClicked: {
userInfoViewer.url = "http://highfidelity.com/users/" + userName; userInfoViewer.url = defaultBaseUrl + "/users/" + userName;
userInfoViewer.visible = true; userInfoViewer.visible = true;
} }
} }
@ -116,12 +116,12 @@ Item {
id: myDisplayName id: myDisplayName
visible: isMyCard visible: isMyCard
// Size // Size
width: parent.width - avatarImage.width - anchors.leftMargin*2 - anchors.rightMargin; width: parent.width - avatarImage.width - anchors.leftMargin - anchors.rightMargin*2;
height: 40 height: 40
// Anchors // Anchors
anchors.top: avatarImage.top anchors.top: avatarImage.top
anchors.left: avatarImage.right anchors.left: avatarImage.right
anchors.leftMargin: 5; anchors.leftMargin: avatarImage.visible ? 5 : 0;
anchors.rightMargin: 5; anchors.rightMargin: 5;
// Style // Style
color: myDisplayNameMouseArea.containsMouse ? hifi.colors.lightGrayText : hifi.colors.textFieldLightBackground color: myDisplayNameMouseArea.containsMouse ? hifi.colors.lightGrayText : hifi.colors.textFieldLightBackground
@ -293,7 +293,7 @@ Item {
FiraSansRegular { FiraSansRegular {
id: userNameText id: userNameText
// Properties // Properties
text: thisNameCard.userName text: thisNameCard.userName === "Unknown user" ? "not logged in" : thisNameCard.userName;
elide: Text.ElideRight elide: Text.ElideRight
visible: thisNameCard.userName !== ""; visible: thisNameCard.userName !== "";
// Size // Size

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

@ -941,7 +941,7 @@ Rectangle {
Rectangle { Rectangle {
id: navigationContainer; id: navigationContainer;
visible: userInfoViewer.visible; visible: userInfoViewer.visible;
height: 75; height: 70;
anchors { anchors {
top: parent.top; top: parent.top;
left: parent.left; left: parent.left;
@ -1018,7 +1018,7 @@ Rectangle {
left: parent.left; left: parent.left;
right: parent.right; right: parent.right;
} }
height: 25; height: 30;
width: parent.width; width: parent.width;
FiraSansRegular { FiraSansRegular {
@ -1125,6 +1125,7 @@ Rectangle {
break; break;
case 'connections': case 'connections':
var data = message.params; var data = message.params;
console.log('Got connection data: ', JSON.stringify(data));
connectionsUserModelData = data; connectionsUserModelData = data;
sortConnectionsModel(); sortConnectionsModel();
connectionsLoading.visible = false; connectionsLoading.visible = false;

1
scripts/system/pal.js
View file

@ -261,6 +261,7 @@ function fromQml(message) { // messages are {method, params}, like json-rpc. See
UserActivityLogger.palAction("refresh_nearby", ""); UserActivityLogger.palAction("refresh_nearby", "");
break; break;
case 'refreshConnections': case 'refreshConnections':
print('Refreshing Connections...');
getConnectionData(); getConnectionData();
UserActivityLogger.palAction("refresh_connections", ""); UserActivityLogger.palAction("refresh_connections", "");
break; break;