Merge pull request #1 from stoffu/aeon-dark

Aeon port

.gitignore

@@ -9,5 +9,5 @@ moc_*
 *.mak
 *.build
 *.xcodeproj
-monero-wallet-gui_plugin_import.cpp
-monero-wallet-gui_qml_plugin_import.cpp
+aeon-wallet-gui_plugin_import.cpp
+aeon-wallet-gui_qml_plugin_import.cpp

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "monero"]
 	path = monero
-	url = https://github.com/monero-project/monero
+	url = https://github.com/aeonix/aeon-rebase
 	ignore = all

LeftPanel.qml

@@ -312,7 +312,7 @@ Rectangle {
                 anchors.right: parent.right
                 text: qsTr("Send") + translationManager.emptyString
                 symbol: qsTr("S") + translationManager.emptyString
-                dotColor: "#FF6C3C"
+                dotColor: "#5FBCD2"
                 onClicked: {
                     parent.previousButton.checked = false
                     parent.previousButton = transferButton
@@ -337,7 +337,7 @@ Rectangle {
                 anchors.right: parent.right
                 text: qsTr("Address book") + translationManager.emptyString
                 symbol: qsTr("B") + translationManager.emptyString
-                dotColor: "#FF4F41"
+                dotColor: "#5FBCD2"
                 under: transferButton
                 onClicked: {
                     parent.previousButton.checked = false
@@ -473,6 +473,7 @@ Rectangle {
                 height: 1
             }
             // ------------- Shared RingDB tab ---------------
+            /*
             MenuButton {
                 id: sharedringdbButton
                 anchors.left: parent.left
@@ -495,6 +496,7 @@ Rectangle {
                 color: "#313131"
                 height: 1
             }
+            */
 
 
             // ------------- Sign/verify tab ---------------

README.md

@@ -1,4 +1,4 @@
-# Monero GUI
+# Aeon GUI
 
 Copyright (c) 2014-2018, The Monero Project
 

monero-wallet-gui.pro → aeon-wallet-gui.pro

@@ -313,6 +313,7 @@ macx {
         -L/usr/local/opt/boost/lib \
         -lboost_serialization \
         -lboost_thread-mt \
+        -lboost_system-mt \
         -lboost_system \
         -lboost_date_time \
         -lboost_filesystem \

build.sh

@@ -64,7 +64,7 @@ source ./utils.sh
 pushd $(pwd)
 ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 MONERO_DIR=monero
-MONEROD_EXEC=monerod
+MONEROD_EXEC=aeond
 
 MAKE='make'
 if [[ $platform == *bsd* ]]; then
@@ -91,9 +91,9 @@ if [ "$ANDROID" != true ] && ([ "$platform" == "linux32" ] || [ "$platform" == "
 fi
 
 if [ "$platform" == "darwin" ]; then
-    BIN_PATH=$BIN_PATH/monero-wallet-gui.app/Contents/MacOS/
+    BIN_PATH=$BIN_PATH/aeon-wallet-gui.app/Contents/MacOS/
 elif [ "$platform" == "mingw64" ] || [ "$platform" == "mingw32" ]; then
-    MONEROD_EXEC=monerod.exe
+    MONEROD_EXEC=aeond.exe
 fi
 
 # force version update
@@ -109,7 +109,7 @@ if ! QMAKE=$(find_command qmake qmake-qt5); then
     echo "Failed to find suitable qmake command."
     exit 1
 fi
-$QMAKE ../monero-wallet-gui.pro "$CONFIG" || exit
+$QMAKE ../aeon-wallet-gui.pro "$CONFIG" || exit
 $MAKE || exit 
 
 # Copy monerod to bin folder

components/HistoryTable.qml

@@ -173,7 +173,7 @@ ListView {
                         _amount = (_amount *1);
                     }
 
-                    return _amount + " XMR";
+                    return _amount + " AEON";
                 }
                 color: isOut ? "white" : "#2eb358"
             }
@@ -311,7 +311,7 @@ ListView {
                     if(!isOut && !fee){
                         return "-";
                     } else if(isOut && fee){
-                        return fee + " XMR";
+                        return fee + " AEON";
                     } else {
                         return "Unknown"
                     }

components/LineEdit.qml

@@ -187,7 +187,7 @@ Item {
             anchors.topMargin: 8 * scaleRatio
             anchors.left: parent.left
             anchors.leftMargin: 12 * scaleRatio
-            source: "../images/moneroIcon-28x28.png"
+            source: "../images/aeonIcon-28x28.png"
             visible: false
         }
 

components/MobileHeader.qml

@@ -21,7 +21,7 @@ Rectangle {
         anchors.verticalCenterOffset: -5
         anchors.left: parent.left
         anchors.leftMargin: 50 * scaleRatio
-        source: "../images/moneroLogo2.png"
+        source: "../images/aeonLogo2.png"
     }
 
     Image {
@@ -30,7 +30,7 @@ Rectangle {
         anchors.verticalCenter: parent.verticalCenter
         anchors.left: parent.left
         anchors.leftMargin: 40 * scaleRatio 
-        source: "../images/moneroIcon.png"
+        source: "../images/aeonIcon.png"
     }
 
     Grid {

components/PrivacyLevel.qml

@@ -62,7 +62,7 @@ Item {
             //radius: 2
             width: row.x
 
-            color: "#FF6C3C"
+            color: "#3D9EFF"
 
             Timer {
                 interval: 500
@@ -121,7 +121,7 @@ Item {
                     id: delegateItem2
                     currentX: x + row2.x
                     currentIndex: index
-                    mainTick: currentIndex === 0
+                    mainTick: currentIndex === 1
                     Component.onCompleted: {
                         row.positions[currentIndex] = delegateItem2
                     }
@@ -147,5 +147,9 @@ Item {
                 }
             }
         }
+        Component.onCompleted: {
+            fillRect.width = Qt.binding(function(){ return row.positions[1].currentX + row.x })
+            item.fillLevel = 1
+        }
     }
 }

components/PrivacyLevelSmall.qml

@@ -71,7 +71,7 @@ Item {
             //radius: 2
             width: row.x
 
-            color: "#FF6C3C"
+            color: "#3D9EFF"
 
             Timer {
                 interval: 500

components/ProgressBar.qml

@@ -104,7 +104,7 @@ Rectangle {
                 width: (maxWidth * fillLevel) / 100
                 radius: 8
                 // could change color based on progressbar status; if(item.fillLevel < 99 )
-                color: "#FA6800"
+                color: "#19AFE1"
             }
 
             Rectangle {

components/StandardDropdown.qml

@@ -188,7 +188,7 @@ Item {
                         font.family: MoneroComponents.Style.fontRegular.name
                         font.bold: true
                         font.pixelSize: fontItemSize
-                        color: itemArea.containsMouse || index === column.currentIndex || itemArea.containsMouse ? "#FA6800" : "#FFFFFF"
+                        color: itemArea.containsMouse || index === column.currentIndex || itemArea.containsMouse ? "#4DD2FF" : "#FFFFFF"
                         text: qsTr(column1) + translationManager.emptyString
                     }
 

components/Style.qml

@@ -21,8 +21,8 @@ QtObject {
     property string inputBorderColorInActive: Qt.rgba(255, 255, 255, 0.32)
     property string inputBorderColorInvalid: Qt.rgba(255, 0, 0, 0.40)
 
-    property string buttonBackgroundColor: "#FA6800"
-    property string buttonBackgroundColorHover: "#E65E00"
+    property string buttonBackgroundColor: "#19AFE1"
+    property string buttonBackgroundColorHover: "#00ACE6"
     property string buttonBackgroundColorDisabled: "#707070"
     property string buttonBackgroundColorDisabledHover: "#808080"
     property string buttonTextColor: "white"

components/TickDelegate.qml

@@ -54,7 +54,7 @@ Item {
             font.pixelSize: 12 * scaleRatio
             color: MoneroComponents.Style.defaultFontColor
             text: {
-                if(currentIndex === 0) return qsTr("Default") + translationManager.emptyString
+                if(currentIndex === 1) return qsTr("Default") + translationManager.emptyString
                 if(currentIndex === 13) return qsTr("High") + translationManager.emptyString
                 return ""
             }

components/TitleBar.qml

@@ -87,7 +87,7 @@ Rectangle {
             anchors.left: parent.left
             anchors.top: parent.top
             anchors.topMargin: 11
-            width: 125
+            width: 89
             height: 28
             source: "../images/titlebarLogo.png"
         }

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 release-v0.12
 
 # get monero core tag
 get_tag
@@ -33,8 +33,8 @@ git -C $MONERO_DIR submodule update
 # Save current user settings and revert back when we are done with merging PR's
 OLD_GIT_USER=$(git -C $MONERO_DIR config --local user.name)
 OLD_GIT_EMAIL=$(git -C $MONERO_DIR config --local user.email)
-git -C $MONERO_DIR config user.name "Monero GUI"
-git -C $MONERO_DIR config user.email "gui@monero.local"
+git -C $MONERO_DIR config user.name "Aeon GUI"
+git -C $MONERO_DIR config user.email "gui@aeon.local"
 # check for PR requirements in most recent commit message (i.e requires #xxxx)
 for PR in $(git log --format=%B -n 1 | grep -io "requires #[0-9]*" | sed 's/[^0-9]*//g'); do
     echo "Merging monero push request #$PR"

main.cpp

@@ -100,9 +100,9 @@ int main(int argc, char *argv[])
 
     MainApp app(argc, argv);
 
-    app.setApplicationName("monero-gui");
-    app.setOrganizationDomain("getmonero.org");
-    app.setOrganizationName("monero-project");
+    app.setApplicationName("aeon-gui");
+    app.setOrganizationDomain("aeon.cash");
+    app.setOrganizationName("aeonix");
 
 #if defined(Q_OS_LINUX)
     if (isDesktop) app.setWindowIcon(QIcon(":/images/appicon.ico"));
@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
 
     // Log settings
     const QString logPath = getLogPath(parser.value(logPathOption));
-    Monero::Wallet::init(argv[0], "monero-wallet-gui", logPath.toStdString().c_str(), true);
+    Monero::Wallet::init(argv[0], "aeon-wallet-gui", logPath.toStdString().c_str(), true);
     qInstallMessageHandler(messageHandler);
 
 
@@ -255,7 +255,7 @@ int main(int argc, char *argv[])
 
     if (!moneroAccountsRootDir.empty())
     {
-        QString moneroAccountsDir = moneroAccountsRootDir.at(0) + "/Monero/wallets";
+        QString moneroAccountsDir = moneroAccountsRootDir.at(0) + "/Aeon/wallets";
         engine.rootContext()->setContextProperty("moneroAccountsDir", moneroAccountsDir);
     }
 
@@ -265,7 +265,7 @@ int main(int argc, char *argv[])
     if (accountName.isEmpty())
         accountName = qgetenv("USERNAME"); // Windows
     if (accountName.isEmpty())
-        accountName = "My monero Account";
+        accountName = "My aeon Account";
 
     engine.rootContext()->setContextProperty("defaultAccountName", accountName);
     engine.rootContext()->setContextProperty("applicationDirectory", QApplication::applicationDirPath());