monero-project/monero-gui
monero-project/monero-gui
1
0
Fork 0
mirror of https://github.com/monero-project/monero-gui.git synced 2024-12-23 03:59:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixes runtime QML warning

Browse source
This commit is contained in:
Sander Ferdinand 2018-03-24 20:48:19 +01:00 committed by moneromooo-monero
parent 3f9926487d
commit c001e31241
21 changed files with 50 additions and 38 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
LeftPanel.qml
View file

@ -27,6 +27,7 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.2
import QtQuick.Layouts 1.1
import QtGraphicalEffects 1.0
import moneroComponents.Wallet 1.0
import moneroComponents.NetworkType 1.0
@ -101,7 +102,7 @@ Rectangle {
// @TODO: customDecorations?
anchors.topMargin: (persistentSettings.customDecorations)? 50 : 0
Row {
RowLayout {
visible: true
Item {
anchors.left: parent.left

2
components/CheckBox2.qml
View file

@ -59,7 +59,7 @@ RowLayout {
Text {
id: label
font.family: Style.fontLight
font.family: Style.fontLight.name
font.pixelSize: checkBox.fontSize
color: Style.defaultFontColor
wrapMode: Text.Wrap

2
components/DatePicker.qml
View file

@ -73,7 +73,7 @@ Item {
anchors.top: parent.top
anchors.topMargin: 2
anchors.left: parent.left
font.family: Style.fontLight
font.family: Style.fontLight.name
font.pixelSize: 14
font.bold: false
textFormat: Text.RichText

4
components/InputDialog.qml
View file

@ -81,7 +81,7 @@ Item {
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
font.family: Style.fontLight
font.family: Style.fontLight.name
color: Style.defaultFontColor
}
@ -94,7 +94,7 @@ Item {
anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter
font.family: Style.fontLight
font.family: Style.fontLight.name
font.pixelSize: 24 * scaleRatio
KeyNavigation.tab: okButton
bottomPadding: 10

2
components/InputMulti.qml
View file

@ -40,7 +40,7 @@ TextArea {
property int fontSize: 18 * scaleRatio
id: textArea
font.family: Style.fontRegular
font.family: Style.fontRegular.name
font.pixelSize: fontSize
font.bold: false
horizontalAlignment: TextInput.AlignLeft

2
components/Label.qml
View file

@ -57,7 +57,7 @@ Item {
if(fontFamily){
return fontFamily;
} else {
return Style.fontLight;
return Style.fontRegular.name;
}
}
font.pixelSize: fontSize

4
components/LineEdit.qml
View file

@ -61,7 +61,7 @@ Item {
property alias labelTextFormat: inputLabel.textFormat
property string backgroundColor: "transparent"
property string tipText: ""
property int labelFontSize: 14 * scaleRatio
property int labelFontSize: 16 * scaleRatio
property bool labelFontBold: false
property alias labelWrapMode: inputLabel.wrapMode
property alias labelHorizontalAlignment: inputLabel.horizontalAlignment
@ -99,7 +99,7 @@ Item {
anchors.top: parent.top
anchors.left: parent.left
anchors.topMargin: 2 * scaleRatio
font.family: Style.fontLight
font.family: Style.fontLight.name
font.pixelSize: labelFontSize
font.bold: labelFontBold
textFormat: Text.RichText

4
components/LineEditMulti.qml
View file

@ -63,8 +63,8 @@ ColumnLayout {
id: inputLabel
anchors.top: parent.top
anchors.left: parent.left
font.family: Style.fontLight
font.pixelSize: 14 * scaleRatio
font.family: Style.fontRegular.name
font.pixelSize: 16 * scaleRatio
font.bold: labelFontBold
textFormat: Text.RichText
color: Style.defaultFontColor

5
components/NetworkStatusItem.qml
View file

@ -27,6 +27,7 @@
// THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
import QtQuick 2.0
import QtQuick.Layouts 1.1
import moneroComponents.Wallet 1.0
import "." 1.0
@ -50,8 +51,8 @@ Rectangle {
return qsTr("Invalid connection status")
}
Row {
height: 40 * scaleRatio
RowLayout {
Layout.preferredHeight: 40 * scaleRatio
Item {
id: iconItem

8
components/NewPasswordDialog.qml
View file

@ -104,7 +104,7 @@ Item {
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
font.family: Style.fontLight
font.family: Style.fontLight.name
color: Style.defaultFontColor
}
@ -116,7 +116,7 @@ Item {
anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter
font.family: Style.fontLight
font.family: Style.fontLight.name
font.pixelSize: 24 * scaleRatio
echoMode: TextInput.Password
bottomPadding: 10
@ -162,7 +162,7 @@ Item {
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
font.family: Style.fontLight
font.family: Style.fontLight.name
color: Style.defaultFontColor
}
@ -174,7 +174,7 @@ Item {
anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter
font.family: Style.fontLight
font.family: Style.fontLight.name
font.pixelSize: 24 * scaleRatio
echoMode: TextInput.Password
KeyNavigation.tab: okButton

4
components/PasswordDialog.qml
View file

@ -85,7 +85,7 @@ Item {
Layout.fillWidth: true
font.pixelSize: 16 * scaleRatio
font.family: Style.fontLight
font.family: Style.fontLight.name
color: Style.defaultFontColor
}
@ -97,7 +97,7 @@ Item {
anchors.left: parent.left
horizontalAlignment: TextInput.AlignLeft
verticalAlignment: TextInput.AlignVCenter
font.family: Style.fontLight
font.family: Style.fontLight.name
font.pixelSize: 24 * scaleRatio
echoMode: TextInput.Password
KeyNavigation.tab: okButton

5
components/ProgressBar.qml
View file

@ -52,6 +52,7 @@ Rectangle {
}
Item {
anchors.top: item.top
anchors.topMargin: 10 * scaleRatio
anchors.leftMargin: 15 * scaleRatio
anchors.rightMargin: 15 * scaleRatio
@ -59,7 +60,7 @@ Rectangle {
Text {
id: progressText
anchors.top: item.top
anchors.top: parent.top
anchors.topMargin: 6
font.family: Style.fontMedium.name
font.pixelSize: 13 * scaleRatio
@ -71,7 +72,7 @@ Rectangle {
Text {
id: progressTextValue
anchors.top: item.top
anchors.top: parent.top
anchors.topMargin: 6
anchors.right: parent.right
font.family: Style.fontMedium.name

8
components/StandardDialog.qml
View file

@ -34,6 +34,8 @@ import QtQuick.Controls.Styles 1.4
import QtQuick.Window 2.0
import "../components" as MoneroComponents
import "." 1.0
Rectangle {
id: root
@ -105,8 +107,8 @@ Rectangle {
Label {
id: dialogTitle
horizontalAlignment: Text.AlignHCenter
font.pixelSize: 18 * scaleRatio
font.family: "Arial"
fontSize: 18 * scaleRatio
fontFamily: "Arial"
color: Style.defaultFontColor
}
@ -118,7 +120,7 @@ Rectangle {
Layout.fillWidth: true
Layout.fillHeight: true
renderType: Text.QtRendering
font.family: Style.fontLight
font.family: Style.fontLight.name
textFormat: TextEdit.AutoText
readOnly: true
font.pixelSize: 14 * scaleRatio

2
components/StandardDropdown.qml
View file

@ -90,7 +90,7 @@ Item {
anchors.left: parent.left
anchors.leftMargin: 12 * scaleRatio
elide: Text.ElideRight
font.family: Style.fontRegular
font.family: Style.fontRegular.name
font.bold: dropdown.headerFontBold
font.pixelSize: dropdown.fontHeaderSize
color: "#FFFFFF"

4
components/SubaddressTable.qml
View file

@ -42,7 +42,7 @@ ListView {
delegate: Rectangle {
id: delegate
height: 74
height: 80
color: 'transparent';
anchors.topMargin: 0
width: listView.width
@ -57,7 +57,7 @@ ListView {
anchors.top: parent.top
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 5
anchors.leftMargin: 10
anchors.topMargin: 12
anchors.rightMargin: 54
anchors.bottomMargin: 0

2
pages/Mining.qml
View file

@ -74,7 +74,7 @@ Rectangle {
text: qsTr("Mining with your computer helps strengthen the Monero network. The more that people mine, the harder it is for the network to be attacked, and every little bit helps.<br> <br>Mining also gives you a small chance to earn some Monero. Your computer will create hashes looking for block solutions. If you find a block, you will get the associated reward. Good luck!") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.fillWidth: true
font.family: Style.fontRegular
font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
}

2
pages/Receive.qml
View file

@ -211,7 +211,7 @@ Rectangle {
Rectangle {
id: tableRect
property int table_max_height: 240
property int table_max_height: 260
Layout.fillWidth: true
Layout.preferredHeight: table.contentHeight < table_max_height ? table.contentHeight : table_max_height
color: "transparent"

9
pages/Settings.qml
View file

@ -256,7 +256,14 @@ Rectangle {
daemonAddrLabelText: qsTr("Address")
daemonPortLabelText: qsTr("Port")
daemonAddrText: persistentSettings.bootstrapNodeAddress.split(":")[0].trim()
daemonPortText: (persistentSettings.bootstrapNodeAddress.split(":")[1].trim() == "") ? "18081" : persistentSettings.bootstrapNodeAddress.split(":")[1]
daemonPortText: {
var node_split = persistentSettings.bootstrapNodeAddress.split(":");
if(node_split.length == 2){
(node_split[1].trim() == "") ? "18081" : node_split[1];
} else {
return ""
}
}
onEditingFinished: {
persistentSettings.bootstrapNodeAddress = daemonAddrText ? bootstrapNodeEdit.getAddress() : "";
console.log("setting bootstrap node to " + persistentSettings.bootstrapNodeAddress)

2
pages/Sign.qml
View file

@ -107,7 +107,7 @@ Rectangle {
text: qsTr("This page lets you sign/verify a message (or file contents) with your address.") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.fillWidth: true
font.family: Style.fontRegular
font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
}

8
pages/Transfer.qml
View file

@ -140,7 +140,7 @@ Rectangle {
Layout.preferredHeight: warningText.height + 40
Image {
anchors.verticalCenter: statusRect.verticalCenter
Layout.alignment: Qt.AlignVCenter
Layout.preferredHeight: 33
Layout.preferredWidth: 33
Layout.leftMargin: 10
@ -155,7 +155,7 @@ Rectangle {
Layout.leftMargin: 6
text: qsTr("This page lets you sign/verify a message (or file contents) with your address.") + translationManager.emptyString
wrapMode: Text.Wrap
font.family: Style.fontRegular
font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
textFormat: Text.RichText
@ -210,7 +210,7 @@ Rectangle {
Layout.topMargin: 14
text: qsTr("Transaction priority") + translationManager.emptyString
fontBold: false
fontSize: 14
fontSize: 16
}
// Note: workaround for translations in listElements
// ListElement: cannot use script for property value, so
@ -408,7 +408,7 @@ Rectangle {
Layout.fillWidth: true
Label {
id: privacyLabel
fontSize: 14
fontSize: 15
text: ""
}

6
pages/TxKey.qml
View file

@ -71,7 +71,7 @@ Rectangle {
"For the case of outgoing payments, you can get a 'Spend Proof' that proves the authorship of a transaction. In this case, you don't need to specify the recipient address.") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.fillWidth: true
font.family: Style.fontRegular
font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
}
@ -145,7 +145,7 @@ Rectangle {
"For the case with Spend Proof, you don't need to specify the recipient address.") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.fillWidth: true
font.family: Style.fontRegular
font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
}
@ -228,7 +228,7 @@ Rectangle {
text: qsTr("If a payment had several transactions then each must be checked and the results combined.") + translationManager.emptyString
wrapMode: Text.Wrap
Layout.fillWidth: true
font.family: Style.fontRegular
font.family: Style.fontRegular.name
font.pixelSize: 14 * scaleRatio
color: Style.defaultFontColor
}