Commit 77d9d3b7 authored by coin-server's avatar coin-server

Merge branch 'clean_zerocoin' into 'master'

Cleanup / Icon Fixes / RPC Addons / GUI Cleaning

See merge request ProjectMerge/merge!41
parents db79ad7d 8f86d760
......@@ -107,9 +107,9 @@ HEADERS += src/activemasternode.h \
src/protocol.h \
src/pubkey.h \
src/random.h \
src/rpcclient.h \
src/rpcprotocol.h \
src/rpcserver.h \
src/rpc/client.h \
src/rpc/protocol.h \
src/rpc/server.h \
src/serialize.h \
src/spork.h \
src/streams.h \
......@@ -404,18 +404,18 @@ SOURCES += src/activemasternode.cpp \
src/pubkey.cpp \
src/random.cpp \
src/rest.cpp \
src/rpcblockchain.cpp \
src/rpcclient.cpp \
src/rpcdump.cpp \
src/rpcmasternode-budget.cpp \
src/rpcmasternode.cpp \
src/rpcmining.cpp \
src/rpcmisc.cpp \
src/rpcnet.cpp \
src/rpcprotocol.cpp \
src/rpcrawtransaction.cpp \
src/rpcserver.cpp \
src/rpcwallet.cpp \
src/rpc/blockchain.cpp \
src/rpc/client.cpp \
src/rpc/dump.cpp \
src/rpc/masternode-budget.cpp \
src/rpc/masternode.cpp \
src/rpc/mining.cpp \
src/rpc/misc.cpp \
src/rpc/net.cpp \
src/rpc/protocol.cpp \
src/rpc/rawtransaction.cpp \
src/rpc/server.cpp \
src/rpc/wallet.cpp \
src/spork.cpp \
src/sync.cpp \
src/timedata.cpp \
......
This diff is collapsed.
/* XPM */
static char *bitcoin16[] = {
static char *_555723976560[] = {
/* columns rows colors chars-per-pixel */
"16 16 127 2 ",
" c black",
". c #2F273D",
"X c #30283D",
"o c #31293F",
"O c #312A3E",
"+ c #332A3F",
"@ c #322A40",
"# c #322B40",
"$ c #352C41",
"% c #342D41",
"& c #352D41",
"* c #352E42",
"= c #362E43",
"- c #372F43",
"; c #362E44",
": c #383045",
"> c #3A3149",
", c #3C3549",
"< c #3C334C",
"1 c #3E3453",
"2 c #423A4E",
"3 c #433756",
"4 c #423855",
"5 c #423758",
"6 c #44365D",
"7 c #453A5A",
"8 c #4B4555",
"9 c #4D4558",
"0 c #4D4659",
"q c #4D475A",
"w c #575065",
"e c #5A5263",
"r c #5D5767",
"t c #5C5668",
"y c #524371",
"u c #514072",
"i c #524273",
"p c #544473",
"a c #544477",
"s c #564477",
"d c #594D71",
"f c #574778",
"g c #5A4A79",
"h c #5A4A7A",
"j c #5A4A7B",
"k c #5B4A7B",
"l c #5C4B7C",
"z c #5C4C7C",
"x c #5D4D7C",
"c c #5E5274",
"v c #625B6D",
"b c #625A70",
"n c #60507F",
"m c #686271",
"M c #696473",
"N c #AAFF55",
"B c #5E4D80",
"V c #645484",
"C c #675A83",
"Z c #6C5D88",
"A c #6C5E89",
"S c #6C5E8A",
"D c #71638B",
"F c #71638D",
"G c #73678C",
"H c #7F7B86",
"J c #786B93",
"K c #796B93",
"L c #786A94",
"P c #7A6D94",
"I c #7C6F96",
"U c #7D7095",
"Y c #7C7096",
"T c #7D7197",
"R c #867A9E",
"E c #8C8793",
"W c #918D99",
"Q c #928F9A",
"! c #99959F",
"~ c #8C80A4",
"^ c #968BAB",
"/ c #988EAD",
"( c #9A8FAF",
") c #9894A0",
"_ c #9F99A4",
"` c #9E94B4",
"' c #A39FA9",
"] c #A198B4",
"[ c #A39AB5",
"{ c #A399B6",
"} c #A49AB7",
"| c #A59CB6",
" . c #A69CB8",
".. c #A69DB8",
"X. c #A89EB9",
"o. c #AEACB4",
"O. c #AFADB5",
"+. c #AAA1BB",
"@. c #ABA3BC",
"#. c #AEA5BF",
"$. c #B1AEB6",
"%. c #BAB7BF",
"&. c #80FF80",
"*. c #B1A8C1",
"=. c #B4ADC2",
"-. c #B9B1C7",
";. c #BDBAC3",
":. c #BAB2C8",
">. c #BDB5C9",
",. c #BCB6CA",
"<. c #C0BDC4",
"1. c #C1BBCD",
"2. c #C3BDCD",
"3. c #C3BDCE",
"4. c #C4C4CB",
"5. c #C9C5D3",
"6. c #CDC7D7",
"7. c gray89",
"8. c #E0E0E6",
"9. c #E3E3EA",
"0. c #E6FFE6",
"q. c #EDFFED",
"w. c #FFFFEA",
"e. c #EBE6F0",
"r. c #F2FFF2",
"t. c gray100",
"y. c None",
"16 16 146 2 ",
" c #060606",
". c #090909",
"X c #0C0C0C",
"o c gray6",
"O c #120C0C",
"+ c #0C0614",
"@ c #0C0914",
"# c #0F181C",
"$ c #1A1A18",
"% c #1A181A",
"& c #200F12",
"* c #122A12",
"= c #142814",
"- c #1E3718",
"; c #1E3A18",
": c #2A221E",
"> c #1A0C20",
", c #1C0F22",
"< c #1E1220",
"1 c #1C3620",
"2 c #142D33",
"3 c #1A2835",
"4 c #20282F",
"5 c #3F2A20",
"6 c #2A3E28",
"7 c #303A2F",
"8 c #222A36",
"9 c #252C35",
"0 c #322D3F",
"q c #472723",
"w c #482A27",
"e c #552D28",
"r c #423528",
"t c #125409",
"y c #0C6B06",
"u c #097600",
"i c #0C7106",
"p c #1A6E16",
"a c #30482F",
"s c #324232",
"d c #2C005E",
"f c #063258",
"g c #392F4A",
"h c #273241",
"j c #2C3D47",
"k c #332056",
"l c #3C3055",
"z c #39066F",
"x c #390071",
"c c #3A0673",
"v c #3D0678",
"b c #063F74",
"n c #4B207F",
"m c #2D4B69",
"M c #2F4D72",
"N c #AF2306",
"B c #A22509",
"V c #9D3C2F",
"C c #963F30",
"Z c #D23E06",
"A c #DF330C",
"S c #E6330F",
"D c #E93A0F",
"F c #C73622",
"G c #C33D39",
"H c #BE683E",
"J c #AB703A",
"K c #EC420C",
"L c #EC430C",
"P c #F3580C",
"I c #E24114",
"U c #EE4C14",
"Y c #F55D14",
"T c #F3551A",
"R c #F05D1C",
"E c #E15623",
"W c #D7712D",
"Q c #EC6B25",
"! c #F56822",
"~ c #EB7A25",
"^ c #EF7A25",
"/ c #B92C6A",
"( c #CD365F",
") c #C23A5C",
"_ c #0C9900",
"` c #20880C",
"' c #229C14",
"] c #1CA609",
"[ c #23A216",
"{ c #2DCB14",
"} c #36CF25",
"| c #22E028",
" . c #35EB2D",
".. c #30EC30",
"X. c #47DD33",
"o. c #4AE128",
"O. c #1ABB43",
"+. c #22BB64",
"@. c #F38025",
"#. c #E28739",
"$. c #908074",
"%. c #C29064",
"&. c #5A069C",
"*. c #590998",
"=. c #5F0F9F",
"-. c #60209C",
";. c #770CBE",
":. c #005392",
">. c #065DA1",
",. c #0663A7",
"<. c #1271B7",
"1. c #2D6CA0",
"2. c #0678C4",
"3. c #0979C8",
"4. c #971E9C",
"5. c #A62D94",
"6. c #B73299",
"7. c #921CCC",
"8. c #8A2AC9",
"9. c #992CCF",
"0. c #9D28D7",
"q. c #A333C9",
"w. c #A028D7",
"e. c #12AC92",
"r. c #14A0A0",
"t. c #4686A7",
"y. c #4D92B7",
"u. c #23C184",
"i. c #098AC5",
"p. c #0C86C8",
"a. c #098DC9",
"s. c #0F87D7",
"d. c #0986D9",
"f. c #0987DA",
"g. c #068BDF",
"h. c #098BDD",
"j. c #0993D0",
"k. c #2288D1",
"l. c #2091DF",
"z. c #0CA1C3",
"x. c #2DA5EC",
"c. c #3EAAE0",
"v. c #32A5EE",
"b. c #52A3CF",
"n. c #51B4E2",
"m. c None",
/* pixels */
"y. ",
" t.t.8.%.2.e.r.N ",
" 7.o.Q H M w D R / X.,.9. ",
" $.e 3 y i a a u s j L >. ",
" $.8 7 B ~ .. .( V k A :. ",
" $.9 < g F Y K ] @.f S :. ",
" $.q & d } | J z 1.x S :. ",
" $.q * < C I P [ +.f S :. ",
" $.q = . ) =.{ ^ n h S :. ",
" O.0 ; X ! b 6 p z l Z -. ",
" <.v + @ W r # > 4 5 U 5. ",
" t._ 0 o 2 , : - O c #.0. ",
" t.' m @ $ % 1 T *.t. ",
" &.4.E t G ` 6.N ",
" w.;.3.q. ",
" "
"m.m.m.m.m.m.m.m.m.m.m.m.m.m.m.m.",
"m.m.m.m.m.m.m.m.m.m.m.m.m.m.m.m.",
"m. 9 h m.m.m.m.m.m.m. e w m.m.",
"# m f b M 8 m.m.m.m.q V N B C O ",
"2 a.,.:.>.<.1.3 5 H T S A Z G & ",
"2 z.j.p.d.g.h.l.Q Y K U I F ) & ",
"1 +.e.i.3.s.x.v.^ ^ R ! D / 5.< ",
"; X.O.r.d.2.c.n.#.W P K ( 4.q.< ",
"; o.| ..u.k.x.y.$.~ E 5.9.7.9.> ",
"* ] { .} 8 t.b.%.J : 8.w.;.*.X ",
"* _ ` ' [ m.m.j r m.m.-.=.&.z + ",
"= i t u p m.m.m.m.m.m.-.v z d + ",
"X 7 6 y a m.m.m.m.m.m.l c k 0 ",
"m.m.$ s . m.m.m.m.m.m.O g % m.m.",
"m.m.m.m.m.m.m.m.m.m.m.m.m.m.m.m.",
"m.m.m.m.m.m.m.m.m.m.m.m.m.m.m.m."
};
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
This diff is collapsed.
......@@ -129,9 +129,9 @@ BITCOIN_CORE_H = \
pubkey.h \
random.h \
reverse_iterate.h \
rpcclient.h \
rpcprotocol.h \
rpcserver.h \
rpc/client.h \
rpc/protocol.h \
rpc/server.h \
script/interpreter.h \
script/script.h \
script/sigcache.h \
......@@ -201,14 +201,15 @@ libbitcoin_server_a_SOURCES = \
noui.cpp \
pow.cpp \
rest.cpp \
rpcblockchain.cpp \
rpcmasternode.cpp \
rpcmasternode-budget.cpp \
rpcmining.cpp \
rpcmisc.cpp \
rpcnet.cpp \
rpcrawtransaction.cpp \
rpcserver.cpp \
rpc/blockchain.cpp \
rpc/explorer.cpp \
rpc/masternode.cpp \
rpc/masternode-budget.cpp \
rpc/mining.cpp \
rpc/misc.cpp \
rpc/net.cpp \
rpc/rawtransaction.cpp \
rpc/server.cpp \
script/sigcache.cpp \
sporkdb.cpp \
timedata.cpp \
......@@ -249,8 +250,8 @@ libbitcoin_wallet_a_SOURCES = \
masternode-sync.cpp \
masternodeconfig.cpp \
masternodeman.cpp \
rpcdump.cpp \
rpcwallet.cpp \
rpc/dump.cpp \
rpc/wallet.cpp \
kernel.cpp \
wallet.cpp \
wallet_ismine.cpp \
......@@ -345,7 +346,7 @@ libbitcoin_util_a_SOURCES = \
chainparamsbase.cpp \
clientversion.cpp \
random.cpp \
rpcprotocol.cpp \
rpc/protocol.cpp \
sync.cpp \
uint256.cpp \
util.cpp \
......@@ -362,7 +363,7 @@ endif
# cli: shared between merge-cli and merge-qt
libbitcoin_cli_a_CPPFLAGS = $(BITCOIN_INCLUDES)
libbitcoin_cli_a_SOURCES = \
rpcclient.cpp \
rpc/client.cpp \
$(BITCOIN_CORE_H)
nodist_libbitcoin_util_a_SOURCES = $(srcdir)/obj/build.h
......
......@@ -25,7 +25,7 @@
#include "masternodeman.h"
#include "miner.h"
#include "net.h"
#include "rpcserver.h"
#include "rpc/server.h"
#include "script/standard.h"
#include "spork.h"
#include "sporkdb.h"
......
......@@ -8,8 +8,8 @@
#include "chainparamsbase.h"
#include "clientversion.h"
#include "rpcclient.h"
#include "rpcprotocol.h"
#include "rpc/client.h"
#include "rpc/protocol.h"
#include "util.h"
#include "utilstrencodings.h"
......
......@@ -11,7 +11,7 @@
#include "main.h"
#include "masternodeconfig.h"
#include "noui.h"
#include "rpcserver.h"
#include "rpc/server.h"
#include "ui_interface.h"
#include "util.h"
......
......@@ -44,9 +44,9 @@ QString BitcoinUnits::id(int unit)
case MERGE:
return QString("MERGE");
case mMERGE:
return QString("mmerge");
return QString("mMERGE");
case uMERGE:
return QString::fromUtf8("umerge");
return QString::fromUtf8("uMERGE");
default:
return QString("???");
}
......
......@@ -130,48 +130,6 @@
</property>
</spacer>
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout" stretch="0,0">
<property name="sizeConstraint">
<enum>QLayout::SetFixedSize</enum>
</property>
<item>
<widget class="QLabel" name="labelPreferredDenom">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>16777215</height>
</size>
</property>
<property name="toolTip">
<string>Wait with automatic conversion to Zerocoin until enough MERGE for this denomination is available</string>
</property>
<property name="text">
<string>Preferred Automint zMERGE Denomination</string>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="preferredDenom">
<property name="maximumSize">
<size>
<width>16777215</width>
<height>27</height>
</size>
</property>
<property name="toolTip">
<string>Wait with automatic conversion to Zerocoin until enough MERGE for this denomination is available</string>
</property>
<property name="maxVisibleItems">
<number>9</number>
</property>
<property name="maxCount">
<number>9</number>
</property>
</widget>
</item>
</layout>
</item>
</layout>
</widget>
<widget class="QWidget" name="tabWallet">
......
......@@ -1384,16 +1384,6 @@
<property name="spacing">
<number>3</number>
</property>
<item>
<widget class="QCheckBox" name="checkzMERGE">
<property name="enabled">
<bool>false</bool>
</property>
<property name="text">
<string>Anonymized MERGE</string>
</property>
</widget>
</item>
<item>
<widget class="QLabel" name="label">
<property name="text">
......
This diff is collapsed.
......@@ -1325,11 +1325,6 @@
</message>
</context>
<context>
<name>PrivacyDialog</name>
<message>
<source>Zerocoin MERGE (zMERGE)</source>
<translation>Zerocoin MERGE (zMERGE)</translation>
</message>
<message>
<source>0</source>
<translation>0</translation>
......@@ -1354,10 +1349,6 @@
<source>Amount:</source>
<translation>Import:</translation>
</message>
<message>
<source>0 zMERGE</source>
<translation>0 zMERGE</translation>
</message>
<message>
<source>Alt+A</source>
<translation>Alt+A</translation>
......@@ -1879,10 +1870,6 @@
<source>Address</source>
<translation>Adreça</translation>
</message>
<message>
<source>Obfuscated</source>
<translation>Ofuscat</translation>
</message>
<message>
<source>(n/a)</source>
<translation>(n/a)</translation>
......@@ -1914,10 +1901,6 @@
<source>This year</source>
<translation>Aquest any</translation>
</message>
<message>
<source>Obfuscated</source>
<translation>Ofuscat</translation>
</message>
<message>
<source>Copy address</source>
<translation>Copia l'adreça</translation>
......
......@@ -1725,7 +1725,7 @@ Prosím zkontrolujte adresu a zkuste to znovu.</translation>
</message>
</context>
<context>
<name>PrivacyDialog</name>
<message>
<source>0</source>
<translation>0</translation>
......
......@@ -1989,7 +1989,7 @@ https://www.transifex.com/MERGE-project/MERGE-project-translations</translation>
</message>
</context>
<context>
<name>PrivacyDialog</name>
<message>
<source>The displayed information may be out of date. Your wallet automatically synchronizes with the MERGE network after a connection is established, but this process has not completed yet.</source>
<translation>De viste informationer kan være uddaterede. Deres tegnebog synkronisere automatism med MERGE netværket så snart en forbindelse er etalbleret, men denne proces er ikke færdiggjort endnu. </translation>
......@@ -3423,22 +3423,6 @@ https://www.transifex.com/MERGE-project/MERGE-project-translations</translation>
<source>Received via Obfuscation</source>
<translation>Modtaget via tilsløring</translation>
</message>
<message>
<source>Obfuscation Denominate</source>
<translation>Tilslør designerede</translation>
</message>
<message>
<source>Obfuscation Collateral Payment</source>
<translation>Samlet tilsløret betaling</translation>
</message>
<message>
<source>Obfuscation Make Collateral Inputs</source>
<translation>Tilslørede samlede tilføjelser</translation>
</message>
<message>
<source>Obfuscation Create Denominations</source>
<translation>Opret tilsløret designering</translation>
</message>
<message>
<source>Sent to</source>
<translation>Sendt til</translation>
......@@ -3459,10 +3443,6 @@ https://www.transifex.com/MERGE-project/MERGE-project-translations</translation>
<source>Mined</source>
<translation>Mineret</translation>
</message>
<message>
<source>Obfuscated</source>
<translation>skjult</translation>
</message>
<message>
<source>watch-only</source>
<translation>Vis-kun</translation>
......@@ -3538,26 +3518,6 @@ https://www.transifex.com/MERGE-project/MERGE-project-translations</translation>
<source>Sent to</source>
<translation>Sendt til</translation>
</message>
<message>
<source>Obfuscated</source>
<translation>skjult</translation>
</message>
<message>
<source>Obfuscation Make Collateral Inputs</source>
<translation>Tilslørede samlede tilføjelser</translation>
</message>
<message>
<source>Obfuscation Create Denominations</source>
<translation>Opret tilsløret designering</translation>
</message>
<message>
<source>Obfuscation Denominate</source>
<translation>Tilslør designerede</translation>
</message>
<message>
<source>Obfuscation Collateral Payment</source>
<translation>Samlet tilsløret betaling</translation>
</message>
<message>
<source>To yourself</source>
<translation>Til Dem selv</translation>
......
This diff is collapsed.
This diff is collapsed.
......@@ -3571,22 +3571,6 @@ https://www.transifex.com/MERGE-project/MERGE-project-translations</translation>
<source>Received via Obfuscation</source>
<translation>Received via Obfuscation</translation>
</message>
<message>
<source>Obfuscation Denominate</source>
<translation>Obfuscation Denominate</translation>
</message>
<message>
<source>Obfuscation Collateral Payment</source>
<translation>Obfuscation Collateral Payment</translation>
</message>
<message>
<source>Obfuscation Make Collateral Inputs</source>
<translation>Obfuscation Make Collateral Inputs</translation>
</message>
<message>
<source>Obfuscation Create Denominations</source>
<translation>Obfuscation Create Denominations</translation>
</message>
<message>
<source>Sent to</source>
<translation>Sent to</translation>
......@@ -3607,10 +3591,6 @@ https://www.transifex.com/MERGE-project/MERGE-project-translations</translation>
<source>Mined</source>
<translation>Mined</translation>
</message>
<message>
<source>Obfuscated</source>
<translation>Obfuscated</translation>
</message>
<message>
<source>watch-only</source>
<translation>watch-only</translation>
......@@ -3686,26 +3666,6 @@ https://www.transifex.com/MERGE-project/MERGE-project-translations</translation>
<source>Sent to</source>
<translation>Sent to</translation>
</message>
<message>
<source>Obfuscated</source>
<translation>Obfuscated</translation>
</message>
<message>
<source>Obfuscation Make Collateral Inputs</source>
<translation>Obfuscation Make Collateral Inputs</translation>
</message>
<message>
<source>Obfuscation Create Denominations</source>
<translation>Obfuscation Create Denominations</translation>
</message>
<message>
<source>Obfuscation Denominate</source>
<translation>Obfuscation Denominate</translation>
</message>
<message>
<source>Obfuscation Collateral Payment</source>
<translation>Obfuscation Collateral Payment</translation>
</message>
<message>
<source>To yourself</source>
<translation>To yourself</translation>
......
This diff is collapsed.
......@@ -1414,7 +1414,7 @@ Please check the address and try again.</source>