diff --git a/COPYING b/COPYING index c410baa6a0..facded7305 100644 --- a/COPYING +++ b/COPYING @@ -1,4 +1,5 @@ -Copyright (c) 2009-2013 Bitcoin Developers +Copyright (c) 2009-2015 Bitcoin Developers +Copyright (c) 2014-2015 Darkcoin Developers Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/contrib/debian/README.md b/contrib/debian/README.md index fab9cc2381..32a9f63573 100644 --- a/contrib/debian/README.md +++ b/contrib/debian/README.md @@ -1,21 +1,21 @@ Debian ==================== -This directory contains files used to package bitcoind/bitcoin-qt -for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here. +This directory contains files used to package darkcoind/darkcoin-qt +for Debian-based Linux systems. If you compile darkcoind/darkcoin-qt yourself, there are some useful files here. -## bitcoin: URI support ## +## darkcoin: URI support ## -bitcoin-qt.desktop (Gnome / Open Desktop) +darkcoin-qt.desktop (Gnome / Open Desktop) To install: - sudo desktop-file-install bitcoin-qt.desktop + sudo desktop-file-install darkcoin-qt.desktop sudo update-desktop-database If you build yourself, you will either need to modify the paths in -the .desktop file or copy or symlink your bitcoin-qt binary to `/usr/bin` -and the `../../share/pixmaps/bitcoin128.png` to `/usr/share/pixmaps` +the .desktop file or copy or symlink your darkcoin-qt binary to `/usr/bin` +and the `../../share/pixmaps/darkcoin128.png` to `/usr/share/pixmaps` -bitcoin-qt.protocol (KDE) +darkcoin-qt.protocol (KDE) diff --git a/contrib/debian/bitcoin-qt.install b/contrib/debian/bitcoin-qt.install deleted file mode 100644 index e0b32373be..0000000000 --- a/contrib/debian/bitcoin-qt.install +++ /dev/null @@ -1,6 +0,0 @@ -usr/local/bin/bitcoin-qt usr/bin -share/pixmaps/bitcoin32.xpm usr/share/pixmaps -share/pixmaps/bitcoin16.xpm usr/share/pixmaps -share/pixmaps/bitcoin128.png usr/share/pixmaps -debian/bitcoin-qt.desktop usr/share/applications -debian/bitcoin-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/bitcoind.bash-completion b/contrib/debian/bitcoind.bash-completion deleted file mode 100644 index 0f84707b66..0000000000 --- a/contrib/debian/bitcoind.bash-completion +++ /dev/null @@ -1 +0,0 @@ -contrib/bitcoind.bash-completion bitcoind diff --git a/contrib/debian/bitcoind.install b/contrib/debian/bitcoind.install deleted file mode 100644 index 798ea851f6..0000000000 --- a/contrib/debian/bitcoind.install +++ /dev/null @@ -1,2 +0,0 @@ -usr/local/bin/bitcoind usr/bin -usr/local/bin/bitcoin-cli usr/bin diff --git a/contrib/debian/darkcoin-qt.desktop b/contrib/debian/darkcoin-qt.desktop new file mode 100644 index 0000000000..6a4068d880 --- /dev/null +++ b/contrib/debian/darkcoin-qt.desktop @@ -0,0 +1,12 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Darkcoin +Comment=Darkcoin P2P Cryptocurrency +Comment[fr]=Darkcoin, monnaie virtuelle cryptographique pair à pair +Comment[tr]=Darkcoin, eşten eşe kriptografik sanal para birimi +Exec=darkcoin-qt %u +Terminal=false +Type=Application +Icon=darkcoin128 +MimeType=x-scheme-handler/darkcoin; +Categories=Office;Finance; diff --git a/contrib/debian/bitcoin-qt.desktop b/contrib/debian/darkcoin-qt.desktop.desktop similarity index 61% rename from contrib/debian/bitcoin-qt.desktop rename to contrib/debian/darkcoin-qt.desktop.desktop index 61e1aca6ad..9bedcbd14e 100644 --- a/contrib/debian/bitcoin-qt.desktop +++ b/contrib/debian/darkcoin-qt.desktop.desktop @@ -2,11 +2,10 @@ Encoding=UTF-8 Name=Bitcoin Comment=Bitcoin P2P Cryptocurrency -Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair -Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi Exec=bitcoin-qt %u Terminal=false Type=Application Icon=bitcoin128 MimeType=x-scheme-handler/bitcoin; Categories=Office;Finance; +Name[en_US]=darkcoin-qt.desktop diff --git a/contrib/debian/darkcoin-qt.install b/contrib/debian/darkcoin-qt.install new file mode 100644 index 0000000000..26763d3f62 --- /dev/null +++ b/contrib/debian/darkcoin-qt.install @@ -0,0 +1,6 @@ +usr/local/bin/darkcoin-qt usr/bin +share/pixmaps/darkcoin32.xpm usr/share/pixmaps +share/pixmaps/darkcoin16.xpm usr/share/pixmaps +share/pixmaps/darkcoin128.png usr/share/pixmaps +debian/darkcoin-qt.desktop usr/share/applications +debian/darkcoin-qt.protocol usr/share/kde4/services/ diff --git a/contrib/debian/bitcoin-qt.lintian-overrides b/contrib/debian/darkcoin-qt.lintian-overrides similarity index 52% rename from contrib/debian/bitcoin-qt.lintian-overrides rename to contrib/debian/darkcoin-qt.lintian-overrides index 7fb230eca8..7dd455c8bf 100644 --- a/contrib/debian/bitcoin-qt.lintian-overrides +++ b/contrib/debian/darkcoin-qt.lintian-overrides @@ -1,2 +1,2 @@ # Linked code is Expat - only Debian packaging is GPL-2+ -bitcoin-qt: possible-gpl-code-linked-with-openssl +darkcoin-qt: possible-gpl-code-linked-with-openssl diff --git a/contrib/debian/bitcoin-qt.protocol b/contrib/debian/darkcoin-qt.protocol similarity index 73% rename from contrib/debian/bitcoin-qt.protocol rename to contrib/debian/darkcoin-qt.protocol index 014588d536..9f4871ee4e 100644 --- a/contrib/debian/bitcoin-qt.protocol +++ b/contrib/debian/darkcoin-qt.protocol @@ -1,6 +1,6 @@ [Protocol] -exec=bitcoin-qt '%u' -protocol=bitcoin +exec=darkcoin-qt '%u' +protocol=darkcoin input=none output=none helper=true diff --git a/contrib/debian/darkcoind.bash-completion b/contrib/debian/darkcoind.bash-completion new file mode 100644 index 0000000000..a3caff2f78 --- /dev/null +++ b/contrib/debian/darkcoind.bash-completion @@ -0,0 +1 @@ +contrib/darkcoind.bash-completion darkcoind diff --git a/contrib/debian/bitcoind.examples b/contrib/debian/darkcoind.examples similarity index 100% rename from contrib/debian/bitcoind.examples rename to contrib/debian/darkcoind.examples diff --git a/contrib/debian/darkcoind.install b/contrib/debian/darkcoind.install new file mode 100644 index 0000000000..d32d80d756 --- /dev/null +++ b/contrib/debian/darkcoind.install @@ -0,0 +1,2 @@ +usr/local/bin/darkcoind usr/bin +usr/local/bin/darkcoin-cli usr/bin diff --git a/contrib/debian/bitcoind.lintian-overrides b/contrib/debian/darkcoind.lintian-overrides similarity index 53% rename from contrib/debian/bitcoind.lintian-overrides rename to contrib/debian/darkcoind.lintian-overrides index 3f9f140bd8..98eef5f7ea 100644 --- a/contrib/debian/bitcoind.lintian-overrides +++ b/contrib/debian/darkcoind.lintian-overrides @@ -1,2 +1,2 @@ # Linked code is Expat - only Debian packaging is GPL-2+ -bitcoind: possible-gpl-code-linked-with-openssl +darkcoind: possible-gpl-code-linked-with-openssl diff --git a/contrib/debian/bitcoind.manpages b/contrib/debian/darkcoind.manpages similarity index 100% rename from contrib/debian/bitcoind.manpages rename to contrib/debian/darkcoind.manpages diff --git a/share/pixmaps/darkcoin128.png b/share/pixmaps/darkcoin128.png index b0a765c49b..7ed74a0855 100644 Binary files a/share/pixmaps/darkcoin128.png and b/share/pixmaps/darkcoin128.png differ diff --git a/share/pixmaps/darkcoin16.xpm b/share/pixmaps/darkcoin16.xpm new file mode 100644 index 0000000000..4fbf138f97 --- /dev/null +++ b/share/pixmaps/darkcoin16.xpm @@ -0,0 +1,24 @@ +/* XPM */ +static char *bitcoin__[] = { +/* columns rows colors chars-per-pixel */ +"16 16 2 1", +" c #2D98CE", +". c None", +/* pixels */ +"................", +"................", +"................", +"... ..", +"... .", +".... ", +" .. ...... ", +". . ...... ", +".. ........ ", +"... ....... ", +"... ", +".... .", +"..... ..", +"................", +"................", +"................" +}; diff --git a/share/pixmaps/darkcoin32.xpm b/share/pixmaps/darkcoin32.xpm new file mode 100644 index 0000000000..b31cdfb856 --- /dev/null +++ b/share/pixmaps/darkcoin32.xpm @@ -0,0 +1,40 @@ +/* XPM */ +static char *bitcoin__[] = { +/* columns rows colors chars-per-pixel */ +"32 32 2 1", +" c #2D98CE", +". c None", +/* pixels */ +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"..... .....", +"...... ..", +"....... .", +"....... ", +"........ ", +". .. ............ ", +". ... ............ ", +".. .. ............. ", +"... .. ............. ", +"... .. ............. ", +".... ... ............. ", +"..... ............... ", +"...... .............. ", +"....... ", +"....... ", +"........ .", +"......... ..", +".......... ...", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................", +"................................" +}; diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index 568eb2e10a..a236b212b5 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -258,8 +258,8 @@ - 0 - 350 + 10 + 250