mirror of
https://github.com/monero-project/monero-gui.git
synced 2026-04-02 00:27:26 -04:00
Compare commits
8 Commits
v0.12.0.0
...
release-v0
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
c94ed65700 | ||
|
|
db5e71c1ff | ||
|
|
9eefa33dd6 | ||
|
|
791c26734f | ||
|
|
7a759f7dbf | ||
|
|
4aec4e36f8 | ||
|
|
84fad36282 | ||
|
|
9393529613 |
@@ -252,7 +252,9 @@ Rectangle {
|
||||
|
||||
Flickable {
|
||||
id:flicker
|
||||
contentHeight: 500 * scaleRatio
|
||||
contentHeight: (progressBar.visible)? menuColumn.height + separator.height +
|
||||
networkStatus.height + progressBar.height + daemonProgressBar.height :
|
||||
menuColumn.height + separator.height + networkStatus.height
|
||||
anchors.fill: parent
|
||||
clip: true
|
||||
|
||||
@@ -568,15 +570,26 @@ Rectangle {
|
||||
|
||||
} // Flickable
|
||||
|
||||
Rectangle {
|
||||
id: separator
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.leftMargin: 0
|
||||
anchors.rightMargin: 0
|
||||
anchors.bottom: networkStatus.top;
|
||||
height: 10 * scaleRatio
|
||||
color: "black"
|
||||
}
|
||||
|
||||
NetworkStatusItem {
|
||||
id: networkStatus
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.leftMargin: 4
|
||||
anchors.rightMargin: 4
|
||||
anchors.leftMargin: 0
|
||||
anchors.rightMargin: 0
|
||||
anchors.bottom: (progressBar.visible)? progressBar.top : parent.bottom;
|
||||
connected: Wallet.ConnectionStatus_Disconnected
|
||||
height: 58 * scaleRatio
|
||||
height: 48 * scaleRatio
|
||||
}
|
||||
|
||||
ProgressBar {
|
||||
@@ -584,7 +597,7 @@ Rectangle {
|
||||
anchors.left: parent.left
|
||||
anchors.right: parent.right
|
||||
anchors.bottom: daemonProgressBar.top
|
||||
height: 35 * scaleRatio
|
||||
height: 48 * scaleRatio
|
||||
syncType: qsTr("Wallet")
|
||||
visible: networkStatus.connected
|
||||
}
|
||||
|
||||
@@ -34,7 +34,7 @@ import "../components" as MoneroComponents
|
||||
|
||||
Rectangle {
|
||||
id: item
|
||||
color: "transparent"
|
||||
color: "black"
|
||||
property var connected: Wallet.ConnectionStatus_Disconnected
|
||||
|
||||
function getConnectionStatusString(status) {
|
||||
|
||||
@@ -37,12 +37,12 @@ Rectangle {
|
||||
property string syncType // Wallet or Daemon
|
||||
property string syncText: qsTr("%1 blocks remaining: ").arg(syncType)
|
||||
visible: false
|
||||
color: "transparent"
|
||||
color: "black"
|
||||
|
||||
function updateProgress(currentBlock,targetBlock, blocksToSync, statusTxt){
|
||||
if(targetBlock > 0) {
|
||||
var remaining = (currentBlock < targetBlock) ? targetBlock - currentBlock : 0
|
||||
var progressLevel = (blocksToSync > 0 && blocksToSync != remaining) ? (100*(blocksToSync - remaining)/blocksToSync).toFixed(0) : 100*(currentBlock / targetBlock).toFixed(0)
|
||||
var progressLevel = (blocksToSync > 0 && blocksToSync != remaining) ? (100*(blocksToSync - remaining)/blocksToSync).toFixed(0) : (100*(currentBlock / targetBlock)).toFixed(0)
|
||||
fillLevel = progressLevel
|
||||
if(typeof statusTxt != "undefined" && statusTxt != "") {
|
||||
progressText.text = statusTxt;
|
||||
|
||||
2
main.qml
2
main.qml
@@ -621,7 +621,7 @@ ApplicationWindow {
|
||||
transactionConfirmationPopup.text += qsTr("\n\nWARNING: non default ring size, which may harm your privacy. Default of 7 is recommended.");
|
||||
}
|
||||
transactionConfirmationPopup.text += qsTr("\n\nNumber of transactions: ") + transaction.txCount
|
||||
transactionConfirmationPopup.text += (transactionDescription === "" ? "" : (qsTr("Description: ") + transactionDescription))
|
||||
transactionConfirmationPopup.text += (transactionDescription === "" ? "" : (qsTr("\nDescription: ") + transactionDescription))
|
||||
for (var i = 0; i < transaction.subaddrIndices.length; ++i){
|
||||
transactionConfirmationPopup.text += qsTr("\nSpending address index: ") + transaction.subaddrIndices[i];
|
||||
}
|
||||
|
||||
@@ -311,6 +311,7 @@ macx {
|
||||
-L/usr/local/opt/boost/lib \
|
||||
-lboost_serialization \
|
||||
-lboost_thread-mt \
|
||||
-lboost_system-mt \
|
||||
-lboost_system \
|
||||
-lboost_date_time \
|
||||
-lboost_filesystem \
|
||||
|
||||
Reference in New Issue
Block a user