aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlya Kitaev <mbg033@gmail.com>2016-10-09 21:49:56 +0300
committerIlya Kitaev <mbg033@gmail.com>2016-10-10 00:30:55 +0300
commitbe135e39cc4c1fc9981b8e9c1dbae9d056f8f769 (patch)
tree728514c2ce8dce8df8e1ec8a3b479d6342e572c6
parent54b22d21a8a151fd8e4e1a32a9dcbb090a319995 (diff)
downloadmonzero-gui-be135e39cc4c1fc9981b8e9c1dbae9d056f8f769.tar.gz
monzero-gui-be135e39cc4c1fc9981b8e9c1dbae9d056f8f769.tar.xz
monzero-gui-be135e39cc4c1fc9981b8e9c1dbae9d056f8f769.zip
Processing splash formatting improved
-rw-r--r--components/ProcessingSplash.qml7
-rwxr-xr-xget_libwallet_api.sh8
-rw-r--r--main.qml4
3 files changed, 13 insertions, 6 deletions
diff --git a/components/ProcessingSplash.qml b/components/ProcessingSplash.qml
index 297631ec..84218f88 100644
--- a/components/ProcessingSplash.qml
+++ b/components/ProcessingSplash.qml
@@ -43,8 +43,13 @@ Window {
opacity: 0.7
ColumnLayout {
+ id: rootLayout
anchors.horizontalCenter: parent.horizontalCenter
anchors.verticalCenter: parent.verticalCenter
+ anchors.left: parent.left
+ anchors.right: parent.right
+ anchors.leftMargin: 30
+ anchors.rightMargin: 30
BusyIndicator {
running: parent.visible
@@ -59,6 +64,7 @@ Window {
}
horizontalAlignment: Text.AlignHCenter
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+ Layout.fillWidth: true
}
@@ -69,6 +75,7 @@ Window {
}
horizontalAlignment: Text.AlignHCenter
Layout.alignment: Qt.AlignVCenter | Qt.AlignHCenter
+ Layout.fillWidth: true
}
}
}
diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh
index d46b9910..fbba689a 100755
--- a/get_libwallet_api.sh
+++ b/get_libwallet_api.sh
@@ -1,10 +1,10 @@
#!/bin/bash
-# MONERO_URL=https://github.com/monero-project/monero.git
-# MONERO_BRANCH=master
-MONERO_URL=https://github.com/mbg033/monero.git
-MONERO_BRANCH=develop
+MONERO_URL=https://github.com/monero-project/monero.git
+MONERO_BRANCH=master
+# MONERO_URL=https://github.com/mbg033/monero.git
+# MONERO_BRANCH=develop
# Buidling "debug" build optionally
BUILD_TYPE=$1
if [ -z $BUILD_TYPE ]; then
diff --git a/main.qml b/main.qml
index 6cf753e8..9d1bf326 100644
--- a/main.qml
+++ b/main.qml
@@ -282,7 +282,7 @@ ApplicationWindow {
var locale = Qt.locale()
var currHeightString = currHeight.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);
splash.heightProgressText = progressText
}
@@ -498,7 +498,7 @@ ApplicationWindow {
ProcessingSplash {
id: splash
- width: appWindow.width / 2
+ width: appWindow.width / 1.5
height: appWindow.height / 2
x: (appWindow.width - width) / 2 + appWindow.x
y: (appWindow.height - height) / 2 + appWindow.y