diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 00000000..69ef4afd Binary files /dev/null and b/.DS_Store differ diff --git a/build.sh b/build.sh index ddccf5df..3207e816 100755 --- a/build.sh +++ b/build.sh @@ -1,7 +1,7 @@ #!/bin/bash BUILD_TYPE=$1 -BUILD_TREZOR=${BUILD_TREZOR-true} +BUILD_TREZOR=${BUILD_TREZOR-false} source ./utils.sh platform=$(get_platform) # default build type diff --git a/images/.DS_Store b/images/.DS_Store new file mode 100644 index 00000000..4ee1b9c5 Binary files /dev/null and b/images/.DS_Store differ diff --git a/images/monero-vector.svg b/images/monero-vector.svg index 4ebe7da6..2791ef23 100644 --- a/images/monero-vector.svg +++ b/images/monero-vector.svg @@ -1,2 +1,49 @@ - -image/svg+xml + +image/svg+xml diff --git a/images/themes/.DS_Store b/images/themes/.DS_Store new file mode 100644 index 00000000..d323f991 Binary files /dev/null and b/images/themes/.DS_Store differ diff --git a/images/themes/white/Monero-Logo.svg b/images/themes/white/Monero-Logo.svg index ad4d4154..55a2e341 100644 --- a/images/themes/white/Monero-Logo.svg +++ b/images/themes/white/Monero-Logo.svg @@ -1,6 +1,4 @@ - - diff --git a/main.qml b/main.qml index 0a3c4d1b..8d4c4a6a 100644 --- a/main.qml +++ b/main.qml @@ -1373,7 +1373,7 @@ ApplicationWindow { property string blockchainDataDir: "" property bool useRemoteNode: false property string remoteNodeAddress: "" - property string bootstrapNodeAddress: "so.wow.candy.surf:34568" + property string bootstrapNodeAddress: "" property bool segregatePreForkOutputs: false property bool keyReuseMitigation2: false property int segregationHeight: 0 @@ -1383,13 +1383,13 @@ ApplicationWindow { property bool lockOnUserInActivity: true property int walletMode: 2 property int lockOnUserInActivityInterval: 10 // minutes - property bool blackTheme: true - property bool checkForUpdates: true + property bool blackTheme: false + property bool checkForUpdates: false property bool autosave: true property int autosaveMinutes: 10 - property bool fiatPriceEnabled: true - property bool fiatPriceToggle: true + property bool fiatPriceEnabled: false + property bool fiatPriceToggle: false property string fiatPriceProvider: "coingecko" property string fiatPriceCurrency: "wowusd" diff --git a/qml.qrc b/qml.qrc index 84e1c1cc..04bbf64d 100644 --- a/qml.qrc +++ b/qml.qrc @@ -10,9 +10,6 @@ images/whatIsIcon.png images/whatIsIcon@2x.png components/MenuButton.qml - monero/utils/gpg_keys/binaryfate.asc - monero/utils/gpg_keys/fluffypony.asc - monero/utils/gpg_keys/luigi1111.asc pages/Account.qml pages/Transfer.qml pages/History.qml diff --git a/src/qt/updater.cpp b/src/qt/updater.cpp index 17d6eddb..39e34a0a 100644 --- a/src/qt/updater.cpp +++ b/src/qt/updater.cpp @@ -35,9 +35,6 @@ Updater::Updater() { - m_maintainers.emplace_back(fileGetContents(":/monero/utils/gpg_keys/binaryfate.asc").toStdString()); - m_maintainers.emplace_back(fileGetContents(":/monero/utils/gpg_keys/fluffypony.asc").toStdString()); - m_maintainers.emplace_back(fileGetContents(":/monero/utils/gpg_keys/luigi1111.asc").toStdString()); } QByteArray Updater::fetchSignedHash( diff --git a/version.js b/version.js index 8e446ddf..54de0c53 100644 --- a/version.js +++ b/version.js @@ -1,2 +1,2 @@ -var GUI_VERSION = "v0.8.0.0" +var GUI_VERSION = "" var GUI_MONERO_VERSION = "v0.8.0.0" diff --git a/wownero b/wownero index 4c6c7ab8..1271a7e3 160000 --- a/wownero +++ b/wownero @@ -1 +1 @@ -Subproject commit 4c6c7ab87b2a56165f400f6e49f17b9577a2bcad +Subproject commit 1271a7e3a97c0d81816b401627aefb6c6697d0b3 diff --git a/wownero-app.pro b/wownero-app.pro index b2498f5a..4af8d419 100644 --- a/wownero-app.pro +++ b/wownero-app.pro @@ -558,10 +558,6 @@ DISTFILES += \ notes.txt \ monero/src/wallet/CMakeLists.txt -VERSION = $$cat('version.js', lines) -VERSION = $$find(VERSION, 'GUI_VERSION') -VERSION_LONG = $$replace(VERSION, '.*\"v(.*)\"', '\1') -VERSION = $$replace(VERSION, '.*(\d+\.\d+\.\d+\.\d+).*', '\1') # windows application icon RC_ICONS = images/appicon.ico