4rkal/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2025-01-10 03:42:05 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some font adjustments

Browse Source
This commit is contained in:
Sander Ferdinand 2018-01-12 01:45:27 +01:00 committed by moneromooo-monero
parent a9b6a70d15
commit 6677a185f8
5 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/DatePicker.qml
View File

@ -71,10 +71,11 @@ Item {
Text { Text {
id: inputLabel id: inputLabel
anchors.top: parent.top anchors.top: parent.top
anchors.topMargin: 2
anchors.left: parent.left anchors.left: parent.left
font.family: Style.fontRegular.name font.family: Style.fontRegular.name
font.pixelSize: 16 font.pixelSize: 14
font.bold: false font.bold: true
textFormat: Text.RichText textFormat: Text.RichText
color: Style.defaultFontColor color: Style.defaultFontColor

8
components/LineEdit.qml
View File

@ -34,7 +34,7 @@ Item {
property alias text: input.text property alias text: input.text
property alias placeholderText: placeholderLabel.text property alias placeholderText: placeholderLabel.text
property bool placeholderCenter: false property bool placeholderCenter: false
property int placeholderFontSize: 18 property int placeholderFontSize: 18 * scaleRatio
property alias validator: input.validator property alias validator: input.validator
property alias readOnly : input.readOnly property alias readOnly : input.readOnly
property alias cursorPosition: input.cursorPosition property alias cursorPosition: input.cursorPosition
@ -53,12 +53,12 @@ Item {
property alias labelTextFormat: inputLabel.textFormat property alias labelTextFormat: inputLabel.textFormat
property string backgroundColor: "transparent" property string backgroundColor: "transparent"
property string tipText: "" property string tipText: ""
property int labelFontSize: 16 * scaleRatio property int labelFontSize: 14 * scaleRatio
property bool labelFontBold: false property bool labelFontBold: true
property alias labelWrapMode: inputLabel.wrapMode property alias labelWrapMode: inputLabel.wrapMode
property alias labelHorizontalAlignment: inputLabel.horizontalAlignment property alias labelHorizontalAlignment: inputLabel.horizontalAlignment
property bool showingHeader: inputLabel.text !== "" || copyButton property bool showingHeader: inputLabel.text !== "" || copyButton
property int inputHeight: 42 property int inputHeight: 42 * scaleRatio
signal labelLinkActivated(); // input label, rich text <a> signal signal labelLinkActivated(); // input label, rich text <a> signal
signal editingFinished(); signal editingFinished();
signal accepted(); signal accepted();

12
components/LineEditMulti.qml
View File

@ -39,7 +39,7 @@ ColumnLayout {
property alias readOnly: multiLine.readOnly property alias readOnly: multiLine.readOnly
property alias addressValidation: multiLine.addressValidation property alias addressValidation: multiLine.addressValidation
property alias labelButtonText: labelButton.text property alias labelButtonText: labelButton.text
property bool labelFontBold: false property bool labelFontBold: true
property bool labelButtonVisible: false property bool labelButtonVisible: false
property bool copyButton: false property bool copyButton: false
signal labelButtonClicked(); signal labelButtonClicked();
@ -50,14 +50,14 @@ ColumnLayout {
id: inputLabelRect id: inputLabelRect
color: "transparent" color: "transparent"
Layout.fillWidth: true Layout.fillWidth: true
height: inputLabel.height + 10 height: (inputLabel.height + 10) * scaleRatio
Text { Text {
id: inputLabel id: inputLabel
anchors.top: parent.top anchors.top: parent.top
anchors.left: parent.left anchors.left: parent.left
font.family: Style.fontRegular.name font.family: Style.fontRegular.name
font.pixelSize: 16 * scaleRatio font.pixelSize: 14 * scaleRatio
font.bold: labelFontBold font.bold: labelFontBold
textFormat: Text.RichText textFormat: Text.RichText
color: Style.defaultFontColor color: Style.defaultFontColor
@ -92,15 +92,15 @@ ColumnLayout {
addressValidation: true addressValidation: true
anchors.top: inputLabelRect.bottom anchors.top: inputLabelRect.bottom
Layout.fillWidth: true Layout.fillWidth: true
topPadding: 10 topPadding: 10 * scaleRatio
bottomPadding: 10 bottomPadding: 10 * scaleRatio
Text { Text {
id: placeholderLabel id: placeholderLabel
visible: multiLine.text ? false : true visible: multiLine.text ? false : true
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 10 anchors.leftMargin: 10 * scaleRatio
opacity: 0.25 opacity: 0.25
color: Style.defaultFontColor color: Style.defaultFontColor
font.family: Style.fontRegular.name font.family: Style.fontRegular.name

2
pages/History.qml
View File

@ -218,6 +218,8 @@ Rectangle {
id: transactionPriority id: transactionPriority
Layout.minimumWidth: 120 * scaleRatio Layout.minimumWidth: 120 * scaleRatio
text: qsTr("Sort") + translationManager.emptyString text: qsTr("Sort") + translationManager.emptyString
fontSize: 14
fontBold: true
} }
ListModel { ListModel {

2
pages/Transfer.qml
View File

@ -161,6 +161,8 @@ Rectangle {
Label { Label {
id: transactionPriority id: transactionPriority
text: qsTr("Transaction priority") + translationManager.emptyString text: qsTr("Transaction priority") + translationManager.emptyString
fontBold: true
fontSize: 14
} }
// Note: workaround for translations in listElements // Note: workaround for translations in listElements
// ListElement: cannot use script for property value, so // ListElement: cannot use script for property value, so