1
mirror of https://github.com/monero-project/monero-gui synced 2025-03-21 06:44:22 +01:00

Processing splash formatting improved

This commit is contained in:
Ilya Kitaev 2016-10-09 21:49:56 +03:00
parent 54b22d21a8
commit be135e39cc
3 changed files with 13 additions and 6 deletions

@ -43,8 +43,13 @@ Window {
opacity: 0.7 opacity: 0.7
ColumnLayout { ColumnLayout {
id: rootLayout
anchors.horizontalCenter: parent.horizontalCenter anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.left: parent.left
anchors.right: parent.right
anchors.leftMargin: 30
anchors.rightMargin: 30
BusyIndicator { BusyIndicator {
running: parent.visible running: parent.visible
@ -59,6 +64,7 @@ Window {
} }
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
Layout.fillWidth: true
} }
@ -69,6 +75,7 @@ Window {
} }
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
Layout.fillWidth: true
} }
} }
} }

@ -1,10 +1,10 @@
#!/bin/bash #!/bin/bash
# MONERO_URL=https://github.com/monero-project/monero.git MONERO_URL=https://github.com/monero-project/monero.git
# MONERO_BRANCH=master MONERO_BRANCH=master
MONERO_URL=https://github.com/mbg033/monero.git # MONERO_URL=https://github.com/mbg033/monero.git
MONERO_BRANCH=develop # MONERO_BRANCH=develop
# Buidling "debug" build optionally # Buidling "debug" build optionally
BUILD_TYPE=$1 BUILD_TYPE=$1
if [ -z $BUILD_TYPE ]; then if [ -z $BUILD_TYPE ]; then

@ -282,7 +282,7 @@ ApplicationWindow {
var locale = Qt.locale() var locale = Qt.locale()
var currHeightString = currHeight.toLocaleString(locale,"f",0) var currHeightString = currHeight.toLocaleString(locale,"f",0)
var targetHeightString = currentWallet.daemonBlockChainHeight().toLocaleString(locale,"f",0) var targetHeightString = currentWallet.daemonBlockChainHeight().toLocaleString(locale,"f",0)
var progressText = qsTr("Synchronizing blocks %1/%2").arg(currHeightString).arg(targetHeightString); var progressText = qsTr("Synchronizing blocks %1 / %2").arg(currHeightString).arg(targetHeightString);
console.log("Progress text: " + progressText); console.log("Progress text: " + progressText);
splash.heightProgressText = progressText splash.heightProgressText = progressText
} }
@ -498,7 +498,7 @@ ApplicationWindow {
ProcessingSplash { ProcessingSplash {
id: splash id: splash
width: appWindow.width / 2 width: appWindow.width / 1.5
height: appWindow.height / 2 height: appWindow.height / 2
x: (appWindow.width - width) / 2 + appWindow.x x: (appWindow.width - width) / 2 + appWindow.x
y: (appWindow.height - height) / 2 + appWindow.y y: (appWindow.height - height) / 2 + appWindow.y