diff --git a/interface/resources/images/avatarapp/BodyMart.PNG b/interface/resources/images/avatarapp/BodyMart.PNG
index c51ca880cb..669a02c8fe 100644
Binary files a/interface/resources/images/avatarapp/BodyMart.PNG and b/interface/resources/images/avatarapp/BodyMart.PNG differ
diff --git a/interface/resources/qml/controls-uit/Button.qml b/interface/resources/qml/controls-uit/Button.qml
index 1509abdae3..caf9c9ec82 100644
--- a/interface/resources/qml/controls-uit/Button.qml
+++ b/interface/resources/qml/controls-uit/Button.qml
@@ -22,6 +22,7 @@ Original.Button {
property int fontSize: hifi.fontSizes.buttonLabel
property alias implicitTextWidth: buttonText.implicitWidth
property string buttonGlyph: "";
+ property int fontCapitalization: Font.AllUppercase
width: hifi.dimensions.buttonWidth
height: hifi.dimensions.controlLineHeight
@@ -107,7 +108,7 @@ Original.Button {
RalewayBold {
id: buttonText;
anchors.centerIn: parent;
- font.capitalization: Font.AllUppercase
+ font.capitalization: control.fontCapitalization
color: enabled ? hifi.buttons.textColor[control.color]
: hifi.buttons.disabledTextColor[control.colorScheme]
size: control.fontSize
diff --git a/interface/resources/qml/hifi/avatarapp/MessageBox.qml b/interface/resources/qml/hifi/avatarapp/MessageBox.qml
index f2df0b5199..e4aa0847c5 100644
--- a/interface/resources/qml/hifi/avatarapp/MessageBox.qml
+++ b/interface/resources/qml/hifi/avatarapp/MessageBox.qml
@@ -14,6 +14,7 @@ Rectangle {
property string titleText: ''
property string bodyText: ''
property alias inputText: input;
+ property alias dialogButtons: buttons
property string imageSource: null
onImageSourceChanged: {
@@ -36,6 +37,7 @@ Rectangle {
function close() {
visible = false;
+ dialogButtons.yesButton.fontCapitalization = Font.AllUppercase;
onButton1Clicked = null;
onButton2Clicked = null;
button1text = '';
diff --git a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
index fd65d014a0..90f55fd8bb 100644
--- a/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
+++ b/interface/resources/qml/hifi/avatarapp/MessageBoxes.qml
@@ -37,11 +37,12 @@ MessageBox {
function showGetWearables(callback, linkCallback) {
popup.button2text = 'AvatarIsland'
+ popup.dialogButtons.yesButton.fontCapitalization = Font.MixedCase;
popup.button1text = 'CANCEL'
popup.titleText = 'Get Wearables'
- popup.bodyText = 'Buy wearables from Marketplace' + '
' +
- 'Wear wearables from My Purchases' + '
' +
- 'You can visit the domain “AvatarIsland” to get wearables'
+ popup.bodyText = 'Buy wearables from Marketplace.' + '
' +
+ 'Wear wearables from My Purchases.' + '
' + '
' +
+ 'Visit “AvatarIsland” to get wearables'
popup.imageSource = getWearablesUrl;
popup.onButton2Clicked = function() {
@@ -96,12 +97,13 @@ MessageBox {
function showBuyAvatars(callback, linkCallback) {
popup.button2text = 'BodyMart'
+ popup.dialogButtons.yesButton.fontCapitalization = Font.MixedCase;
popup.button1text = 'CANCEL'
popup.titleText = 'Get Avatars'
- popup.bodyText = 'Buy avatars from Marketplace' + '
' +
- 'Wear avatars from My Purchases' + '
' +
- 'You can visit the domain “BodyMart” to get avatars'
+ popup.bodyText = 'Buy avatars from Marketplace.' + '
' +
+ 'Wear avatars from My Purchases.' + '
' + '
' +
+ 'Visit “BodyMart” to get free avatars.'
popup.imageSource = getAvatarsUrl;
popup.onButton2Clicked = function() {