Merge pull request #1289

791c267 fix Leftpanel overlay
Merge pull request #1248
2026-04-01 23:27:25 -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-08 17:48:36 -05:00 · 2018-04-03 18:55:58 +09:00
4 changed files with 4 additions and 3 deletions
--- a/components/ProgressBar.qml
+++ b/components/ProgressBar.qml
@@ -42,7 +42,7 @@ Rectangle {
    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/get_libwallet_api.sh
+++ b/get_libwallet_api.sh
@@ -17,7 +17,7 @@ if [ ! -d $MONERO_DIR/src ]; then
 fi
 git submodule update --remote
 git -C $MONERO_DIR fetch
-git -C $MONERO_DIR checkout release-v0.12
+git -C $MONERO_DIR checkout v0.12.0.0

 # get monero core tag
 get_tag
--- 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
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
luigi1111	755977d1ba	Merge pull request #1241 `bb12774` Submodule: use v0.12 tag instead of branch	2018-04-02 14:50:04 -05:00
dEBRUYNE-1	bb127744af	Submodule: use v0.12 tag instead of branch	2018-04-02 21:35:28 +02:00