Mirrors/overte-AleziaKurdis
3
0
Fork 0
mirror of https://github.com/AleziaKurdis/overte.git synced 2025-04-18 21:17:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update message dialogs to use HiFi-Glyphs icons

Browse source
This commit is contained in:
David Rowe 2016-03-08 17:13:05 +13:00
parent e5188108a1
commit 2aaf9ff0d0
3 changed files with 15 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
interface/resources/qml/dialogs/MessageDialog.qml
View file

@ -42,10 +42,10 @@ ModalWindow {
property alias detailedText: detailedText.text
property alias text: mainTextContainer.text
property alias informativeText: informativeTextContainer.text
onIconChanged: updateIcon();
property int buttons: OriginalDialogs.StandardButton.Ok
property int icon: OriginalDialogs.StandardIcon.NoIcon
property string iconText: ""
onIconChanged: updateIcon();
property int defaultButton: OriginalDialogs.StandardButton.NoButton;
property int clickedButton: OriginalDialogs.StandardButton.NoButton;
focus: defaultButton === OriginalDialogs.StandardButton.NoButton
@ -56,19 +56,19 @@ ModalWindow {
}
switch (root.icon) {
case OriginalDialogs.StandardIcon.Information:
iconText = "\uF05A";
iconText = hifi.glyphs.informatonIcon;
break;
case OriginalDialogs.StandardIcon.Question:
iconText = "\uF059"
iconText = hifi.glyphs.questionIcon;
break;
case OriginalDialogs.StandardIcon.Warning:
iconText = "\uF071"
iconText = hifi.glyphs.warningIcon;
break;
case OriginalDialogs.StandardIcon.Critical:
iconText = "\uF057"
iconText = hifi.glyphs.criticalIcon;
break;
default:
iconText = ""
iconText = hifi.glyphs.noIcon;
}
}

5
interface/resources/qml/styles-uit/HifiConstants.qml
View file

@ -141,15 +141,20 @@ Item {
readonly property string close: "w"
readonly property string closeInverted: "x"
readonly property string closeSmall: "C"
readonly property string criticalIcon: "="
readonly property string disclosureButtonCollapse: "M"
readonly property string disclosureButtonExpand: "L"
readonly property string disclosureCollapse: "Z"
readonly property string disclosureExpand: "B"
readonly property string forward: "D"
readonly property string informatonIcon: "["
readonly property string noIcon: ""
readonly property string pin: "y"
readonly property string pinInverted: "z"
readonly property string questionIcon: "]"
readonly property string reloadSmall: "a"
readonly property string resizeHandle: "A"
readonly property string warningIcon: "+"
}
Item {

8
interface/resources/qml/windows-uit/ModalFrame.qml
View file

@ -50,13 +50,13 @@ Frame {
width: title.width + (icon.text !== "" ? icon.width + hifi.dimensions.contentSpacing.x : 0)
x: (parent.width - width) / 2
FontAwesome {
HiFiGlyphs {
id: icon
text: window.iconText ? window.iconText : ""
size: 30
color: hifi.colors.lightGrayText
size: 50
color: hifi.colors.lightGray
visible: text != ""
y: -hifi.dimensions.modalDialogTitleHeight - 5
anchors.verticalCenter: title.verticalCenter
anchors.left: parent.left
}
RalewayRegular {