Merge https://github.com/monero-project/monero-gui

swap-dev · Jul 24, 2019 · c26e164 · c26e164
2 parents c2eaf7c + 0461a28
commit c26e164
Show file tree

Hide file tree

Showing 21 changed files with 44 additions and 62 deletions.
diff --git a/LeftPanel.qml b/LeftPanel.qml
@@ -114,13 +114,12 @@ Rectangle {
         anchors.top: parent.top
         anchors.topMargin: (persistentSettings.customDecorations)? 50 : 0
 
-        RowLayout {
+        Item {
             Item {
                 anchors.left: parent.left
                 anchors.top: parent.top
                 anchors.topMargin: 20
                 anchors.leftMargin: 20
-                anchors.verticalCenter: parent.verticalCenter
                 height: 490
                 width: 260
 
@@ -230,7 +229,6 @@ Rectangle {
                 anchors.top: parent.top
                 anchors.topMargin: 20
                 anchors.leftMargin: 20
-                anchors.verticalCenter: parent.verticalCenter
                 height: 490
                 width: 50
 

diff --git a/MiddlePanel.qml b/MiddlePanel.qml
@@ -209,13 +209,13 @@ Rectangle {
             clip: true
 
             ScrollBar.vertical: ScrollBar {
-                parent: mainFlickable.parent
+                parent: root
                 anchors.left: parent.right
-                anchors.leftMargin: 3
+                anchors.leftMargin: -14 // 10 margin + 4 scrollbar width
                 anchors.top: parent.top
-                anchors.topMargin: 4
+                anchors.topMargin: persistentSettings.customDecorations ? 60 : 10
                 anchors.bottom: parent.bottom
-                anchors.bottomMargin: persistentSettings.customDecorations ? 4 : 0 
+                anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10
             }
 
             onFlickingChanged: {

diff --git a/components/LabelSubheader.qml b/components/LabelSubheader.qml
@@ -34,8 +34,6 @@ import "../components/effects/" as MoneroEffects
 Label {
     id: item
     fontSize: 18
-    anchors.left: parent.left
-    anchors.right: parent.right
 
     Rectangle {
         anchors.top: item.bottom

diff --git a/components/PasswordDialog.qml b/components/PasswordDialog.qml
@@ -390,7 +390,7 @@ Item {
                 MoneroComponents.StandardButton {
                     id: cancelButton
                     small: true
-                    text: root.walletName.length > 0 ? qsTr("Change wallet") + translationManager.emptyString : qsTr("Cancel") + translationManager.emptyString
+                    text: qsTr("Cancel") + translationManager.emptyString
                     KeyNavigation.tab: passwordInput1
                     onClicked: {
                         root.close()
@@ -407,7 +407,7 @@ Item {
                 MoneroComponents.StandardButton {
                     id: okButton
                     small: true
-                    text: qsTr("Continue") + translationManager.emptyString
+                    text: qsTr("Ok") + translationManager.emptyString
                     KeyNavigation.tab: cancelButton
                     enabled: (passwordDialogMode == true) ? true : passwordInput1.text === passwordInput2.text
                     onClicked: {

diff --git 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 origin/master
+git -C $MONERO_DIR checkout v0.14.1.2
 
 # get swap core tag
 pushd $MONERO_DIR

diff --git a/installers/windows/Monero.iss b/installers/windows/Monero.iss
@@ -8,7 +8,7 @@ AppName=Monero GUI Wallet
 ; Thus it's important to keep this stable over releases
 ; With a different "AppName" InnoSetup would treat a mere update as a completely new application and thus mess up
 
-AppVersion=0.14.1.0
+AppVersion=0.14.1.2
 DefaultDirName={pf}\Monero GUI Wallet
 DefaultGroupName=Monero GUI Wallet
 UninstallDisplayIcon={app}\monero-wallet-gui.exe

diff --git a/installers/windows/README.md b/installers/windows/README.md
@@ -34,11 +34,13 @@ You can only build on Windows, and the result is always a
 Windows .exe file that can act as a standalone installer for the
 Boron Butterfly GUI wallet.
 
+Note that the installer build process is now reproducible / deterministic. For details check the file [Deterministic.md](Deterministic.md).
+
 The build steps in detail:
 
 1. Install *Inno Setup*. You can get it from [here](http://www.jrsoftware.org/isdl.php)
 2. Get the Inno Setup script plus related files by cloning the whole [monero-gui GitHub repository](https://github.com/monero-project/monero-gui); you will only need the files in the installer directory `installers\windows` however. Depending on development state, additionally you may have to checkout a specific branch, like `release-v0.14`.
-3. The setup script is written to take the GUI wallet files from a subdirectory named `bin`; so create `installers\windows\bin`, get the zip file of the GUI wallet from [here](https://getmonero.org/downloads/), unpack it somewhere, and copy all the files and subdirectories in the single subdirectory there (currently named `monero-gui-0.14.1.0`) to this `bin` subdirectory
+3. The setup script is written to take the GUI wallet files from a subdirectory named `bin`; so create `installers\windows\bin`, get the zip file of the GUI wallet from [here](https://getmonero.org/downloads/), unpack it somewhere, and copy all the files and subdirectories in the single subdirectory there (currently named `monero-gui-0.14.1.2`) to this `bin` subdirectory
 4. Start Inno Setup, load `Monero.iss` and compile it
 5. The result i.e. the finished installer will be the file `mysetup.exe` in the `installers\windows\Output` subdirectory 
 
diff --git a/installers/windows/ReadMe.htm b/installers/windows/ReadMe.htm
@@ -7,7 +7,7 @@
 <h1>Monero Boron Butterfly GUI Wallet</h1>
 
   <p>Copyright (c) 2014-2019, The Monero Project<br>
-  Date: May 7, 2019</p>
+  Date: July 20, 2019</p>
 
 <h2>Preface</h2>
 
@@ -23,7 +23,7 @@ <h2>Preface</h2>
 
 <h2>Content of the Package</h2>
 
-  <p>You just installed the <i>Monero GUI wallet</i> for Windows, release Boron Butterfly, version 0.14.1.0.
+  <p>You just installed the <i>Monero GUI wallet</i> for Windows, release Boron Butterfly, version 0.14.1.2.
   The wallet enables you to send and receive Moneroj in a secure and very private way.
   </p>
 
@@ -61,7 +61,7 @@ <h2>Access to the Blockchain</h2>
   provides the most security and privacy possible for you.</p>
 
   <p>However if your Internet access makes it difficult to run a full node, or if you have simply no room to store
-  the blockchain locally (somewhat over 70 GB in May 2019, and of course growing), you can compromise and try to connect
+  the blockchain locally (somewhat over 70 GB in July 2019, and of course growing), you can compromise and try to connect
   to a remote node. One way of finding such a node is checking
   <a href="https://moneroworld.com/#nodes">this page</a>.
   </p>

diff --git a/installers/windows/monero-wallet-gui.log b/installers/windows/monero-wallet-gui.log
diff --git a/pages/Account.qml b/pages/Account.qml
@@ -101,8 +101,7 @@ Rectangle {
                     id: balanceAll
                     font.family: MoneroComponents.Style.fontMonoRegular.name;
                     font.pixelSize: 16
-                    color: MoneroComponents.Style.dimmedFontColor
-                    themeTransition: false
+                    color: MoneroComponents.Style.defaultFontColor
 
                     MouseArea {
                         hoverEnabled: true
@@ -135,8 +134,7 @@ Rectangle {
                     id: unlockedBalanceAll
                     font.family: MoneroComponents.Style.fontMonoRegular.name;
                     font.pixelSize: 16
-                    color: MoneroComponents.Style.dimmedFontColor
-                    themeTransition: false
+                    color: MoneroComponents.Style.defaultFontColor
 
                     MouseArea {
                         hoverEnabled: true
@@ -177,7 +175,7 @@ Rectangle {
                 ListView {
                     id: subaddressAccountListView
                     Layout.fillWidth: true
-                    anchors.fill: parent
+                    Layout.fillHeight: true
                     clip: true
                     boundsBehavior: ListView.StopAtBounds
                     interactive: false
@@ -365,6 +363,7 @@ Rectangle {
                         appWindow.currentWallet.subaddressAccount.addRow(inputDialog.inputText)
                         appWindow.currentWallet.switchSubaddressAccount(appWindow.currentWallet.numSubaddressAccounts() - 1)
                         current_subaddress_account_table_index = appWindow.currentWallet.numSubaddressAccounts() - 1
+                        subaddressAccountListView.currentIndex = current_subaddress_account_table_index
                         appWindow.onWalletUpdate();
                     }
                     inputDialog.onRejectedCallback = null;

diff --git a/pages/AddressBook.qml b/pages/AddressBook.qml
@@ -145,7 +145,7 @@ Rectangle {
                 ListView {
                     id: addressBookListView
                     Layout.fillWidth: true
-                    anchors.fill: parent
+                    Layout.fillHeight: true
                     clip: true
                     boundsBehavior: ListView.StopAtBounds
                     interactive: false

diff --git a/pages/History.qml b/pages/History.qml
@@ -249,7 +249,6 @@ Rectangle {
                         font.pixelSize: 15
                         text: qsTr("Blockheight") + translationManager.emptyString
                         color: root.sortBy === "blockheight" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor
-                        anchors.verticalCenter: parent.verticalCenter
                         themeTransition: false
                     }
 
@@ -310,7 +309,6 @@ Rectangle {
                         text: qsTr("Date") + translationManager.emptyString
                         color: root.sortBy === "timestamp" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor
                         themeTransition: false
-                        anchors.verticalCenter: parent.verticalCenter
                     }
 
                     MoneroEffects.ImageMask {
@@ -370,7 +368,6 @@ Rectangle {
                         text: qsTr("Amount") + translationManager.emptyString
                         color: root.sortBy === "amount" ? MoneroComponents.Style.defaultFontColor : MoneroComponents.Style.dimmedFontColor
                         themeTransition: false
-                        anchors.verticalCenter: parent.verticalCenter
                     }
 
                     MoneroEffects.ImageMask {

diff --git a/pages/Receive.qml b/pages/Receive.qml
@@ -101,7 +101,7 @@ Rectangle {
                 ListView {
                     id: subaddressListView
                     Layout.fillWidth: true
-                    anchors.fill: parent
+                    Layout.fillHeight: true
                     clip: true
                     boundsBehavior: ListView.StopAtBounds
                     interactive: false
@@ -256,6 +256,7 @@ Rectangle {
                     inputDialog.onAcceptedCallback = function() {
                         appWindow.currentWallet.subaddress.addRow(appWindow.currentWallet.currentSubaddressAccount, inputDialog.inputText)
                         current_subaddress_table_index = appWindow.currentWallet.numSubaddresses(appWindow.currentWallet.currentSubaddressAccount) - 1
+                        subaddressListView.currentIndex = current_subaddress_table_index
                     }
                     inputDialog.onRejectedCallback = null;
                     inputDialog.open()

diff --git a/pages/merchant/Merchant.qml b/pages/merchant/Merchant.qml
@@ -93,9 +93,8 @@ Item {
         anchors.right: parent.right
 
         Item {
-            height: 220
-            anchors.left: parent.left
-            anchors.right: parent.right
+            Layout.preferredHeight: 220
+            Layout.fillWidth: true
 
             Rectangle {
                 id: tracker
@@ -258,8 +257,7 @@ Item {
 
         Item {
             Layout.preferredHeight: 40
-            anchors.left: parent.left
-            anchors.right: parent.right
+            Layout.fillWidth: true
 
             Item {
                 width: (parent.width - qrImg.width) - (50)
@@ -524,8 +522,7 @@ Item {
         Item {
             Layout.topMargin: 32
             Layout.preferredHeight: 40
-            anchors.left: parent.left
-            anchors.right: parent.right
+            Layout.fillWidth: true
 
             ColumnLayout {
                 spacing: 16
@@ -630,7 +627,7 @@ Item {
                     in_txpool = true;
                 } else {
                     if (blockchainHeight == null)
-                        blockchainHeight = appWindow.currentWallet.blockChainHeight()
+                        blockchainHeight = walletManager.blockchainHeight()
                     confirmations = blockchainHeight - blockHeight - 1
                     displayAmount = model.data(idx, TransactionHistoryModel.TransactionDisplayAmountRole);
                 }

diff --git a/src/qt/MoneroSettings.cpp b/src/qt/MoneroSettings.cpp
@@ -147,7 +147,8 @@ void MoneroSettings::reset()
 {
     if (this->m_initialized && this->m_settings && !this->m_changedProperties.isEmpty())
         this->store();
-    delete this->m_settings;
+    if (this->m_settings)
+        delete this->m_settings;
 }
 
 void MoneroSettings::store()

diff --git a/src/qt/MoneroSettings.h b/src/qt/MoneroSettings.h
@@ -72,7 +72,7 @@ public slots:
     void store();
 
     QHash<const char *, QVariant> m_changedProperties;
-    QSettings *m_settings;
+    QSettings *m_settings = NULL;
     QString m_fileName = QString("");
     bool m_initialized = false;
     int m_timerId = 0;

diff --git a/src/qt/prices.cpp b/src/qt/prices.cpp
@@ -53,7 +53,7 @@ void Prices::getJSON(const QString url) {
 void Prices::gotJSON() {
     // Check connectivity
     if (!m_reply || m_reply->error() != QNetworkReply::NoError){
-        this->gotError();
+        this->gotError("Problem with reply from server. Check connectivity.");
         m_reply->deleteLater();
         return;
     }
@@ -105,6 +105,6 @@ void Prices::gotError() {
 }
 
 void Prices::gotError(const QString &message) {
-    qCritical() << __FUNCTION__ << ": Error: " << message;
+    qCritical() << "[Fiat API] Error:" << message;
     emit priceJsonError(message);
 }
diff --git a/wizard/WizardAskPassword.qml b/wizard/WizardAskPassword.qml
@@ -83,7 +83,7 @@ ColumnLayout {
 
     WizardHeader{
         title: qsTr("Give your wallet a password") + translationManager.emptyString
-        subtitle: qsTr("This password cannot be recovered. If you forget it then the wallet will have to be restored from its 25 word mnemonic seed.") + translationManager.emptyString
+        subtitle: qsTr("This password cannot be recovered. If you forget it then the wallet will have to be restored from your %1.").arg(!wizardController.walletOptionsIsRecoveringFromDevice ? qsTr("25 word mnemonic seed") : qsTr("hardware wallet"))+ translationManager.emptyString
     }
 
     MoneroComponents.WarningBox {
@@ -97,23 +97,12 @@ ColumnLayout {
 
         TextInput {
             id: progressText
-            anchors.top: parent.top
-            anchors.topMargin: 6
+            Layout.topMargin: 6
+            Layout.bottomMargin: 6
             font.family: MoneroComponents.Style.fontMedium.name
             font.pixelSize: 14
             font.bold: false
             color: MoneroComponents.Style.defaultFontColor
-            text: root.passwordStrengthText + '-'
-            height: 18
-            passwordCharacter: "*"
-        }
-
-        TextInput {
-            id: progressTextValue
-            font.family: MoneroComponents.Style.fontMedium.name
-            font.pixelSize: 13
-            font.bold: true
-            color: MoneroComponents.Style.defaultFontColor
             height: 18
             passwordCharacter: "*"
         }

diff --git a/wizard/WizardController.qml b/wizard/WizardController.qml
@@ -273,12 +273,13 @@ Rectangle {
             clip: true
 
             ScrollBar.vertical: ScrollBar {
-                parent: wizardFlickable.parent
+                parent: wizardController
                 anchors.left: parent.right
-                anchors.leftMargin: 3
+                anchors.leftMargin: -14 // 10 margin + 4 scrollbar width
                 anchors.top: parent.top
-                anchors.topMargin: 4
+                anchors.topMargin: persistentSettings.customDecorations ? 60 : 10
                 anchors.bottom: parent.bottom
+                anchors.bottomMargin: persistentSettings.customDecorations ? 15 : 10
             }
 
             onFlickingChanged: {

diff --git a/wizard/WizardHeader.qml b/wizard/WizardHeader.qml
@@ -69,7 +69,7 @@ ColumnLayout {
 
     TextArea {
         Layout.fillWidth: true
-        anchors.horizontalCenter: parent.horizontalCenter
+        Layout.alignment: Qt.AlignCenter
         visible: parent.subtitle !== ""
 
         color: MoneroComponents.Style.dimmedFontColor

diff --git a/wizard/WizardLanguage.qml b/wizard/WizardLanguage.qml
@@ -60,7 +60,7 @@ Rectangle {
             id: textWelcome
             opacity: 0
             Layout.preferredWidth: parent.width / 1.3
-            anchors.horizontalCenter: parent.horizontalCenter
+            Layout.alignment: Qt.AlignCenter
             color: MoneroComponents.Style.defaultFontColor
             text: "Welcome - Wilkommen - Bonvenon - Bienvenido - Bienvenue - Välkommen - Selamat datang - Benvenuto - 歡迎 - Welkom - Bem Vindo - добро пожаловать"
 
@@ -97,7 +97,7 @@ Rectangle {
             }
             Layout.preferredWidth: size
             Layout.preferredHeight: size
-            anchors.horizontalCenter: parent.horizontalCenter
+            Layout.alignment: Qt.AlignCenter
             mipmap: true
 
             property bool animSlow: false
@@ -149,7 +149,7 @@ Rectangle {
             id: buttonsGrid
             opacity: 0
             columns: isMobile ? 1 : 2
-            anchors.horizontalCenter: parent.horizontalCenter
+            Layout.alignment: Qt.AlignCenter
             Layout.topMargin: 20
             Layout.fillWidth: true
             columnSpacing: 20
@@ -190,7 +190,7 @@ Rectangle {
         MoneroComponents.TextPlain {
             id: versionText
             opacity: 0
-            anchors.horizontalCenter: parent.horizontalCenter
+            Layout.alignment: Qt.AlignCenter
             font.bold: true
             font.pixelSize: 12
             font.family: MoneroComponents.Style.fontRegular.name