Revert "Revert "Rebrand to darkcoin""

This commit is contained in:
evan82 2015-02-19 11:58:38 -07:00
parent 93efb82ab1
commit 3bb9ef96f4
65 changed files with 10161 additions and 9881 deletions

4
.gitignore vendored
View File

@ -13,8 +13,8 @@ autom4te.cache/
config.log config.log
config.status config.status
configure configure
src/bitcoin-config.h src/darkcoin-config.h
src/bitcoin-config.h.in src/darkcoin-config.h.in
src/build-aux/ src/build-aux/
src/stamp-h1 src/stamp-h1
share/setup.nsi share/setup.nsi

View File

@ -2,17 +2,17 @@ dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60]) AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 0) define(_CLIENT_VERSION_MAJOR, 0)
define(_CLIENT_VERSION_MINOR, 11) define(_CLIENT_VERSION_MINOR, 11)
define(_CLIENT_VERSION_REVISION, 1) define(_CLIENT_VERSION_REVISION, 2)
define(_CLIENT_VERSION_BUILD, 25) define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true) define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2015) define(_COPYRIGHT_YEAR, 2015)
AC_INIT([Darkcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@darkcoin.io],[darkcoin]) AC_INIT([Darkcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@darkcoin.io],[darkcoin])
AC_CONFIG_AUX_DIR([src/build-aux]) AC_CONFIG_AUX_DIR([src/build-aux])
AC_CONFIG_MACRO_DIR([src/m4]) AC_CONFIG_MACRO_DIR([src/m4])
AC_CANONICAL_HOST AC_CANONICAL_HOST
AH_TOP([#ifndef BITCOIN_CONFIG_H]) AH_TOP([#ifndef DARKCOIN_CONFIG_H])
AH_TOP([#define BITCOIN_CONFIG_H]) AH_TOP([#define DARKCOIN_CONFIG_H])
AH_BOTTOM([#endif //BITCOIN_CONFIG_H]) AH_BOTTOM([#endif //DARKCOIN_CONFIG_H])
# This m4 will only be used if a system copy cannot be found. This is helpful # This m4 will only be used if a system copy cannot be found. This is helpful
# on systems where autotools are installed but the pkg-config macros are not in # on systems where autotools are installed but the pkg-config macros are not in
@ -111,7 +111,7 @@ AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[spec
AC_CONFIG_SRCDIR([src]) AC_CONFIG_SRCDIR([src])
AC_CONFIG_HEADERS([src/bitcoin-config.h]) AC_CONFIG_HEADERS([src/darkcoin-config.h])
dnl Checks for programs. dnl Checks for programs.
AC_PROG_CXX AC_PROG_CXX
@ -312,7 +312,7 @@ dnl Check for pthread compile/link requirements
AX_PTHREAD AX_PTHREAD
INCLUDES="$INCLUDES $PTHREAD_CFLAGS" INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
# The following macro will add the necessary defines to bitcoin-config.h, but # The following macro will add the necessary defines to darkcoin-config.h, but
# they also need to be passed down to any subprojects. Pull the results out of # they also need to be passed down to any subprojects. Pull the results out of
# the cache and add them to CPPFLAGS. # the cache and add them to CPPFLAGS.
AC_SYS_LARGEFILE AC_SYS_LARGEFILE

View File

@ -7,7 +7,7 @@ HEADERS += \
../src/allocators.h \ ../src/allocators.h \
../src/base58.h \ ../src/base58.h \
../src/bignum.h \ ../src/bignum.h \
../src/bitcoin-config.h \ ../src/darkcoin-config.h \
../src/bloom.h \ ../src/bloom.h \
../src/chainparams.h \ ../src/chainparams.h \
../src/checkpoints.h \ ../src/checkpoints.h \
@ -224,7 +224,7 @@ SOURCES += \
../src/qt/bitcoinaddressvalidator.cpp \ ../src/qt/bitcoinaddressvalidator.cpp \
../src/qt/bitcoinamountfield.cpp \ ../src/qt/bitcoinamountfield.cpp \
../src/qt/bitcoingui.cpp \ ../src/qt/bitcoingui.cpp \
../src/qt/bitcoinstrings.cpp \ ../src/qt/darkcoinstrings.cpp \
../src/qt/bitcoinunits.cpp \ ../src/qt/bitcoinunits.cpp \
../src/qt/clientmodel.cpp \ ../src/qt/clientmodel.cpp \
../src/qt/coincontroldialog.cpp \ ../src/qt/coincontroldialog.cpp \
@ -288,7 +288,7 @@ SOURCES += \
../src/qt/paymentrequest.pb.cc \ ../src/qt/paymentrequest.pb.cc \
../src/qt/paymentrequestplus.cpp \ ../src/qt/paymentrequestplus.cpp \
../src/qt/paymentserver.cpp \ ../src/qt/paymentserver.cpp \
../src/qt/qrc_bitcoin.cpp \ ../src/qt/qrc_darkcoin.cpp \
../src/qt/qvalidatedlineedit.cpp \ ../src/qt/qvalidatedlineedit.cpp \
../src/qt/qvaluecombobox.cpp \ ../src/qt/qvaluecombobox.cpp \
../src/qt/receivecoinsdialog.cpp \ ../src/qt/receivecoinsdialog.cpp \
@ -339,4 +339,4 @@ FORMS += \
../src/qt/forms/transactiondescdialog.ui ../src/qt/forms/transactiondescdialog.ui
RESOURCES += \ RESOURCES += \
../src/qt/bitcoin.qrc ../src/qt/darkcoin.qrc

View File

@ -13,7 +13,7 @@ DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/*
override_dh_auto_clean: override_dh_auto_clean:
if [ -f Makefile ]; then $(MAKE) distclean; fi if [ -f Makefile ]; then $(MAKE) distclean; fi
rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/darkcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in
# Yea, autogen should be run on the source archive, but I like doing git archive # Yea, autogen should be run on the source archive, but I like doing git archive
override_dh_auto_configure: override_dh_auto_configure:

View File

@ -12,7 +12,7 @@ Files and Folders
This file takes care of generating `.qm` files from `.ts` files. It is mostly This file takes care of generating `.qm` files from `.ts` files. It is mostly
automated. automated.
### src/qt/bitcoin.qrc ### src/qt/darkcoin.qrc
This file must be updated whenever a new translation is added. Please note that This file must be updated whenever a new translation is added. Please note that
files must end with `.qm`, not `.ts`. files must end with `.qm`, not `.ts`.
@ -60,7 +60,7 @@ in Transifex and can be translated.
To create the pull-request you have to do: To create the pull-request you have to do:
git add src/qt/bitcoinstrings.cpp src/qt/locale/darkcoin_en.ts git add src/qt/darkcoinstrings.cpp src/qt/locale/darkcoin_en.ts
git commit git commit
Syncing with Transifex Syncing with Transifex
@ -80,7 +80,7 @@ postprocessing steps before committing the translations.
### Fetching new translations ### Fetching new translations
1. `python contrib/devtools/update-translations.py` 1. `python contrib/devtools/update-translations.py`
2. update `src/qt/bitcoin.qrc` manually or via 2. update `src/qt/darkcoin.qrc` manually or via
`ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(darkcoin_\(.*\)\).ts/ <file alias="\2">locale\/\1.qm<\/file>/'` `ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(darkcoin_\(.*\)\).ts/ <file alias="\2">locale\/\1.qm<\/file>/'`
3. update `src/qt/Makefile.am` manually or via 3. update `src/qt/Makefile.am` manually or via
`ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(darkcoin_\(.*\)\).ts/ locale\/\1.ts \\/'` `ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(darkcoin_\(.*\)\).ts/ locale\/\1.ts \\/'`

View File

@ -8,7 +8,7 @@ import glob
import operator import operator
import os import os
OUT_CPP="src/qt/bitcoinstrings.cpp" OUT_CPP="src/qt/darkcoinstrings.cpp"
EMPTY=['""'] EMPTY=['""']
def parse_po(text): def parse_po(text):
@ -72,7 +72,7 @@ f.write("""
#define UNUSED #define UNUSED
#endif #endif
""") """)
f.write('static const char UNUSED *bitcoin_strings[] = {\n') f.write('static const char UNUSED *darkcoin_strings[] = {\n')
messages.sort(key=operator.itemgetter(0)) messages.sort(key=operator.itemgetter(0))
for (msgid, msgstr) in messages: for (msgid, msgstr) in messages:
if msgid != EMPTY: if msgid != EMPTY:

View File

@ -203,7 +203,7 @@ darkcoind_SOURCES = darkcoind.cpp
# #
if TARGET_WINDOWS if TARGET_WINDOWS
darkcoind_SOURCES += bitcoind-res.rc darkcoind_SOURCES += darkcoind-res.rc
endif endif
AM_CPPFLAGS += $(BDB_CPPFLAGS) AM_CPPFLAGS += $(BDB_CPPFLAGS)
@ -218,7 +218,7 @@ darkcoin_cli_SOURCES = darkcoin-cli.cpp
# #
if TARGET_WINDOWS if TARGET_WINDOWS
darkcoin_cli_SOURCES += bitcoin-cli-res.rc darkcoin_cli_SOURCES += darkcoin-cli-res.rc
endif endif
# NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race # NOTE: This dependency is not strictly necessary, but without it make may try to build both in parallel, which breaks the LevelDB build system in a race
@ -229,7 +229,7 @@ leveldb/%.a:
CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \ CC="$(CC)" PLATFORM=$(TARGET_OS) AR="$(AR)" $(LEVELDB_TARGET_FLAGS) \
OPT="$(CXXFLAGS) $(CPPFLAGS)" OPT="$(CXXFLAGS) $(CPPFLAGS)"
qt/bitcoinstrings.cpp: $(libdarkcoin_server_a_SOURCES) $(libdarkcoin_common_a_SOURCES) $(libdarkcoin_cli_a_SOURCES) qt/darkcoinstrings.cpp: $(libdarkcoin_server_a_SOURCES) $(libdarkcoin_common_a_SOURCES) $(libdarkcoin_cli_a_SOURCES)
@test -n $(XGETTEXT) || echo "xgettext is required for updating translations" @test -n $(XGETTEXT) || echo "xgettext is required for updating translations"
@cd $(top_srcdir); XGETTEXT=$(XGETTEXT) share/qt/extract_strings_qt.py @cd $(top_srcdir); XGETTEXT=$(XGETTEXT) share/qt/extract_strings_qt.py

View File

@ -2,7 +2,7 @@
#define CLIENTVERSION_H #define CLIENTVERSION_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#else #else
// //
// client versioning and copyright year // client versioning and copyright year

View File

@ -1,4 +1,4 @@
#include "bitcoin-config.h" #include "darkcoin-config.h"
#include <cstddef> #include <cstddef>
#include <sys/select.h> #include <sys/select.h>

View File

@ -5,7 +5,7 @@
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
#define VER_FILEVERSION VER_PRODUCTVERSION #define VER_FILEVERSION VER_PRODUCTVERSION
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR #define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core developers" #define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin and Darkcoin developers"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION FILEVERSION VER_FILEVERSION
@ -17,14 +17,14 @@ BEGIN
BEGIN BEGIN
BLOCK "040904E4" // U.S. English - multilingual (hex) BLOCK "040904E4" // U.S. English - multilingual (hex)
BEGIN BEGIN
VALUE "CompanyName", "Bitcoin" VALUE "CompanyName", "Darkcoin"
VALUE "FileDescription", "Bitcoind (OSS daemon/client for Bitcoin)" VALUE "FileDescription", "Darkcoin-cli (OSS RPC client for Darkcoin)"
VALUE "FileVersion", VER_FILEVERSION_STR VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "InternalName", "bitcoind" VALUE "InternalName", "darkcoin-cli"
VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalCopyright", COPYRIGHT_STR
VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
VALUE "OriginalFilename", "bitcoind.exe" VALUE "OriginalFilename", "darkcoin-cli.exe"
VALUE "ProductName", "Bitcoind" VALUE "ProductName", "Darkcoin-cli"
VALUE "ProductVersion", VER_PRODUCTVERSION_STR VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END END
END END

View File

@ -5,7 +5,7 @@
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
#define VER_FILEVERSION VER_PRODUCTVERSION #define VER_FILEVERSION VER_PRODUCTVERSION
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR #define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core developers" #define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin and Darkcoin developers"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION FILEVERSION VER_FILEVERSION
@ -17,14 +17,14 @@ BEGIN
BEGIN BEGIN
BLOCK "040904E4" // U.S. English - multilingual (hex) BLOCK "040904E4" // U.S. English - multilingual (hex)
BEGIN BEGIN
VALUE "CompanyName", "Bitcoin" VALUE "CompanyName", "Darkcoin"
VALUE "FileDescription", "Bitcoin-cli (OSS RPC client for Bitcoin)" VALUE "FileDescription", "Darkcoind (OSS daemon/client for Darkcoin)"
VALUE "FileVersion", VER_FILEVERSION_STR VALUE "FileVersion", VER_FILEVERSION_STR
VALUE "InternalName", "bitcoin-cli" VALUE "InternalName", "darkcoind"
VALUE "LegalCopyright", COPYRIGHT_STR VALUE "LegalCopyright", COPYRIGHT_STR
VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php." VALUE "LegalTrademarks1", "Distributed under the MIT/X11 software license, see the accompanying file COPYING or http://www.opensource.org/licenses/mit-license.php."
VALUE "OriginalFilename", "bitcoin-cli.exe" VALUE "OriginalFilename", "darkcoind.exe"
VALUE "ProductName", "Bitcoin-cli" VALUE "ProductName", "Darkcoind"
VALUE "ProductVersion", VER_PRODUCTVERSION_STR VALUE "ProductVersion", VER_PRODUCTVERSION_STR
END END
END END

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#include "darksend.h" #include "darksend.h"

View File

@ -5,7 +5,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#include "init.h" #include "init.h"

View File

@ -8,7 +8,7 @@
#define BITCOIN_MAIN_H #define BITCOIN_MAIN_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#include "bignum.h" #include "bignum.h"

View File

@ -5,7 +5,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#include "net.h" #include "net.h"

View File

@ -6,7 +6,7 @@
#define BITCOIN_NETBASE_H #define BITCOIN_NETBASE_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#include "compat.h" #include "compat.h"

View File

@ -117,8 +117,8 @@ QT_MOC = \
overviewpage.moc \ overviewpage.moc \
rpcconsole.moc rpcconsole.moc
QT_QRC_CPP = qrc_bitcoin.cpp QT_QRC_CPP = qrc_darkcoin.cpp
QT_QRC = bitcoin.qrc QT_QRC = darkcoin.qrc
PROTOBUF_CC = paymentrequest.pb.cc PROTOBUF_CC = paymentrequest.pb.cc
PROTOBUF_H = paymentrequest.pb.h PROTOBUF_H = paymentrequest.pb.h
@ -281,7 +281,7 @@ RES_IMAGES = \
RES_MOVIES = $(wildcard res/movies/spinner-*.png) RES_MOVIES = $(wildcard res/movies/spinner-*.png)
BITCOIN_RC = res/bitcoin-qt-res.rc DARKCOIN_RC = res/darkcoin-qt-res.rc
libdarkcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \ libdarkcoinqt_a_CPPFLAGS = $(AM_CPPFLAGS) $(QT_INCLUDES) \
-I$(top_srcdir)/src/qt/forms $(QT_DBUS_INCLUDES) -I$(top_srcdir)/src/qt/forms $(QT_DBUS_INCLUDES)
@ -306,7 +306,7 @@ if TARGET_DARWIN
darkcoin_qt_SOURCES += $(BITCOIN_MM) darkcoin_qt_SOURCES += $(BITCOIN_MM)
endif endif
if TARGET_WINDOWS if TARGET_WINDOWS
darkcoin_qt_SOURCES += $(BITCOIN_RC) darkcoin_qt_SOURCES += $(DARKCOIN_RC)
endif endif
darkcoin_qt_LDADD = libdarkcoinqt.a $(LIBBITCOIN_SERVER) darkcoin_qt_LDADD = libdarkcoinqt.a $(LIBBITCOIN_SERVER)
if ENABLE_WALLET if ENABLE_WALLET
@ -325,10 +325,10 @@ QT_QM=$(QT_TS:.ts=.qm)
.PHONY: FORCE .PHONY: FORCE
.SECONDARY: $(QT_QM) .SECONDARY: $(QT_QM)
bitcoinstrings.cpp: FORCE darkcoinstrings.cpp: FORCE
$(MAKE) -C $(top_srcdir)/src qt/bitcoinstrings.cpp $(MAKE) -C $(top_srcdir)/src qt/darkcoinstrings.cpp
translate: bitcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM) translate: darkcoinstrings.cpp $(QT_FORMS_UI) $(QT_FORMS_UI) $(BITCOIN_QT_CPP) $(BITCOIN_QT_H) $(BITCOIN_MM)
@test -n $(LUPDATE) || echo "lupdate is required for updating translations" @test -n $(LUPDATE) || echo "lupdate is required for updating translations"
@QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts locale/darkcoin_en.ts @QT_SELECT=$(QT_SELECT) $(LUPDATE) $^ -locations relative -no-obsolete -ts locale/darkcoin_en.ts

View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#include "addressbookpage.h" #include "addressbookpage.h"

View File

@ -6,7 +6,7 @@
#define BITCOINGUI_H #define BITCOINGUI_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#include <QMainWindow> #include <QMainWindow>

View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#include "bitcoingui.h" #include "bitcoingui.h"
@ -115,11 +115,11 @@ static void initTranslations(QTranslator &qtTranslatorBase, QTranslator &qtTrans
if (qtTranslator.load("qt_" + lang_territory, QLibraryInfo::location(QLibraryInfo::TranslationsPath))) if (qtTranslator.load("qt_" + lang_territory, QLibraryInfo::location(QLibraryInfo::TranslationsPath)))
QApplication::installTranslator(&qtTranslator); QApplication::installTranslator(&qtTranslator);
// Load e.g. bitcoin_de.qm (shortcut "de" needs to be defined in bitcoin.qrc) // Load e.g. bitcoin_de.qm (shortcut "de" needs to be defined in darkcoin.qrc)
if (translatorBase.load(lang, ":/translations/")) if (translatorBase.load(lang, ":/translations/"))
QApplication::installTranslator(&translatorBase); QApplication::installTranslator(&translatorBase);
// Load e.g. bitcoin_de_DE.qm (shortcut "de_DE" needs to be defined in bitcoin.qrc) // Load e.g. bitcoin_de_DE.qm (shortcut "de_DE" needs to be defined in darkcoin.qrc)
if (translator.load(lang_territory, ":/translations/")) if (translator.load(lang_territory, ":/translations/"))
QApplication::installTranslator(&translator); QApplication::installTranslator(&translator);
} }

View File

@ -12,7 +12,7 @@
#else #else
#define UNUSED #define UNUSED
#endif #endif
static const char UNUSED *bitcoin_strings[] = { static const char UNUSED *darkcoin_strings[] = {
QT_TRANSLATE_NOOP("darkcoin-core", "" QT_TRANSLATE_NOOP("darkcoin-core", ""
"%s, you must set a rpcpassword in the configuration file:\n" "%s, you must set a rpcpassword in the configuration file:\n"
"%s\n" "%s\n"

View File

@ -23,7 +23,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../bitcoin.qrc">:/images/about</pixmap> <pixmap resource="../darkcoin.qrc">:/images/about</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
@ -151,7 +151,7 @@ This product includes software developed by the OpenSSL Project for use in the O
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../darkcoin.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

View File

@ -60,7 +60,7 @@
<string>&amp;New</string> <string>&amp;New</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/add</normaloff>:/icons/add</iconset> <normaloff>:/icons/add</normaloff>:/icons/add</iconset>
</property> </property>
</widget> </widget>
@ -74,7 +74,7 @@
<string>&amp;Copy</string> <string>&amp;Copy</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset> <normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>
</property> </property>
</widget> </widget>
@ -88,7 +88,7 @@
<string>&amp;Delete</string> <string>&amp;Delete</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
</widget> </widget>
@ -115,7 +115,7 @@
<string>&amp;Export</string> <string>&amp;Export</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/export</normaloff>:/icons/export</iconset> <normaloff>:/icons/export</normaloff>:/icons/export</iconset>
</property> </property>
</widget> </widget>
@ -138,7 +138,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../darkcoin.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

View File

@ -28,7 +28,7 @@
</sizepolicy> </sizepolicy>
</property> </property>
<property name="pixmap"> <property name="pixmap">
<pixmap resource="../bitcoin.qrc">:/images/about</pixmap> <pixmap resource="../darkcoin.qrc">:/images/about</pixmap>
</property> </property>
</widget> </widget>
</item> </item>
@ -89,7 +89,7 @@
</layout> </layout>
</widget> </widget>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../darkcoin.qrc"/>
</resources> </resources>
<connections> <connections>
<connection> <connection>

View File

@ -141,7 +141,7 @@
<string>&amp;Request payment</string> <string>&amp;Request payment</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/receiving_addresses</normaloff>:/icons/receiving_addresses</iconset> <normaloff>:/icons/receiving_addresses</normaloff>:/icons/receiving_addresses</iconset>
</property> </property>
</widget> </widget>
@ -161,7 +161,7 @@
<string>Clear</string> <string>Clear</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="autoRepeatDelay"> <property name="autoRepeatDelay">
@ -267,7 +267,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/edit</normaloff>:/icons/edit</iconset> <normaloff>:/icons/edit</normaloff>:/icons/edit</iconset>
</property> </property>
</widget> </widget>
@ -284,7 +284,7 @@
<bool>false</bool> <bool>false</bool>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
</widget> </widget>
@ -328,7 +328,7 @@
<tabstop>removeRequestButton</tabstop> <tabstop>removeRequestButton</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../darkcoin.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

View File

@ -401,7 +401,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
@ -682,7 +682,7 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../darkcoin.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

View File

@ -671,7 +671,7 @@
<string>S&amp;end</string> <string>S&amp;end</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/send</normaloff>:/icons/send</iconset> <normaloff>:/icons/send</normaloff>:/icons/send</iconset>
</property> </property>
<property name="default"> <property name="default">
@ -694,7 +694,7 @@
<string>Clear &amp;All</string> <string>Clear &amp;All</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="autoRepeatDelay"> <property name="autoRepeatDelay">
@ -714,7 +714,7 @@
<string>Add &amp;Recipient</string> <string>Add &amp;Recipient</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/add</normaloff>:/icons/add</iconset> <normaloff>:/icons/add</normaloff>:/icons/add</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
@ -812,7 +812,7 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../darkcoin.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

View File

@ -64,7 +64,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset> <normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
@ -81,7 +81,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset> <normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
@ -98,7 +98,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
</widget> </widget>
@ -622,7 +622,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
</widget> </widget>
@ -1158,7 +1158,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
</widget> </widget>
@ -1230,7 +1230,7 @@
<tabstop>deleteButton_s</tabstop> <tabstop>deleteButton_s</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../darkcoin.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

View File

@ -58,7 +58,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset> <normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
@ -78,7 +78,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset> <normaloff>:/icons/editpaste</normaloff>:/icons/editpaste</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
@ -134,7 +134,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset> <normaloff>:/icons/editcopy</normaloff>:/icons/editcopy</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
@ -155,7 +155,7 @@
<string>Sign &amp;Message</string> <string>Sign &amp;Message</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/edit</normaloff>:/icons/edit</iconset> <normaloff>:/icons/edit</normaloff>:/icons/edit</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
@ -172,7 +172,7 @@
<string>Clear &amp;All</string> <string>Clear &amp;All</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
@ -268,7 +268,7 @@
<string/> <string/>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset> <normaloff>:/icons/address-book</normaloff>:/icons/address-book</iconset>
</property> </property>
<property name="shortcut"> <property name="shortcut">
@ -298,7 +298,7 @@
<string>Verify &amp;Message</string> <string>Verify &amp;Message</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/transaction_0</normaloff>:/icons/transaction_0</iconset> <normaloff>:/icons/transaction_0</normaloff>:/icons/transaction_0</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
@ -315,7 +315,7 @@
<string>Clear &amp;All</string> <string>Clear &amp;All</string>
</property> </property>
<property name="icon"> <property name="icon">
<iconset resource="../bitcoin.qrc"> <iconset resource="../darkcoin.qrc">
<normaloff>:/icons/remove</normaloff>:/icons/remove</iconset> <normaloff>:/icons/remove</normaloff>:/icons/remove</iconset>
</property> </property>
<property name="autoDefault"> <property name="autoDefault">
@ -381,7 +381,7 @@
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<resources> <resources>
<include location="../bitcoin.qrc"/> <include location="../darkcoin.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -6,7 +6,7 @@
#define NOTIFICATOR_H #define NOTIFICATOR_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#include <QIcon> #include <QIcon>

View File

@ -3,7 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#include "optionsdialog.h" #include "optionsdialog.h"

View File

@ -4,7 +4,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#include "optionsmodel.h" #include "optionsmodel.h"

View File

@ -22,7 +22,7 @@
#endif #endif
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" /* for USE_QRCODE */ #include "darkcoin-config.h" /* for USE_QRCODE */
#endif #endif
#ifdef USE_QRCODE #ifdef USE_QRCODE

View File

@ -8,7 +8,7 @@ IDI_ICON2 ICON DISCARDABLE "icons/bitcoin_testnet.ico"
#define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD) #define VER_PRODUCTVERSION_STR STRINGIZE(CLIENT_VERSION_MAJOR) "." STRINGIZE(CLIENT_VERSION_MINOR) "." STRINGIZE(CLIENT_VERSION_REVISION) "." STRINGIZE(CLIENT_VERSION_BUILD)
#define VER_FILEVERSION VER_PRODUCTVERSION #define VER_FILEVERSION VER_PRODUCTVERSION
#define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR #define VER_FILEVERSION_STR VER_PRODUCTVERSION_STR
#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin developers" #define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin and Darkcoin developers"
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION VER_FILEVERSION FILEVERSION VER_FILEVERSION

View File

@ -1,6 +1,6 @@
#include "bitcoin-config.h" #include "darkcoin-config.h"
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#ifdef ENABLE_WALLET #ifdef ENABLE_WALLET

View File

@ -8,7 +8,7 @@
#define BITCOIN_UTIL_H #define BITCOIN_UTIL_H
#if defined(HAVE_CONFIG_H) #if defined(HAVE_CONFIG_H)
#include "bitcoin-config.h" #include "darkcoin-config.h"
#endif #endif
#include "compat.h" #include "compat.h"