From 83ef11b98c917b7055010f1e325c3b607e0b94b4 Mon Sep 17 00:00:00 2001 From: wowario Date: Wed, 20 May 2020 12:51:41 +0300 Subject: [PATCH] woow --- .DS_Store | Bin 0 -> 10244 bytes build.sh | 2 +- images/.DS_Store | Bin 0 -> 14340 bytes images/monero-vector.svg | 51 +++++- images/themes/.DS_Store | Bin 0 -> 6148 bytes images/themes/white/Monero-Logo.svg | 265 +++++++++++++++++++++++----- main.qml | 10 +- qml.qrc | 3 - src/qt/updater.cpp | 3 - version.js | 2 +- wownero | 2 +- wownero-app.pro | 4 - 12 files changed, 280 insertions(+), 62 deletions(-) create mode 100644 .DS_Store create mode 100644 images/.DS_Store create mode 100644 images/themes/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..69ef4afd224411ce80f4408a844f58591634aa73 GIT binary patch literal 10244 zcmeHMYit}>6+UOFJ~WPd+2(` z-PyI{I<8y-w1PgwL!zXBO4~muLG2HcmQwMD7Fs|^s8&lVUMdJ7C{PMS${)(P_s(p* z>qH{7pa|_qJ7?~>_uM=8%y-ZE?p*-DP%72{;0FMSeoU$g-EMHPdiGm(c^r*Q63HGQ z7MZc9B5^CStZhz_^FYo6IS=GKkn=#!1Gk3{RP_#GK^9A2Xsu)*yS^*1&)&)53r8XB5*)cSYss-K^i zrLyXVmafy2v-i!NoxlIfVpixx1}Mmy<@wAh#_j2LaYW&{;!g1`cZ#xiwX#O*={@u@ zrGHc{nx?n!n@Sp%X&==SHpx-7z@`~@MJ=;Gp|kp-s1;95n)aw#7!AjxsdzZ4x5eWF z#(g^J3hZdYipTpc+hE;{3@7z7NmjS4YWSFKC6evDvr$z|+4^Cf`ZA{V4(ib!HfTs@ zsG@vfZP|uRTedgu+S_(uu|O>>Qk0U?p=rZ5B5{2rY)5r7W|-qgW{g;J;utyAOd4Z` zo{;52PyL`7p41nM%6%1gRBD=NbKS=6WjGZv?oAoVSv4R@i$!W-fnTdqPQ>U{4p}kQ zTTD_f$-JgotJ03Mn)ZZF_n2c)qis_LZF*x#4U2|#O1(084}Eo6wS}fh*{L0gha-Ai zR%2qEW@V2yG%dU>t35*5qO@wmQEPINree#5SS!>atwTG-M(z#U$-XJwWN-B<)zR!a zt2Awd)wRW9?46`Q@VWOmGy=gb0wMtyDcmP=AXx7xB+#G{I-nO$LjvaD5qKOfz_;Ks zJP+T4AHyR25`GJRfp_7r@OQX|9+a>MD=>i7xEVi!_1J>@Fo z9Bn*9|a$MA7{62Fd5<1_e8yo}G|i})RU8DGamd;{OaU*jL}kN6J$ z39sV&9?7%DvsS#P$A$de?nE4Y8ObH9njr6-%6Xo=G2|;d4|a7cy|*vqudHP_UsqgG zTIR3bdgqSa``XiZ$U?wUD02J>fN|itz~Ub~1I>$kK`84txGUiLnhO{z$S_CrbNaqwH z`>-GH#sNHnr*ITcV+3P3i6&ZjFJbsB&g1>KfS=$PeuOamIXsU~;8*Z#gynDG1-yvQ z;&b?Ij^&r|75oVy`RDkHEaV=_L@xd=6S>m^2{Ue)wxRl~@{u#f2rMC1vF$zKV*l zG3%xwCL>P{kAxG6usN=WW>50;&}W9MWYU^ko`3mB15@EBWxPP^y8=&vV88p|#CjFd z(LNA7CzO(kgQjKbGKKyg(Vn&;+n^1)VE`sz1|Eg;a1maBSKuvp2d-ismSPod!yOdh zTk#+*ki$5LBX|st3;T3P)|~zvfiZf>__9lQ$d}wN`!jT?7V!{YSGV`W2*~MgeGB|T zDbcDnZ>!(Ar?q2o4Z+LnT~~awxOiiJQCe26`YL>tu2nYAkcd~LIffX+=if;2@=|70 zW~2Lj{%T2D8rB_ynyoCr@)+;DX5F1EsPa(HH9l|C4i z@B?@iUL#)dQ-ays@OyZVV)H-XD!fm;LPjqt=p)z#a1$|$-M9zuBKU={2Yc}l#pyvj z$zybw7{(Mu=L9A>yZAIdh@ZhPP)z=cGm8v-)Z`>i?v%2lAF+tAIFpA$MIBP$MKwGlg>R=VRk{% iGr1rnJ<;_)|1-eM?f-N8e{1IUJgd&2-2b)x|Gxmqe4_RM literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..4ee1b9c5446a6e8b79cb9c592c76d8d0767e9a2a GIT binary patch literal 14340 zcmeHN-EJF26rN4ecJt>rZGIZ55|$8%i#Q|!L?l!xq(u;^NEJZ^2~cXsA-3vxBYT~n zhM?TQGZdZx-hxZG;*wYBJr4licXpl3tY;@lFLF`MM(dgVIo~;R&Nnk>CaaVR*1EMN zr52S^Ax@UXG5q|jREec_@Hx-EV-R-&oKJ9~UR0{Bwp3kJR7=HuZ};CAz%9xT;SANT z+ScXwH`=Xc)Y?hk0l4}I=R5z&fto+O2fPQo2fPQo2fPPf#RHssafG8u>3_Wkya&7o z&OE^Jp@fs=YFeHqr3@YTVG7UZOyT7~ovAwSmC|xGEl-mYPjCc@D9S`MNS7EvB98l| z^u5)zJWa|(Tm_;TIH~3!U7-Y`9rsJ}x(Zg4(*Jr7cn|b@;9cCB#@f4~YWQnn4gOfx z@7t(v$XdRpB6Xk^)E-v#JL}D8tJ;jJkU~cbe!}@uTak|mQVVEAd=9h))lvI>a{p%J z#?R!SLmlF(ZPz$Z$w(G0lB;SN7*>l1{?5oxLOw#vxc3mLGHl((9!88hEwI==ct3+M zWgx6Wns{Z{umUUiYqf;C83SKyzMH)e$I&kJdj_pwMYCEG%w}XK4B1C$&koLIdpiQe z(rAb2kDl}Fupr03AmJ?LTt51_Xx zeImxy_rj1}sWs%T)tlspfq3rv?h2rElj*yDT8bbc_+f=$wr)7QMm?U1r>nacC1x=#rC$ z~*f#9rb6RSR4Vhu!zxm4e zj#iLAhL(f@9k7R^Y_=6vOF7dR7}HKmUDkk02GTH)8W>;du*W*$lSzg|L6i6xb3E--0W9e8xG0*L*y2m)xdyj4KycZ!(ByrJCM9#!C?uBKXg|k z{%ATdGF4^DY1K}08&ZXgltUxQ-6zXIIYx^+?pAZKGh`>Bw_nz!9q~61W&|NgzaFAf zGRfhPQA7K;#Hu9W&6!9Ithq~JIjkcu48&<5QhyWnFwttlqMdXAY2ry0OtD6Y{4kI* zoycE$4|or_Jn%Lij-k8l;g3TBR}u?SYh~wP4x+~Y-$$)-kvVg75H+O2j8t}}$H3`+ z|8<@1`y7**@fYB@Ub0z6t(QiYQR8xT3nf3m;3iHPf$U#Cumjbj>A5&M%3Z?*ZGahdIi?eIwW2JY0v>oVN`0+nD3J znDLGf8%FaI^Rjfu7g|m;?Zj|cBVANSnv%f~V>xvY35sXRGF+jy6AH1FG^%}%T% z-n#;#!&2d;j(f4CI@2w27GCOz7h8Ic=&+O-wBdmXc%YZ}UfBPbAsN!ckY*;-kxa z8hpk+!>yq&;EQCmrOz$AV}uQ~JFuZQqW4xMCQmFVjJkm`a{-FOmmE)mLyZOF7A$L9 zgb%u8(IV;4%(arCnZAe+4{pDnZ!dCXki^Prg>XT)g1&H}xGW-1bgY6E%W8-4M3Qk^f;WT?l zjupZL9jouNPIKgu$UEPEEt5UJ{x?_ce*KT>-XGor*Xw~BiMmC8|MyA$_y5;xl-K4x z;5~4y9tegWZaiFr%HIE?vfBBrT?yw?oP6gGoIFq$5&ZBKUdZQoxZvk_E4 -image/svg+xml + +image/svg+xml diff --git a/images/themes/.DS_Store b/images/themes/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..d323f991fbdc416cfa1b71937034de8ebaca8cb6 GIT binary patch literal 6148 zcmeHK!Ab)$5KU^UX+`Wo&|@xwhaS3BQ4nFNdhjN!=t0Hq+F}>hO=-6-S}Xe-`bU0& zpQAHLDwXO{u`&abH#?chZeBvN!x-cBe$!#B%or1(h`Ay(UkLW2PDsvrW&pV!qjeam zs~}RrL@YV}CIh&31(vcl3t7U(*AKVE4(QsO7XA5SkwMz)*p+?>I#Jk5s?}GXo5>eu z=Y%MU(n9INYpc{t{G{Kj``t5qI`WftVC`e2q7T~-PQq4tSzg*xapH$@tE-d4W(z{j zPs6yW(z@!$&7K~|GaW({Me(w{G8j0uimcVPhZQ++ob`>0+}x@Theffx>g*miZtm^} z55vbNJqgBPvuatiID%&|#-@1db>m3I*Wevxj3Nn%0b+m{m}&;>p(f_1dKUEY!~iky z6Aa+_AVCpbip^0Kh!BwSbL3j+i4Yx)w8o&;!CvDxgW_w#48j9sJV9xfU~n zCY^Cxd~o|_ZYvb7-wxwT9nQFGkXmAZ82HQp)_x#my#Eirum5!rHN*fh@IM*g`F(G{ z4s)}2>%=Vau9ct-P!x>I41T15p|4_y#jAJ)R15ee8i20F%piC`=tn@)Kn*eQs|>sY DR7PB` literal 0 HcmV?d00001 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