[Updated] New UI Wallet & Checkpoint

gobytecoin · Nov 29, 2017 · 3d331f9 · 3d331f9
1 parent 90ef08b
commit 3d331f9
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 7 deletions.
diff --git a/src/clientversion.h b/src/clientversion.h
@@ -38,7 +38,7 @@
 #define DO_STRINGIZE(X) #X
 
 //! Copyright string used in Windows .rc files
-#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2014-" STRINGIZE(COPYRIGHT_YEAR) " The GoByte Core Developers"
+#define COPYRIGHT_STR "2009-" STRINGIZE(COPYRIGHT_YEAR) " The Bitcoin Core Developers, 2017-" STRINGIZE(COPYRIGHT_YEAR) " The GoByte Core Developers"
 
 /**
  * gobyted-res.rc includes this file, but it cannot cope with real c++ code.

diff --git a/src/init.cpp b/src/init.cpp
@@ -1,6 +1,7 @@
 // Copyright (c) 2009-2010 Satoshi Nakamoto
 // Copyright (c) 2009-2015 The Bitcoin Core developers
-// Copyright (c) 2014-2017 The GoByte Core developers
+// Copyright (c) 2014-2017 The Dash Core developers
+// Copyright (c) 2017-2018 The GoByte Core developers
 // Distributed under the MIT software license, see the accompanying
 // file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -620,7 +621,9 @@ std::string LicenseInfo()
  // todo: remove urls from translations on next change
  return FormatParagraph(strprintf(_("Copyright (C) 2009-%i The Bitcoin Core Developers"), COPYRIGHT_YEAR)) + "\n" +
  "\n" +
- FormatParagraph(strprintf(_("Copyright (C) 2014-%i The GoByte Core Developers"), COPYRIGHT_YEAR)) + "\n" +
+ FormatParagraph(strprintf(_("Copyright (C) 2014-%i The Dash Core Developers"), COPYRIGHT_YEAR)) + "\n" +
+ "\n" +
+ FormatParagraph(strprintf(_("Copyright (C) 2017-%i The GoByte Core Developers"), COPYRIGHT_YEAR)) + "\n" +
  "\n" +
  FormatParagraph(_("This is experimental software.")) + "\n" +
  "\n" +

diff --git a/src/qt/gobytestrings.cpp b/src/qt/gobytestrings.cpp
@@ -313,7 +313,8 @@ QT_TRANSLATE_NOOP("gobyte-core", "Connect to KeePassHttp on port <port> (default
 QT_TRANSLATE_NOOP("gobyte-core", "Connect to a node to retrieve peer addresses, and disconnect"),
 QT_TRANSLATE_NOOP("gobyte-core", "Connection options:"),
 QT_TRANSLATE_NOOP("gobyte-core", "Copyright (C) 2009-%i The Bitcoin Core Developers"),
-QT_TRANSLATE_NOOP("gobyte-core", "Copyright (C) 2014-%i The GoByte Core Developers"),
+QT_TRANSLATE_NOOP("gobyte-core", "Copyright (C) 2014-%i The Dash Core Developers"),
+QT_TRANSLATE_NOOP("gobyte-core", "Copyright (C) 2017-%i The GoByte Core Developers"),
 QT_TRANSLATE_NOOP("gobyte-core", "Corrupted block database detected"),
 QT_TRANSLATE_NOOP("gobyte-core", "Could not parse masternode.conf"),
 QT_TRANSLATE_NOOP("gobyte-core", "Debugging/Testing options:"),

diff --git a/src/qt/splashscreen.cpp b/src/qt/splashscreen.cpp
@@ -36,7 +36,7 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle)
 
  // set reference point, paddings
  int paddingLeft = 14;
- int paddingTop = 470;
+ int paddingTop = 460;
  int titleVersionVSpace = 17;
  int titleCopyrightVSpace = 32;
 
@@ -46,7 +46,8 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle)
  QString titleText = tr("GoByte Core");
  QString versionText = QString(tr("Version %1")).arg(QString::fromStdString(FormatFullVersion()));
  QString copyrightTextBtc = QChar(0xA9)+QString(" 2009-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Bitcoin Core developers"));
- QString copyrightTextGoByte = QChar(0xA9)+QString(" 2014-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The GoByte Core developers"));
+ QString copyrightTextDash = QChar(0xA9)+QString(" 2014-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The Dash Core developers"));
+ QString copyrightTextGoByte = QChar(0xA9)+QString(" 2017-%1 ").arg(COPYRIGHT_YEAR) + QString(tr("The GoByte Core developers"));
  QString titleAddText = networkStyle->getTitleAddText();
  // networkstyle.cpp can't (yet) read themes, so we do it here to get the correct Splash-screen
  QString splashScreenPath = ":/images/" + GUIUtil::getThemeName() + "/splash";
@@ -83,7 +84,8 @@ SplashScreen::SplashScreen(Qt::WindowFlags f, const NetworkStyle *networkStyle)
  // draw copyright stuff
  pixPaint.setFont(QFont(font, 10*fontFactor));
  pixPaint.drawText(paddingLeft,paddingTop+titleCopyrightVSpace,copyrightTextBtc);
- pixPaint.drawText(paddingLeft,paddingTop+titleCopyrightVSpace+12,copyrightTextGoByte);
+ pixPaint.drawText(paddingLeft,paddingTop+titleCopyrightVSpace+12,copyrightTextDash);
+ pixPaint.drawText(paddingLeft,paddingTop+titleCopyrightVSpace+24,copyrightTextGoByte);
 
  // draw additional text if special network
  if(!titleAddText.isEmpty()) {