tyler.durden/CurecoinSource
1
0
Fork 0
mirror of https://github.com/cygnusxi/CurecoinSource.git synced 2025-07-27 15:44:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19 from CryptoCanary/master

Browse Source 
v1.9.3.1 rollup. Revision bump. Wording changes and corrections. Chec…
This commit is contained in:
cygnusxi 2017-07-13 02:21:31 -04:00 committed by GitHub
commit d820ea5ff5
15 changed files with 19 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
COPYING
View File

@ -1,4 +1,4 @@
Copyright (c) 2013-2016 CureCoin Developers
Copyright (c) 2013-2017 CureCoin Developers
Copyright (c) 2011-2012 PPCoin Developers
Copyright (c) 2009-2012 Bitcoin Developers

10
UPDATE
View File

@ -1,10 +0,0 @@
Version 1.3 Download:
https://github.com/cygnusxi/CurecoinSource/tree/master/releases
Version 1.3
- Add checkpoints
- Correct some GUI mismatches
Version 1.3.3
- Add checkpoint
- Update GUI and Logo

2
curecoin-qt.pro
View File

@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = curecoin-qt
VERSION = 1.9.2.1
VERSION = 1.9.3.1
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE BOOST_THREAD_PROVIDES_GENERIC_SHARED_MUTEX_ON_WIN __NO_SYSTEM_INCLUDES
CONFIG += no_include_pwd

2
doc/README
View File

@ -1,4 +1,4 @@
curecoin 0.1.3.4 BETA
curecoin 1.9.3.1 CUR
Copyright (c) 2009-2012 Bitcoin Developers
Copyright (c) 2011-2012 PPCoin Developers

2
doc/readme-qt.rst
View File

@ -1,4 +1,4 @@
curecoin-Qt: Qt5 GUI for curecoin
curecoin-qt: Qt5 GUI for Curecoin
================================
Build instructions

1
src/checkpoints.cpp
View File

@ -29,6 +29,7 @@ static MapCheckpoints mapCheckpoints =
( 11000, uint256("ea83da9e532a4e5e5b0fabea3e427c06b0e8b8b59e4ee3d926a2b0757b60d529"))
( 130000, uint256("1a42c44f40a1ffe6539d37175559c307340811c9c43277cd99ba8e6370d46bb5"))
( 148000, uint256("6eff6bbe6b2f5f6282b8628f6d7185e454c715f89a6d9a250df1fc0f6e0ed4e7"))
( 180646, uint256("9cbc41346470862c61a2acba7b4773128339fe9ffd6c1da6e566657a4eb6f2c5"))
;

2
src/clientversion.h
View File

@ -8,7 +8,7 @@
// These need to be macros, as version.cpp's and curecoin-qt.rc's voodoo requires it
#define CLIENT_VERSION_MAJOR 1
#define CLIENT_VERSION_MINOR 9
#define CLIENT_VERSION_REVISION 2
#define CLIENT_VERSION_REVISION 3
#define CLIENT_VERSION_BUILD 1
// Converts the parameter X to a string after macro replacement on X has been performed.

1
src/kernel.cpp
View File

@ -24,6 +24,7 @@ static std::map<int, unsigned int> mapStakeModifierCheckpoints =
( 11000, 0x97a10217u )
( 130000, 0xf3878d42u )
( 148000, 0x111af91cu )
( 180646, 0xb85b7dd1u )
;

2
src/main.cpp
View File

@ -2868,7 +2868,7 @@ bool LoadExternalBlockFile(FILE* fileIn)
extern map<uint256, CAlert> mapAlerts;
extern CCriticalSection cs_mapAlerts;
static string strMintMessage = "Info: Minting suspended due to locked wallet.";
static string strMintMessage = "Info: Staking suspended due to locked wallet. Click 'Settings' then 'Unlock Wallet' to stake.";
static string strMintWarning;
string GetWarnings(string strFor)

6
src/qt/curecoingui.cpp
View File

