Correct FontAwesome otf filenames

pull/21/head
larteyoh 2 years ago
parent 521ffe1d37
commit 1c2903c083

2
.gitignore vendored

@ -8,8 +8,6 @@ external/cmake_install.cmake
external/Makefile
external/dokun-ui/build/
res/
# copied from https://gist.github.com/Yousha/3830712334ac30a90eb6041b932b68d7#file-gitignore-L952
##### Windows
# Windows thumbnail cache files

@ -6,12 +6,12 @@ Object {
//fontawesome-free-6.2.0-desktop // source: https://fontawesome.com/v6/download
FontLoader {
id: regular
source: "otfs/Font Awesome 6 Brands-Regular-400.otf"
source: "otfs/Font Awesome 6 Free-Regular-400.otf"
}
FontLoader {
id: solid
source: "otfs/Font Awesome 6 Free-Solid-900.otf"
source: "otfs/Font Awesome 6 Free-Solid-900.otf"
}
FontLoader {
@ -31,6 +31,8 @@ Object {
property string arrowAltCircleRight: "\uf35a"
property string arrowAltCircleLeft: "\uf359"
property string angleLeft: "\uf104"
property string angleRight: "\uf105"
////property string upload: "\u"
////property string ?: "\u"
////property string user: "\uf007"

@ -19,7 +19,7 @@ Row {//RowLayout {
Button {
id: backButton
text: qsTr("%1 Previous").arg("\uf359")//qsTr("<")//solid: f104 (<),
text: qsTr("%1 Previous").arg(FontAwesome.arrowAltCircleLeft)//.arg(FontAwesome.angleLeft)//qsTr("<")
width: 150
property bool disabled: (paginationBar.currentIndex == 0)//visible: (paginationBar.currentIndex != 0)
background: Rectangle {
@ -46,9 +46,6 @@ Row {//RowLayout {
color: "black" // textColor
background: Rectangle {
//color: (NeroshopComponents.Style.darkTheme) ? "transparent": "#101010"//"#101010" = rgb(16, 16, 16)
//border.color: "#696969" // dim gray//"#ffffff"
//border.width: (NeroshopComponents.Style.darkTheme) ? 1 : 0
radius: paginationBar.radius
//opacity: 0.0
}
@ -56,7 +53,7 @@ Row {//RowLayout {
Button {
id: forwardButton
text: qsTr("Next %1").arg(FontAwesome.arrowAltCircleRight)//qsTr(">")// solid: "\uf105" (>)
text: qsTr("Next %1").arg(FontAwesome.arrowAltCircleRight)//.arg(FontAwesome.angleRight)//qsTr(">")
width: 150
property bool disabled: (paginationBar.currentIndex == (count - 1))
background: Rectangle {
@ -68,9 +65,8 @@ Row {//RowLayout {
text: forwardButton.text
color: "#ffffff"
horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter
//font.family: FontAwesome.fontFamily
//font.weight: Font.Bold
verticalAlignment: Text.AlignVCenter
//font.family: "Font Awesome 6 Free"//FontAwesome.solid.name//fontFamilySolid
}
}
}

Loading…
Cancel
Save