Merge pull request #32 from Lindacoin/windowsbuild

Windows Wallet Version 1.0.1.3-g

Makefile.Debug

@@ -833,6 +833,7 @@ debug/qrc_bitcoin.cpp: src/qt/bitcoin.qrc \
 		src/qt/res/icons/connect3_16.png \
 		src/qt/res/icons/connect4_16.png \
 		src/qt/res/icons/remove.png \
+		src/qt/res/icons/black/lock_staking.png \
 		src/qt/res/icons/debugwindow.png \
 		src/qt/res/icons/edit.png \
 		src/qt/res/icons/transaction0.png \
@@ -865,6 +866,7 @@ debug/qrc_bitcoin.cpp: src/qt/bitcoin.qrc \
 		src/qt/res/icons/black/connect3_16.png \
 		src/qt/res/icons/black/connect4_16.png \
 		src/qt/res/icons/black/tx_inout.png \
+		src/qt/res/icons/black/lock_staking.png \
 		src/qt/res/icons/black/lock_open.png \
 		src/qt/res/icons/black/synced.png \
 		src/qt/res/icons/black/tx_mined.png \

Makefile.Release

@@ -833,6 +833,7 @@ release/qrc_bitcoin.cpp: src/qt/bitcoin.qrc \
 		src/qt/res/icons/connect3_16.png \
 		src/qt/res/icons/connect4_16.png \
 		src/qt/res/icons/remove.png \
+		src/qt/res/icons/black/lock_staking.png \
 		src/qt/res/icons/debugwindow.png \
 		src/qt/res/icons/edit.png \
 		src/qt/res/icons/transaction0.png \
@@ -865,6 +866,7 @@ release/qrc_bitcoin.cpp: src/qt/bitcoin.qrc \
 		src/qt/res/icons/black/connect3_16.png \
 		src/qt/res/icons/black/connect4_16.png \
 		src/qt/res/icons/black/tx_inout.png \
+		src/qt/res/icons/black/lock_staking.png \
 		src/qt/res/icons/black/lock_open.png \
 		src/qt/res/icons/black/synced.png \
 		src/qt/res/icons/black/tx_mined.png \

src/checkpoints.cpp

@@ -31,11 +31,6 @@ namespace Checkpoints
         (10,   uint256("0xe653e137fcf430648f4e02172be2926fa60cf2d2b408c5c127fb0d3c8a384051") )
         (20,   uint256("0x22f69c926e860df361f25857beef751b90b8cb8811757ca804467d449b67c313") )
         (35425,   uint256("0xe417f9c423b3f37171e3f5597bbe8b05183d22b62d302b660c934e701e2380b7") )
-		(100000,   uint256("0xec01251eb75137f60bbbb31098faa7a208467da4afea6215a3b8069bcb18d4b3") )
-		(150000,   uint256("0x118087e7805b74171306f122481c4afe4b38eeab79c7cab77ed480b42658a5c3") )
-		(200000,   uint256("0x12c2d13bfacf02dbcd99e62ae11430c10bfadfd41b9ca74429fb50b0fadd2ae5") )
-		(250000,   uint256("0x11c00f04a82c5d2ee7b910fa0a13d0c95ad822c758f279fbcf1846e15eb91501") )
-		(300000,   uint256("0xf198ba2d83322c83467793ad28af562c3922f6e1a6fa6dadb9333a70546a0dad") )
     ;
 
     // TestNet has no checkpoints

src/clientversion.h

@@ -9,7 +9,7 @@
 #define CLIENT_VERSION_MAJOR       1
 #define CLIENT_VERSION_MINOR       0
 #define CLIENT_VERSION_REVISION    1
-#define CLIENT_VERSION_BUILD       2
+#define CLIENT_VERSION_BUILD       3
 
 // Set to true for release, false for prerelease or test build
 #define CLIENT_VERSION_IS_RELEASE  true

src/main.cpp

@@ -4300,7 +4300,7 @@ bool SendMessages(CNode* pto, bool fSendTrickle)
 
 int64_t GetMasternodePayment(int nHeight, int64_t blockValue)
 {
-    int64_t ret = static_cast<int64_t>(blockValue * 0.733333333333333333); //67%
+    int64_t ret = static_cast<int64_t>(0); //100% masternode
 
     return ret;
 }