@ -240,14 +240,14 @@ void curecoinGUI::createActions()
quitAction->setToolTip(tr("Quit application"));
quitAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_Q));
quitAction->setMenuRole(QAction::QuitRole);
aboutAction = new QAction(QIcon(":/icons/curecoin"), tr("&About curecoin"), this);
aboutAction->setToolTip(tr("Show information about curecoin"));
aboutAction = new QAction(QIcon(":/icons/curecoin"), tr("&About Curecoin"), this);
aboutAction->setToolTip(tr("Show information about Curecoin"));
aboutAction->setMenuRole(QAction::AboutRole);
aboutQtAction = new QAction(QIcon(":/trolltech/qmessagebox/images/qtlogo-64.png"), tr("About &Qt"), this);
aboutQtAction->setToolTip(tr("Show information about Qt"));
aboutQtAction->setMenuRole(QAction::AboutQtRole);
optionsAction = new QAction(QIcon(":/icons/options"), tr("&Options..."), this);
optionsAction->setToolTip(tr("Modify configuration options for curecoin"));
optionsAction->setToolTip(tr("Modify configuration options for Curecoin"));
optionsAction->setMenuRole(QAction::PreferencesRole);
toggleHideAction = new QAction(QIcon(":/icons/curecoin"), tr("&Show / Hide"), this);
encryptWalletAction = new QAction(QIcon(":/icons/lock_closed"), tr("&Encrypt Wallet..."), this);

2
src/qt/forms/aboutdialog.ui
View File

@ -11,7 +11,7 @@
</rect>
</property>
<property name="windowTitle">
<string>About curecoin</string>
<string>About Curecoin</string>
</property>
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>

4
src/qt/forms/optionsdialog.ui
View File

@ -79,10 +79,10 @@
<item>
<widget class="QCheckBox" name="curecoinAtStartup">
<property name="toolTip">
<string>Automatically start curecoin after logging in to the system.</string>
<string>Automatically start Curecoin after logging in to the system.</string>
</property>
<property name="text">
<string>&amp;Start curecoin on system login</string>
<string>&amp;Start Curecoin on system login</string>
</property>
</widget>
</item>

4
src/qt/transactiontablemodel.cpp
View File

@ -360,9 +360,9 @@ QString TransactionTableModel::formatTxType(const TransactionRecord *wtx) const
case TransactionRecord::SendToSelf:
return tr("Payment to yourself");
case TransactionRecord::StakeMint:
return tr("POFMined");
return tr("POS mined");
case TransactionRecord::Generated:
return tr("POWMined");
return tr("POW mined");
default:
return QString();
}

4
src/qt/transactionview.cpp
View File

@ -74,8 +74,8 @@ TransactionView::TransactionView(QWidget *parent) :
typeWidget->addItem(tr("Sent to"), TransactionFilterProxy::TYPE(TransactionRecord::SendToAddress) |
TransactionFilterProxy::TYPE(TransactionRecord::SendToOther));
typeWidget->addItem(tr("To yourself"), TransactionFilterProxy::TYPE(TransactionRecord::SendToSelf));
typeWidget->addItem(tr("POFMined"), TransactionFilterProxy::TYPE(TransactionRecord::StakeMint));
typeWidget->addItem(tr("POWMined"), TransactionFilterProxy::TYPE(TransactionRecord::Generated));
typeWidget->addItem(tr("POS mined"), TransactionFilterProxy::TYPE(TransactionRecord::StakeMint));
typeWidget->addItem(tr("POW mined"), TransactionFilterProxy::TYPE(TransactionRecord::Generated));
typeWidget->addItem(tr("Other"), TransactionFilterProxy::TYPE(TransactionRecord::Other));
hlayout->addWidget(typeWidget);

2
src/version.h
View File

@ -46,7 +46,7 @@ static const int MEMPOOL_GD_VERSION = 60002;
#define DISPLAY_VERSION_MAJOR 1
#define DISPLAY_VERSION_MINOR 9
#define DISPLAY_VERSION_REVISION 2
#define DISPLAY_VERSION_REVISION 3
#define DISPLAY_VERSION_BUILD 1
#endif