Merge pull request #9 from stoffu/aeon-upstream-1

Upstream merge 1
aeonix · Sep 4, 2018 · fed7ef4 · fed7ef4
2 parents 06cdc6c + e562ebf
commit fed7ef4
Show file tree

Hide file tree

Showing 28 changed files with 3,790 additions and 3,678 deletions.
diff --git a/README.md b/README.md
@@ -70,47 +70,33 @@ Packaging for your favorite distribution would be a welcome contribution!
 
 ### On Linux:
 
-(Tested on Ubuntu 16.04 x86, 16.10 x64, Gentoo x64 and Linux Mint 18 "Sarah" - Cinnamon x64)
+(Tested on Ubuntu 17.10 x64, Ubuntu 18.04 x64 and Gentoo x64)
 
 1. Install Aeon dependencies
 
-  - For Ubuntu and Mint
+  - For Debian distributions (Debian, Ubuntu, Mint, Tails...)
 
 	`sudo apt install build-essential cmake libboost-all-dev miniupnpc libunbound-dev graphviz doxygen libunwind8-dev pkg-config libssl-dev libzmq3-dev`
 
   - For Gentoo
 
 	`sudo emerge app-arch/xz-utils app-doc/doxygen dev-cpp/gtest dev-libs/boost dev-libs/expat dev-libs/openssl dev-util/cmake media-gfx/graphviz net-dns/unbound net-libs/ldns net-libs/miniupnpc net-libs/zeromq sys-libs/libunwind`
 
-2. Grab an up-to-date copy of the aeon-gui repository
+2. Install Qt:
 
-	`git clone https://github.com/aeonix/aeon-gui.git`
+  *Note*: Qt 5.7 is the minimum version required to build the GUI. This makes **some** distributions (mostly based on debian, like Ubuntu 16.x or Linux Mint 18.x) obsolete. You can still build the GUI if you install an [official Qt release](https://wiki.qt.io/Install_Qt_5_on_Ubuntu), but this is not officially supported.
 
-3. Go into the repository
+  - For Ubuntu 17.10+
 
-	`cd aeon-gui`
-
-4. Install the GUI dependencies
-
-  - For Ubuntu 16.04 x86
-
-	`sudo apt install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qt-labs-folderlistmodel qml-module-qtquick-xmllistmodel qttools5-dev-tools qml-module-qtquick-dialogs`
-
-  - For Ubuntu 16.04+ x64
-
-    `sudo apt install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-xmllistmodel qttools5-dev-tools qml-module-qtquick-dialogs qml-module-qt-labs-settings libqt5qml-graphicaleffects`
-
-  - For Linux Mint 18 "Sarah" - Cinnamon x64
-
-    `sudo apt install qml-module-qt-labs-settings qml-module-qtgraphicaleffects`
+    `sudo apt install qtbase5-dev qt5-default qtdeclarative5-dev qml-module-qtquick-controls qml-module-qtquick-controls2 qml-module-qtquick-dialogs qml-module-qtquick-xmllistmodel qml-module-qt-labs-settings qml-module-qt-labs-folderlistmodel qttools5-dev-tools`
 
   - For Gentoo
 
     `sudo emerge dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtquickcontrols:5 dev-qt/qtquickcontrols2:5 dev-qt/qtgraphicaleffects:5`
 
   - Optional : To build the flag `WITH_SCANNER`
 
-    - For Ubuntu and Mint
+    - For Ubuntu
 
       `sudo apt install qtmultimedia5-dev qml-module-qtmultimedia libzbar-dev`
 
@@ -120,15 +106,17 @@ Packaging for your favorite distribution would be a welcome contribution!
 
       `emerge dev-qt/qtmultimedia:5 media-gfx/zbar`
 
-5. Build the GUI
 
-  - For Ubuntu and Mint
+3. Clone repository
 
-	`./build.sh`
+    `git clone https://github.com/aeonix/aeon-gui.git`
 
-  - For Gentoo
+4. Build
 
-    `QT_SELECT=5 ./build.sh`
+    ```
+    cd aeon-gui
+    ./build.sh
+    ```
 
 The executable can be found in the build/release/bin folder.
 

diff --git a/aeon-wallet-gui.pro b/aeon-wallet-gui.pro
@@ -1,3 +1,8 @@
+# qml components require at least QT 5.7.0
+lessThan (QT_MAJOR_VERSION, 5) | lessThan (QT_MINOR_VERSION, 7) {
+  error("Can't build with Qt $${QT_VERSION}. Use at least Qt 5.7.0")
+}
+
 TEMPLATE = app
 
 QT += qml quick widgets

diff --git a/components/DaemonConsole.qml b/components/DaemonConsole.qml
@@ -150,9 +150,9 @@ Window {
                         textArea.append(_timestamp + " " + _msg);
 
                         // scroll to bottom
-                        if(flickable.contentHeight > content.height){
-                            flickable.contentY = flickable.contentHeight + 20;
-                        }
+                        //if(flickable.contentHeight > content.height){
+                        //    flickable.contentY = flickable.contentHeight + 20;
+                        //}
                     }
                 }
 
