Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/darkcoin/darkcoin
Browse files Browse the repository at this point in the history
  • Loading branch information
Evan Duffield committed Apr 2, 2015
2 parents af6bf0f + fd357be commit e29b66d
Show file tree
Hide file tree
Showing 22 changed files with 626 additions and 640 deletions.
Binary file modified share/pixmaps/bitcoin-bc.ico 100644 → 100755
View file
Binary file not shown.
Binary file modified share/pixmaps/bitcoin.ico 100644 → 100755
View file
Binary file not shown.
Binary file modified share/pixmaps/bitcoin128.png 100644 → 100755
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
263 changes: 130 additions & 133 deletions share/pixmaps/bitcoin128.xpm 100644 → 100755
View file

Large diffs are not rendered by default.

Binary file modified share/pixmaps/bitcoin16.png 100644 → 100755
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 19 additions & 22 deletions share/pixmaps/bitcoin16.xpm 100644 → 100755
View file
@@ -1,24 +1,21 @@
/* XPM */
static char *bitcoin__[] = {
/* columns rows colors chars-per-pixel */
static char *bitcoin___[] = {
"16 16 2 1",
" c #2D98CE",
". c None",
/* pixels */
"................",
"................",
"................",
"... ..",
"... .",
".... ",
" .. ...... ",
". . ...... ",
".. ........ ",
"... ....... ",
"... ",
".... .",
"..... ..",
"................",
"................",
"................"
};
" c None",
". c #1C75BC",
" ",
" ",
" ",
" ............ ",
" .............",
" .............",
" ....",
" ..... ... ",
"...... ... ",
" .... ",
" ............. ",
" ............. ",
" ........... ",
" ",
" ",
" "};
Binary file modified share/pixmaps/bitcoin256.png 100644 → 100755
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
519 changes: 258 additions & 261 deletions share/pixmaps/bitcoin256.xpm 100644 → 100755
View file

Large diffs are not rendered by default.

