mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 15:09:24 +02:00
updated, plus fixed some annoying errors in logs from Pal.qml
This commit is contained in:
parent
a92162dea9
commit
85c78da839
2 changed files with 20 additions and 14 deletions
|
@ -45,7 +45,7 @@ Item {
|
||||||
property bool isPresent: true
|
property bool isPresent: true
|
||||||
property string placeName: ""
|
property string placeName: ""
|
||||||
property string profilePicBorderColor: (connectionStatus == "connection" ? hifi.colors.indigoAccent : (connectionStatus == "friend" ? hifi.colors.greenHighlight : "transparent"))
|
property string profilePicBorderColor: (connectionStatus == "connection" ? hifi.colors.indigoAccent : (connectionStatus == "friend" ? hifi.colors.greenHighlight : "transparent"))
|
||||||
|
property alias avImage: avatarImage
|
||||||
Item {
|
Item {
|
||||||
id: avatarImage
|
id: avatarImage
|
||||||
visible: profileUrl !== "" && userName !== "";
|
visible: profileUrl !== "" && userName !== "";
|
||||||
|
@ -367,14 +367,13 @@ Item {
|
||||||
text: "Info"
|
text: "Info"
|
||||||
color: hifi.colors.baseGray
|
color: hifi.colors.baseGray
|
||||||
}
|
}
|
||||||
StateImage {
|
HiFiGlyphs {
|
||||||
id: nameCardRemoveConnectionImage
|
id: nameCardRemoveConnectionImage
|
||||||
visible: selected && !isMyCard && pal.activeTab == "connectionsTab"
|
visible: selected && !isMyCard && pal.activeTab == "connectionsTab"
|
||||||
imageURL: "../../images/info-icon-2-state.svg" // PLACEHOLDER!!!
|
text: hifi.glyphs.close
|
||||||
size: 32;
|
size: 28;
|
||||||
buttonState: 0;
|
|
||||||
x: 120
|
x: 120
|
||||||
anchors.bottom: parent.bottom
|
anchors.verticalCenter: nameCardConnectionInfoImage.verticalCenter
|
||||||
}
|
}
|
||||||
MouseArea {
|
MouseArea {
|
||||||
anchors.fill:nameCardRemoveConnectionImage
|
anchors.fill:nameCardRemoveConnectionImage
|
||||||
|
@ -385,10 +384,10 @@ Item {
|
||||||
pal.sendToScript({method: 'removeConnection', params: thisNameCard.userName});
|
pal.sendToScript({method: 'removeConnection', params: thisNameCard.userName});
|
||||||
}
|
}
|
||||||
onEntered: {
|
onEntered: {
|
||||||
nameCardRemoveConnectionImage.buttonState = 1;
|
nameCardRemoveConnectionImage.text = hifi.glyphs.closeInverted;
|
||||||
}
|
}
|
||||||
onExited: {
|
onExited: {
|
||||||
nameCardRemoveConnectionImage.buttonState = 0;
|
nameCardRemoveConnectionImage.text = hifi.glyphs.close;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
FiraSansRegular {
|
FiraSansRegular {
|
||||||
|
|
|
@ -793,17 +793,21 @@ Rectangle {
|
||||||
FiraSansRegular {
|
FiraSansRegular {
|
||||||
id: connectionsLocationData
|
id: connectionsLocationData
|
||||||
// Properties
|
// Properties
|
||||||
visible: !connectionsNameCard.selected && styleData.role === "placeName";
|
visible: styleData.role === "placeName";
|
||||||
text: (model && model.placeName) || "";
|
text: (model && model.placeName) || "";
|
||||||
elide: Text.ElideRight;
|
elide: Text.ElideRight;
|
||||||
// Size
|
// Size
|
||||||
width: parent.width;
|
width: parent.width;
|
||||||
// Anchors
|
// you would think that this would work:
|
||||||
anchors.fill: parent;
|
// anchors.verticalCenter: connectionsNameCard.avImage.verticalCenter
|
||||||
|
// but no! you cannot anchor to a non-sibling or parent. So I will
|
||||||
|
// align with the friends checkbox, where I did the manual alignment
|
||||||
|
anchors.verticalCenter: friendsCheckBox.verticalCenter
|
||||||
// Text Size
|
// Text Size
|
||||||
size: 16;
|
size: 16;
|
||||||
// Text Positioning
|
// Text Positioning
|
||||||
verticalAlignment: Text.AlignVCenter
|
verticalAlignment: Text.AlignVCenter
|
||||||
|
horizontalAlignment: Text.AlignHCenter
|
||||||
// Style
|
// Style
|
||||||
color: hifi.colors.blueAccent;
|
color: hifi.colors.blueAccent;
|
||||||
font.underline: true;
|
font.underline: true;
|
||||||
|
@ -824,7 +828,11 @@ Rectangle {
|
||||||
HifiControlsUit.CheckBox {
|
HifiControlsUit.CheckBox {
|
||||||
id: friendsCheckBox;
|
id: friendsCheckBox;
|
||||||
visible: styleData.role === "friends" && model && model.userName !== myData.userName;
|
visible: styleData.role === "friends" && model && model.userName !== myData.userName;
|
||||||
anchors.centerIn: parent;
|
// you would think that this would work:
|
||||||
|
// anchors.verticalCenter: connectionsNameCard.avImage.verticalCenter
|
||||||
|
// but no! you cannot anchor to a non-sibling or parent. So:
|
||||||
|
x: parent.width/2 - boxSize/2
|
||||||
|
y: connectionsNameCard.avImage.y + connectionsNameCard.avImage.height/2 - boxSize/2
|
||||||
checked: model ? (model["connection"] === "friend" ? true : false) : false;
|
checked: model ? (model["connection"] === "friend" ? true : false) : false;
|
||||||
boxSize: 24;
|
boxSize: 24;
|
||||||
onClicked: {
|
onClicked: {
|
||||||
|
@ -902,7 +910,7 @@ Rectangle {
|
||||||
wrapMode: Text.WordWrap
|
wrapMode: Text.WordWrap
|
||||||
textFormat: Text.StyledText;
|
textFormat: Text.StyledText;
|
||||||
// Text
|
// Text
|
||||||
text: HMD.active ?
|
text: HMD.isMounted ?
|
||||||
"<b>When you meet someone you want to remember later, you can <font color='purple'>connect</font> with a handshake:</b><br><br>" +
|
"<b>When you meet someone you want to remember later, you can <font color='purple'>connect</font> with a handshake:</b><br><br>" +
|
||||||
"1. Put your hand out onto their hand and squeeze your controller's grip button on its side.<br>" +
|
"1. Put your hand out onto their hand and squeeze your controller's grip button on its side.<br>" +
|
||||||
"2. Once the other person puts their hand onto yours, you'll see your connection form.<br>" +
|
"2. Once the other person puts their hand onto yours, you'll see your connection form.<br>" +
|
||||||
|
@ -961,7 +969,6 @@ Rectangle {
|
||||||
// Text size
|
// Text size
|
||||||
size: hifi.fontSizes.tabularData;
|
size: hifi.fontSizes.tabularData;
|
||||||
// Anchors
|
// Anchors
|
||||||
anchors.top: myCard.top;
|
|
||||||
anchors.left: parent.left;
|
anchors.left: parent.left;
|
||||||
// Style
|
// Style
|
||||||
color: hifi.colors.baseGrayHighlight;
|
color: hifi.colors.baseGrayHighlight;
|
||||||
|
|
Loading…
Reference in a new issue