Mirrors/overte-lubosz
3
0
Fork 0
mirror of https://github.com/lubosz/overte.git synced 2025-08-07 19:01:09 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

FB16992 - Layout changes to the two lightboxes in the Avatar app

Browse source
This commit is contained in:
Alexander Ivash 2018-07-23 23:24:17 +03:00
parent d1da7675f6
commit e12569c747
3 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
interface/resources/qml/controls-uit/Button.qml
View file

@ -22,6 +22,7 @@ Original.Button {
property int fontSize: hifi.fontSizes.buttonLabel property int fontSize: hifi.fontSizes.buttonLabel
property alias implicitTextWidth: buttonText.implicitWidth property alias implicitTextWidth: buttonText.implicitWidth
property string buttonGlyph: ""; property string buttonGlyph: "";
property int fontCapitalization: Font.AllUppercase
width: hifi.dimensions.buttonWidth width: hifi.dimensions.buttonWidth
height: hifi.dimensions.controlLineHeight height: hifi.dimensions.controlLineHeight
@ -107,7 +108,7 @@ Original.Button {
RalewayBold { RalewayBold {
id: buttonText; id: buttonText;
anchors.centerIn: parent; anchors.centerIn: parent;
font.capitalization: Font.AllUppercase font.capitalization: control.fontCapitalization
color: enabled ? hifi.buttons.textColor[control.color] color: enabled ? hifi.buttons.textColor[control.color]
: hifi.buttons.disabledTextColor[control.colorScheme] : hifi.buttons.disabledTextColor[control.colorScheme]
size: control.fontSize size: control.fontSize

2
interface/resources/qml/hifi/avatarapp/MessageBox.qml
View file

@ -14,6 +14,7 @@ Rectangle {
property string titleText: '' property string titleText: ''
property string bodyText: '' property string bodyText: ''
property alias inputText: input; property alias inputText: input;
property alias dialogButtons: buttons
property string imageSource: null property string imageSource: null
onImageSourceChanged: { onImageSourceChanged: {
@ -36,6 +37,7 @@ Rectangle {
function close() { function close() {
visible = false; visible = false;
dialogButtons.yesButton.fontCapitalization = Font.AllUppercase;
onButton1Clicked = null; onButton1Clicked = null;
onButton2Clicked = null; onButton2Clicked = null;
button1text = ''; button1text = '';

14
interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
View file

@ -35,11 +35,12 @@ MessageBox {
function showGetWearables(callback, linkCallback) { function showGetWearables(callback, linkCallback) {
popup.button2text = 'AvatarIsland' popup.button2text = 'AvatarIsland'
popup.dialogButtons.yesButton.fontCapitalization = Font.MixedCase;
popup.button1text = 'CANCEL' popup.button1text = 'CANCEL'
popup.titleText = 'Get Wearables' popup.titleText = 'Get Wearables'
popup.bodyText = 'Buy wearables from <a href="app://marketplace">Marketplace</a>' + '<br/>' + popup.bodyText = 'Buy wearables from <b><a href="app://marketplace">Marketplace.</a></b>' + '<br/>' +
'Wear wearables from <a href="app://purchases">My Purchases</a>' + '<br/>' + 'Wear wearables from <b><a href="app://purchases">My Purchases.</a></b>' + '<br/>' + '<br/>' +
'You can visit the domain “AvatarIsland” to get wearables' 'Visit “AvatarIsland” to get wearables'
popup.imageSource = getWearablesUrl; popup.imageSource = getWearablesUrl;
popup.onButton2Clicked = function() { popup.onButton2Clicked = function() {
@ -94,12 +95,13 @@ MessageBox {
function showBuyAvatars(callback, linkCallback) { function showBuyAvatars(callback, linkCallback) {
popup.button2text = 'BodyMart' popup.button2text = 'BodyMart'
popup.dialogButtons.yesButton.fontCapitalization = Font.MixedCase;
popup.button1text = 'CANCEL' popup.button1text = 'CANCEL'
popup.titleText = 'Get Avatars' popup.titleText = 'Get Avatars'
popup.bodyText = 'Buy avatars from <a href="app://marketplace">Marketplace</a>' + '<br/>' + popup.bodyText = 'Buy avatars from <b><a href="app://marketplace">Marketplace.</a></b>' + '<br/>' +
'Wear avatars from <a href="app://purchases">My Purchases</a>' + '<br/>' + 'Wear avatars from <b><a href="app://purchases">My Purchases.</a></b>' + '<br/>' + '<br/>' +
'You can visit the domain “BodyMart” to get avatars' 'Visit “BodyMart” to get free avatars.'
popup.imageSource = getAvatarsUrl; popup.imageSource = getAvatarsUrl;
popup.onButton2Clicked = function() { popup.onButton2Clicked = function() {