Merge pull request #1289

791c267 fix Leftpanel overlay
Merge pull request #1248
2026-04-02 02:47:26 -04:00 · 2018-04-22 19:59:43 -05:00 · 2018-04-19 11:30:01 -05:00 · 2018-04-19 11:28:39 -05:00 · 2018-04-13 21:43:15 +02:00 · 2018-04-08 17:48:36 -05:00
5 changed files with 23 additions and 9 deletions
--- a/LeftPanel.qml
+++ b/LeftPanel.qml
@@ -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
        }
--- a/components/NetworkStatusItem.qml
+++ b/components/NetworkStatusItem.qml
@@ -34,7 +34,7 @@ import "../components" as MoneroComponents

 Rectangle {
    id: item
-    color: "transparent"
+    color: "black"
    property var connected: Wallet.ConnectionStatus_Disconnected

    function getConnectionStatusString(status) {
--- a/components/ProgressBar.qml
+++ b/components/ProgressBar.qml
@@ -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;
--- a/main.qml
+++ b/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];
            }
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -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 \
Author	SHA1	Message	Date
luigi1111	c94ed65700	Merge pull request #1289 `791c267` fix Leftpanel overlay	2018-04-22 19:59:43 -05:00
luigi1111	db5e71c1ff	Merge pull request #1248 `4aec4e3` Mac build: add libboost_system-mt.dylib needed by libboost_thread-mt.dylib	2018-04-19 11:30:01 -05:00
luigi1111	9eefa33dd6	Merge pull request #1244 `9393529` ProgressBar: fix conversion to percentage	2018-04-19 11:28:39 -05:00
pazos	791c26734f	fix Leftpanel overlay	2018-04-13 21:43:15 +02:00
luigi1111	7a759f7dbf	Merge pull request #1246 `84fad36` Add missing newline to transfer confirm dialog	2018-04-08 17:48:36 -05:00
stoffu	4aec4e36f8	Mac build: add libboost_system-mt.dylib needed by libboost_thread-mt.dylib	2018-04-03 18:55:58 +09:00
stoffu	84fad36282	Add missing newline to transfer confirm dialog	2018-04-03 12:29:40 +09:00
stoffu	9393529613	ProgressBar: fix conversion to percentage	2018-04-03 11:51:37 +09:00