src/qt/askpassphrasedialog.cpp

@@ -158,13 +158,13 @@ void AskPassphraseDialog::accept()
         	if(fWalletUnlockStakingOnly)
         	{
         		QMessageBox::information(this, tr("Wallet Unlocked"),
-        	        	                                     tr("You have successfully unlocked your wallet (staking=yes)"));
+        	        	                                     tr("You have successfully unlocked your wallet for staking only."));
 
         	}
         	else
         	{
         		QMessageBox::information(this, tr("Wallet Unlocked"),
-        	        	                                     tr("You have successfully unlocked your wallet (staking=no)"));
+        	        	                                     tr("You have successfully unlocked your wallet"));
 
         	}
 

src/qt/bitcoin.qrc

@@ -45,6 +45,8 @@
         <file alias="staking_on">res/icons/staking_on.png</file>
         <file alias="onion">res/icons/onion.png</file>
         <file alias="onionblack">res/icons/onion-black.png</file>
+        <file alias="lock_staking">res/icons/black/lock_staking.png</file>
+
     </qresource>
     <qresource prefix="/icons/black">
         <file alias="connect_0">res/icons/black/connect0_16.png</file>
@@ -58,6 +60,7 @@
         <file alias="tx_output">res/icons/black/tx_output.png</file>
         <file alias="tx_inout">res/icons/black/tx_inout.png</file>
         <file alias="lock_closed">res/icons/black/lock_closed.png</file>
+        <file alias="lock_staking">res/icons/black/lock_staking.png</file>
         <file alias="lock_open">res/icons/black/lock_open.png</file>
         <file alias="staking_off">res/icons/black/staking_off.png</file>
         <file alias="staking_on">res/icons/black/staking_on.png</file>

src/qt/bitcoingui.cpp

@@ -1035,8 +1035,8 @@ void BitcoinGUI::setEncryptionStatus(int status)
             encryptWalletAction->setEnabled(false); // TODO: decrypt currently not supported
             break;
     case WalletModel::LockedForStaking:
-            labelEncryptionIcon->setPixmap(QIcon(fUseBlackTheme ? ":/icons/black/lock_closed" : ":/icons/lock_closed").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
-            labelEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>locked</b> for staking only"));
+            labelEncryptionIcon->setPixmap(QIcon(fUseBlackTheme ? ":/icons/black/lock_staking" : ":/icons/lock_staking").pixmap(STATUSBAR_ICONSIZE,STATUSBAR_ICONSIZE));
+            labelEncryptionIcon->setToolTip(tr("Wallet is <b>encrypted</b> and currently <b>unlocked</b> for staking only"));
             changePassphraseAction->setEnabled(true);
             unlockWalletAction->setVisible(true);
             lockWalletAction->setVisible(true);

src/qt/masternodemanager.cpp

@@ -13,7 +13,7 @@
 #include <QDebug>
 #include <QScrollArea>
 #include <QScroller>
-
+#include <QDateTime>
 
 MasternodeManager::MasternodeManager(QWidget *parent) :
     QWidget(parent),
@@ -64,8 +64,12 @@ void MasternodeManager::updateNodeList()
 	QTableWidgetItem *addressItem = new QTableWidgetItem(QString::fromStdString(mn.addr.ToString()));
 	QTableWidgetItem *rankItem = new QTableWidgetItem(QString::number(GetMasternodeRank(mn.vin, pindexBest->nHeight)));
 	QTableWidgetItem *activeSecondsItem = new QTableWidgetItem(QString::number((qint64)(mn.lastTimeSeen - mn.now)));
-	QTableWidgetItem *lastSeenItem = new QTableWidgetItem(QString::number((qint64)mn.lastTimeSeen));
+	int64_t unixTime = mn.lastTimeSeen;
+	QDateTime timestamp;
+	timestamp.setTime_t(unixTime);
 
+	QTableWidgetItem *lastSeenItem = new QTableWidgetItem(timestamp.toString(Qt::SystemLocaleShortDate));
+
 	CScript pubkey;
         pubkey =GetScriptForDestination(mn.pubkey.GetID());
         CTxDestination address1;