Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-14 07:27:04 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #14556 from vladest/avatar_app_warnings

Browse source 
Fix Avatar apps warnings.
This commit is contained in:
Shannon Romano 2019-01-15 11:03:43 -08:00 committed by GitHub
commit eed53f60ba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 15 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/hifi/AvatarApp.qml
View file

@ -10,7 +10,7 @@ import "avatarapp"
Rectangle { Rectangle {
id: root id: root
width: 480 width: 480
height: 706 height: 706
property bool keyboardEnabled: true property bool keyboardEnabled: true
property bool keyboardRaised: false property bool keyboardRaised: false
@ -416,7 +416,7 @@ Rectangle {
width: 21.2 width: 21.2
height: 19.3 height: 19.3
source: isAvatarInFavorites ? '../../images/FavoriteIconActive.svg' : '../../images/FavoriteIconInActive.svg' source: isAvatarInFavorites ? '../../images/FavoriteIconActive.svg' : '../../images/FavoriteIconInActive.svg'
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter
} }
// TextStyle5 // TextStyle5
@ -425,7 +425,7 @@ Rectangle {
Layout.fillWidth: true Layout.fillWidth: true
text: isAvatarInFavorites ? avatarName : "Add to Favorites" text: isAvatarInFavorites ? avatarName : "Add to Favorites"
elide: Qt.ElideRight elide: Qt.ElideRight
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter
} }
} }

6
interface/resources/qml/hifi/avatarapp/AdjustWearables.qml
View file

@ -157,7 +157,7 @@ Rectangle {
visible = false; visible = false;
adjustWearablesClosed(status, avatarName); adjustWearablesClosed(status, avatarName);
} }
HifiConstants { id: hifi } HifiConstants { id: hifi }
@ -230,7 +230,7 @@ Rectangle {
lineHeightMode: Text.FixedHeight lineHeightMode: Text.FixedHeight
lineHeight: 18; lineHeight: 18;
text: "Wearable" text: "Wearable"
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter
} }
spacing: 10 spacing: 10
@ -241,7 +241,7 @@ Rectangle {
lineHeight: 18; lineHeight: 18;
text: "<a href='#'>Get more</a>" text: "<a href='#'>Get more</a>"
linkColor: hifi.colors.blueHighlight linkColor: hifi.colors.blueHighlight
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter
onLinkActivated: { onLinkActivated: {
popup.showGetWearables(function() { popup.showGetWearables(function() {
emitSendToScript({'method' : 'navigate', 'url' : 'hifi://AvatarIsland/11.5848,-8.10862,-2.80195'}) emitSendToScript({'method' : 'navigate', 'url' : 'hifi://AvatarIsland/11.5848,-8.10862,-2.80195'})

16
interface/resources/qml/hifi/avatarapp/Settings.qml
View file

@ -104,11 +104,11 @@ Rectangle {
size: 17; size: 17;
text: "Avatar Scale" text: "Avatar Scale"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter
} }
RowLayout { RowLayout {
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter
Layout.fillWidth: true Layout.fillWidth: true
spacing: 0 spacing: 0
@ -118,7 +118,7 @@ Rectangle {
text: 'T' text: 'T'
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter
} }
HifiControlsUit.Slider { HifiControlsUit.Slider {
@ -136,7 +136,7 @@ Rectangle {
} }
} }
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter
Layout.fillWidth: true Layout.fillWidth: true
// TextStyle9 // TextStyle9
@ -165,7 +165,7 @@ Rectangle {
text: 'T' text: 'T'
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
anchors.verticalCenter: parent.verticalCenter Layout.alignment: Qt.AlignVCenter
} }
} }
@ -316,8 +316,7 @@ Rectangle {
InputTextStyle4 { InputTextStyle4 {
id: avatarAnimationUrlInputText id: avatarAnimationUrlInputText
font.pixelSize: 17 font.pixelSize: 17
anchors.left: parent.left Layout.fillWidth: true
anchors.right: parent.right
placeholderText: 'user\\file\\dir' placeholderText: 'user\\file\\dir'
onFocusChanged: { onFocusChanged: {
@ -346,8 +345,7 @@ Rectangle {
InputTextStyle4 { InputTextStyle4 {
id: avatarCollisionSoundUrlInputText id: avatarCollisionSoundUrlInputText
font.pixelSize: 17 font.pixelSize: 17
anchors.left: parent.left Layout.fillWidth: true
anchors.right: parent.right
placeholderText: 'https://hifi-public.s3.amazonaws.com/sounds/Collisions-' placeholderText: 'https://hifi-public.s3.amazonaws.com/sounds/Collisions-'
onFocusChanged: { onFocusChanged: {

4
libraries/display-plugins/src/display-plugins/AbstractHMDScriptingInterface.h
View file

@ -15,7 +15,7 @@
// These properties have JSDoc documentation in HMDScriptingInterface.h. // These properties have JSDoc documentation in HMDScriptingInterface.h.
class AbstractHMDScriptingInterface : public QObject { class AbstractHMDScriptingInterface : public QObject {
Q_OBJECT Q_OBJECT
Q_PROPERTY(bool active READ isHMDMode) Q_PROPERTY(bool active READ isHMDMode NOTIFY mountedChanged)
Q_PROPERTY(float ipd READ getIPD) Q_PROPERTY(float ipd READ getIPD)
Q_PROPERTY(float eyeHeight READ getEyeHeight) Q_PROPERTY(float eyeHeight READ getEyeHeight)
Q_PROPERTY(float playerHeight READ getPlayerHeight) Q_PROPERTY(float playerHeight READ getPlayerHeight)
@ -43,7 +43,7 @@ signals:
/**jsdoc /**jsdoc
* Triggered when Interface's display mode changes and when the user puts on or takes off their HMD. * Triggered when Interface's display mode changes and when the user puts on or takes off their HMD.
* @function HMD.displayModeChanged * @function HMD.displayModeChanged
* @param {boolean} isHMDMode - <code>true</code> if the display mode is HMD, otherwise <code>false</code>. This is the * @param {boolean} isHMDMode - <code>true</code> if the display mode is HMD, otherwise <code>false</code>. This is the
* same value as provided by <code>HMD.active</code>. * same value as provided by <code>HMD.active</code>.
* @returns {Signal} * @returns {Signal}
* @example <caption>Report when the display mode changes.</caption> * @example <caption>Report when the display mode changes.</caption>