@@ -213,4 +213,4 @@ Window {
         color: "#2F2F2F"
         z: 2
     }
-}
+}
diff --git a/pages/Receive.qml b/pages/Receive.qml
@@ -57,7 +57,7 @@ Rectangle {
         var nfields = 0
         s += current_address;
         var amount = amountToReceiveLine.text.trim()
-        if (amount !== "") {
+        if (amount !== "" && amount.slice(-1) !== ".") {
           s += (nfields++ ? "&" : "?")
           s += "tx_amount=" + amount
         }
@@ -433,7 +433,7 @@ Rectangle {
                     onLinkActivated: {
                         receivePageDialog.title  = qsTr("QR Code") + translationManager.emptyString;
                         receivePageDialog.text = qsTr(
-                            "<p>This QR code includes the address you selected above and" +
+                            "<p>This QR code includes the address you selected above and " +
                             "the amount you entered below. Share it with others (right-click->Save) " +
                             "so they can more easily send you exact amounts.</p>"
                         )
@@ -456,12 +456,8 @@ Rectangle {
                         placeholderText: qsTr("Amount to receive") + translationManager.emptyString
                         fontBold: true
                         inlineIcon: true
-                        validator: DoubleValidator {
-                            bottom: 0.0
-                            top: 18446744.073709551615
-                            decimals: 12
-                            notation: DoubleValidator.StandardNotation
-                            locale: "C"
+                        validator: RegExpValidator {
+                            regExp: /(\d{1,8})([.]\d{1,12})?$/
                         }
                     }
                 }
@@ -529,7 +525,7 @@ Rectangle {
                             "<p>This page will automatically scan the blockchain and the tx pool " +
                             "for incoming transactions using this QR code. If you input an amount, it will also check " +
                             "that incoming transactions total up to that amount.</p>" +
-                            "It's up to you whether to accept unconfirmed transactions or not. It is likely they'll be " +
+                            "<p>It's up to you whether to accept unconfirmed transactions or not. It is likely they'll be " +
                             "confirmed in short order, but there is still a possibility they might not, so for larger " +
                             "values you may want to wait for one or more confirmation(s).</p>"
                         )

diff --git a/pages/Settings.qml b/pages/Settings.qml
@@ -686,7 +686,7 @@ Rectangle {
                         if(Utils.isNumeric(_restoreHeight)){
                             _restoreHeight = parseInt(_restoreHeight);
                             if(_restoreHeight >= 0) {
-                                currentWallet.walletCreationHeight = restoreHeightEdit.text
+                                currentWallet.walletCreationHeight = _restoreHeight
                                 // Restore height is saved in .keys file. Set password to trigger rewrite.
                                 currentWallet.setPassword(appWindow.walletPassword)
 

diff --git a/pages/SharedRingDB.qml b/pages/SharedRingDB.qml
@@ -245,7 +245,7 @@ Rectangle {
                 sharedRingDBDialog.text = qsTr(
                     "In order to avoid nullifying the protection afforded by Monero's ring signatures, an output should not " +
                     "be spent with different rings on different blockchains. While this is normally not a concern, it can become one " +
-                    "when a key-reusing Monero clone allows you do spend existing outputs. In this case, you need to ensure this " +
+                    "when a key-reusing Monero clone allows you to spend existing outputs. In this case, you need to ensure this " +
                     "existing outputs uses the same ring on both chains.<br>" +
                     "This will be done automatically by Monero and any key-reusing software which is not trying to actively strip " +
                     "you of your privacy.<br>" +

diff --git a/pages/Transfer.qml b/pages/Transfer.qml
@@ -193,12 +193,8 @@ Rectangle {
                       inlineButtonText: qsTr("All") + translationManager.emptyString
                       inlineButton.onClicked: amountLine.text = "(all)"
 
-                      validator: DoubleValidator {
-                          bottom: 0.0
-                          top: 18446744.073709551615
-                          decimals: 12
-                          notation: DoubleValidator.StandardNotation
-                          locale: "C"
+                      validator: RegExpValidator {
+                          regExp: /(\d{1,8})([.]\d{1,12})?$/
                       }
                   }
               }
@@ -571,7 +567,7 @@ Rectangle {
                     + (transaction.paymentId[i] == "" ? "" : qsTr("\n\payment ID: ") + transaction.paymentId[i])
                     + qsTr("\nAmount: ") + walletManager.displayAmount(transaction.amount(i))
                     + qsTr("\nFee: ") + walletManager.displayAmount(transaction.fee(i))
-                    + qsTr("\nRingsize: ") + transaction.mixin(i+1)
+                    + qsTr("\nRingsize: ") + (transaction.mixin(i)+1)
 
                     // TODO: add descriptions to unsigned_tx_set?
     //              + (transactionDescription === "" ? "" : (qsTr("\n\nDescription: ") + transactionDescription))