Binary file modified share/pixmaps/bitcoin32.png 100644 → 100755
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
73 changes: 35 additions & 38 deletions share/pixmaps/bitcoin32.xpm 100644 → 100755
View file
@@ -1,40 +1,37 @@
/* XPM */
static char *bitcoin__[] = {
/* columns rows colors chars-per-pixel */
static char *bitcoin___[] = {
"32 32 2 1",
" c #2D98CE",
". c None",
/* pixels */
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"..... .....",
"...... ..",
"....... .",
"....... ",
"........ ",
". .. ............ ",
". ... ............ ",
".. .. ............. ",
"... .. ............. ",
"... .. ............. ",
".... ... ............. ",
"..... ............... ",
"...... .............. ",
"....... ",
"....... ",
"........ .",
"......... ..",
".......... ...",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................"
};
" c None",
". c #1C75BC",
" ",
" ",
" ",
" ",
" ",
" ",
" . ",
" ........................ ",
" ..........................",
" ..........................",
" ..........................",
" .......",
" ...... ",
" ....... ",
" ............ ....... ",
" ............ ...... ",
" ........... ....... ",
"............ ....... ",
" ...... ",
" ....... ",
" ....... ",
" .......................... ",
" .......................... ",
" .......................... ",
" ........................ ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
Binary file modified share/pixmaps/bitcoin64.png 100644 → 100755
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
137 changes: 67 additions & 70 deletions share/pixmaps/bitcoin64.xpm 100644 → 100755
View file
@@ -1,72 +1,69 @@
/* XPM */
static char *bitcoin__[] = {
/* columns rows colors chars-per-pixel */
static char *bitcoin___[] = {
"64 64 2 1",
" c #2D98CE",
". c None",
/* pixels */
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
".......... ...........",
".......... .......",
"........... .....",
"............ ...",
"............. ..",
".............. ..",
".............. .",
"............... .",
"................ ",
"................. ",
". .... ........................ ",
". ..... ......................... ",
".. ..... .......................... ",
"... ..... .......................... ",
"... ..... .......................... ",
".... .... .......................... ",
"..... ..... .......................... ",
"...... ..... .......................... ",
"...... ..... .......................... ",
"....... .... .......................... ",
"........ ..... .......................... ",
"......... ..... ......................... ",
".......... ..... ......................... ",
".......... .............................. ",
"........... ............................ ",
"............ ............................ ",
"............. ......................... ",
"............. ",
".............. .",
"............... .",
"................ .",
"................. ..",
"................. ...",
".................. ....",
"................... ......",
".................... ........",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................",
"................................................................"
};
" c None",
". c #1C75BC",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" .............................................. ",
" ................................................. ",
" .................................................. ",
" .................................................. ",
" ....................................................",
" ....................................................",
" ....................................................",
" .....................................................",
" .....................................................",
" ...................................... ..............",
" ............. ",
" .............. ",
" .............. ",
" ............. ",
" . .............. ",
" ....................... .............. ",
" ........................ ............. ",
" ....................... .............. ",
" ....................... .............. ",
" ........................ ............. ",
" ....................... .............. ",
" ....................... .............. ",
"........................ ............. ",
" .............. ",
" .............. ",
" ............. ",
" .............. ",
" .............. ",
" ................................................... ",
" ..................................................... ",
" .................................................... ",
" .................................................... ",
" .................................................... ",
" ................................................... ",
" .................................................. ",
" .................................................. ",
" ................................................ ",
" .............................................. ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
Binary file modified share/pixmaps/dash128.png 100644 → 100755
View file
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
41 changes: 19 additions & 22 deletions share/pixmaps/dash16.xpm 100644 → 100755
View file
@@ -1,24 +1,21 @@
/* XPM */
static char *bitcoin__[] = {
/* columns rows colors chars-per-pixel */
static char *bitcoin___[] = {
"16 16 2 1",
" c #2D98CE",
". c None",
/* pixels */
"................",
"................",
"................",
"... ..",
"... .",
".... ",
" .. ...... ",
". . ...... ",
".. ........ ",
"... ....... ",
"... ",
".... .",
"..... ..",
"................",
"................",
"................"
};
" c None",
". c #1C75BC",
" ",
" ",
" ",
" ........... ",
" .............",
" .............",
" ....",
" ..... ... ",
"...... ... ",
" .... ",
" ............. ",
" ............. ",
" ........... ",
" ",
" ",
" "};
73 changes: 35 additions & 38 deletions share/pixmaps/dash32.xpm 100644 → 100755
View file
@@ -1,40 +1,37 @@
/* XPM */
static char *bitcoin__[] = {
/* columns rows colors chars-per-pixel */
static char *bitcoin___[] = {
"32 32 2 1",
" c #2D98CE",
". c None",
/* pixels */
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"..... .....",
"...... ..",
"....... .",
"....... ",
"........ ",
". .. ............ ",
". ... ............ ",
".. .. ............. ",
"... .. ............. ",
"... .. ............. ",
".... ... ............. ",
"..... ............... ",
"...... .............. ",
"....... ",
"....... ",
"........ .",
"......... ..",
".......... ...",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................",
"................................"
};
" c None",
". c #1C75BC",
" ",
" ",
" ",
" ",
" ",
" ",
" ",
" ........................ ",
" ..........................",
" ..........................",
" ..........................",
" .......",
" ...... ",
" ....... ",
" ............ ....... ",
" ............ ...... ",
" ........... ....... ",
"............ ....... ",
" ...... ",
" ....... ",
" ....... ",
" .......................... ",
" .......................... ",
" .......................... ",
" ........................ ",
" ",
" ",
" ",
" ",
" ",
" ",
" "};
Binary file modified share/pixmaps/favicon.ico 100644 → 100755
View file
Binary file not shown.
Binary file modified share/pixmaps/nsis-header.bmp 100644 → 100755
View file
Binary file not shown.
Binary file modified share/pixmaps/nsis-wizard.bmp 100644 → 100755
View file
Binary file not shown.
12 changes: 12 additions & 0 deletions src/masternode.h
View file
Expand Up @@ -233,6 +233,18 @@ class CMasternode
}
}

std::string Status() {
std::string strStatus = "ACTIVE";

if(activeState == CMasternode::MASTERNODE_ENABLED) strStatus = "ENABLED";
if(activeState == CMasternode::MASTERNODE_EXPIRED) strStatus = "EXPIRED";
if(activeState == CMasternode::MASTERNODE_VIN_SPENT) strStatus = "VIN_SPENT";
if(activeState == CMasternode::MASTERNODE_REMOVE) strStatus = "REMOVE";
if(activeState == CMasternode::MASTERNODE_POS_ERROR) strStatus = "POS_ERROR";

return strStatus;
}

};

// for storing the winning payments
Expand Down

0 comments on commit e29b66d

Please sign in to comment.