Skip to content

Commit

Permalink
1.1.0
Browse files Browse the repository at this point in the history
Cambios en la interfaz y numeros de conexiones.
  • Loading branch information
CarmeloCampos committed Mar 28, 2020
1 parent cd0c2f2 commit 92e90ce
Show file tree
Hide file tree
Showing 166 changed files with 654 additions and 294 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
*DS_Store
.vscode/*
kmushicoin-qt.pro.user
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
_KmushiCoin es la primera Criptomoneda Colombiana respaldada por una empresa. KmushiCoin nace gracias a Tierra Viva (SAS) la cual tiene mas de 20 años en investigación y elaboración de abono orgánico por medio de los escarabajos._

<p align="center">
<a href="https://tierravivaplanet.com/index"><img src="https://tierravivaplanet.com/img/fondo.jpg" /></a>
<a href="https://kmushicoin.com/"><img src="https://kmushicoin.com/images/seo_image.png" /></a>
</p>

## Última versión
Expand Down
48 changes: 0 additions & 48 deletions contrib/debian/copyright
Original file line number Diff line number Diff line change
Expand Up @@ -28,61 +28,13 @@ Files: debian/manpages/*
Copyright: Micah Anderson <micah@debian.org>
License: GPL-3+

Files: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
src/qt/res/src/*.svg
Copyright: Wladimir van der Laan
License: Expat

Files: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png,
src/qt/res/icons/history.png, src/qt/res/icons/key.png,
src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png,
src/qt/res/icons/receive.png, src/qt/res/icons/send.png,
src/qt/res/icons/synced.png, src/qt/res/icons/filesave.png
Copyright: David Vignoni (david@icon-king.com)
ICON KING - www.icon-king.com
License: LGPL
Comment: NUVOLA ICON THEME for KDE 3.x
Original icons: kaddressbook, klipper_dock, view-list-text,
key-password, encrypted/decrypted, go-home, go-down,
go-next, dialog-ok
Site: http://www.icon-king.com/projects/nuvola/

Files: src/qt/res/icons/connect*.png
Copyright: schollidesign
License: GPL-3+
Comment: Icon Pack: Human-O2
Site: http://findicons.com/icon/93743/blocks_gnome_netstatus_0

Files: src/qt/res/icons/transaction*.png
Copyright: md2k7
License: Expat
Comment: Site: https://bitcointalk.org/index.php?topic=15276.0

Files: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,
src/qt/res/icons/add.png, src/qt/res/icons/edit.png,
src/qt/res/icons/remove.png
Copyright: http://www.everaldo.com
License: LGPL
Comment: Icon Pack: Crystal SVG

Files: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png
Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan)
License: PUB-DOM
Comment: Site: https://bitcointalk.org/?topic=1756.0

Files: scripts/img/reload.xcf, src/qt/res/movies/update_spinner.mng
Copyright: Everaldo (Everaldo Coelho)
License: GPL-3+
Comment: Icon Pack: Kids
Site: http://findicons.com/icon/17102/reload?id=17102

Files: src/qt/res/images/splash2.jpg
License: PUB-DOM
Copyright: Crobbo (forum)
Comment: Site: https://bitcointalk.org/index.php?topic=32273.0


License: Expat
Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the
Expand Down
4 changes: 2 additions & 2 deletions contrib/getpeerinfo_ip.php
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?php
$explorer = file_get_contents('http://explorer.tierravivaplanet.com/api/getpeerinfo');
$explorer = file_get_contents('http://explorer.kmushicoin.com/api/getpeerinfo');

$info = file_get_contents('http://explorer.tierravivaplanet.com/api/getinfo');
$info = file_get_contents('http://explorer.kmushicoin.com/api/getinfo');

$connections = json_decode($info,TRUE)["connections"];

Expand Down
7 changes: 5 additions & 2 deletions doc/README
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
KmushiCoin 0.4.4 BETA
KmushiCoin 1.1.0 BETA

Copyright (c) 2013 NovaCoin Developers
Copyright (c) 2011-2012 PPCoin Developers
Copyright (c) 2019-2020 The KmushiCoin developers (https://kmushicoin.com)
Copyright (c) 2019-2020 Carmelo Campos

Distributed under the MIT/X11 software license, see the accompanying
file license.txt or http://www.opensource.org/licenses/mit-license.php.
This product includes software developed by the OpenSSL Project for use in
Expand All @@ -13,6 +16,6 @@ Intro
-----
KmushiCoin is a free open source project derived from Bitcoin, with
the goal of providing a long-term energy-efficient scrypt-based crypto-currency.
Built on the foundation of Bitcoin, PPCoin and NovaCoin, innovations such as proof-of-stake
Built on the foundation of Bitcoin, PPCoin, NovaCoin, KmushiCoin and CarmeloCampos innovations such as proof-of-stake
help further advance the field of crypto-currency.

2 changes: 1 addition & 1 deletion doc/README_windows.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
KmushiCoin 0.4.4 BETA
KmushiCoin 1.1.0 BETA

Copyright (c) 2013 NovaCoin Developers
Copyright (c) 2011-2013 PPCoin Developers
Expand Down
56 changes: 1 addition & 55 deletions doc/assets-attribution.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,58 +2,4 @@ Code: src/strlcpy.h
Author: Todd C. Miller <Todd.Miller@courtesan.com>
License: ISC

Icon: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
src/qt/res/src/*.svg
Designer: Wladimir van der Laan
License: MIT

Icon: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png,
src/qt/res/icons/history.png, src/qt/res/icons/key.png,
src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png,
src/qt/res/icons/receive.png, src/qt/res/icons/send.png,
src/qt/res/icons/synced.png, src/qt/res/icons/filesave.png
Icon Pack: NUVOLA ICON THEME for KDE 3.x
Designer: David Vignoni (david@icon-king.com)
ICON KING - www.icon-king.com
License: LGPL
Site: http://www.icon-king.com/projects/nuvola/

Icon: src/qt/res/icons/connect*.png
Icon Pack: Human-O2
Designer: schollidesign
License: GNU/GPL
Site: http://findicons.com/icon/93743/blocks_gnome_netstatus_0

Icon: src/qt/res/icons/transaction*.png
Designer: md2k7
Site: https://forum.bitcoin.org/index.php?topic=15276.0
License: You are free to do with these icons as you wish, including selling,
copying, modifying etc.

Icon: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,
src/qt/res/icons/add.png, src/qt/res/icons/edit.png,
src/qt/res/icons/remove.png (edited)
Designer: http://www.everaldo.com
Icon Pack: Crystal SVG
License: LGPL

Icon: src/qt/res/icons/bitcoin.png, src/qt/res/icons/toolbar.png
Designer: Bitboy (optimized for 16x16 by Wladimir van der Laan)
License: Public Domain
Site: http://forum.bitcoin.org/?topic=1756.0

Icon: scripts/img/reload.xcf (modified),src/qt/res/movies/update_spinner.mng
Icon Pack: Kids
Designer: Everaldo (Everaldo Coelho)
License: GNU/GPL
Site: http://findicons.com/icon/17102/reload?id=17102

Image: src/qt/res/images/splash2.jpg (Wallet image)
Designer: Crobbo (forum)
Site: https://bitcointalk.org/index.php?topic=32273.0
License: Public domain

KmushiCoin Logo
Designer: Evan
License: Creative Commons Attribution 4.0 International License
TODOS LOS ICONOS Y SPLASH FUERON CREADOS POR OCASAMAX (Oscar Mauricio)
2 changes: 1 addition & 1 deletion kmushicoin-qt.pro
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
TEMPLATE = app
TARGET = KmushiCoin-qt
VERSION = 1.0.7
VERSION = 1.1.0
INCLUDEPATH += src src/json src/qt
DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
CONFIG += no_include_pwd
Expand Down
19 changes: 19 additions & 0 deletions share/compile.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
#!/bin/bash
MXE_INCLUDE_PATH=/mnt/mxe/usr/i686-w64-mingw32.static/include
MXE_LIB_PATH=/mnt/mxe/usr/i686-w64-mingw32.static/lib

i686-w64-mingw32.static-qmake-qt5 \
BOOST_LIB_SUFFIX=-mt \
BOOST_THREAD_LIB_SUFFIX=_win32-mt \
BOOST_INCLUDE_PATH=$MXE_INCLUDE_PATH/boost \
BOOST_LIB_PATH=$MXE_LIB_PATH \
OPENSSL_INCLUDE_PATH=$MXE_INCLUDE_PATH/openssl \
OPENSSL_LIB_PATH=$MXE_LIB_PATH \
BDB_INCLUDE_PATH=$MXE_INCLUDE_PATH \
BDB_LIB_PATH=$MXE_LIB_PATH \
MINIUPNPC_INCLUDE_PATH=$MXE_INCLUDE_PATH \
MINIUPNPC_LIB_PATH=$MXE_LIB_PATH \
QMAKE_LRELEASE=/mnt/mxe/usr/i686-w64-mingw32.static/qt5/bin/lrelease kmushicoin-qt.pro

make -j6 -f Makefile.Release

4 changes: 2 additions & 2 deletions share/qt/make_windows_icon.sh
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#!/bin/bash
# create multiresolution windows icon
ICON_DST=../../src/qt/res/icons/novacoin.ico
ICON_DST=../../src/qt/res/icons/kmushicoin.ico

convert ../../src/qt/res/icons/novacoin-16.png ../../src/qt/res/icons/novacoin-32.png ../../src/qt/res/icons/novacoin-48.png ${ICON_DST}
convert ../../src/qt/res/icons/kmushicoin-16.png ../../src/qt/res/icons/kmushicoin-32.png ../../src/qt/res/icons/kmushicoin-48.png ${ICON_DST}
36 changes: 22 additions & 14 deletions src/makefile.linux-mingw
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
#Makefile:
# Copyright (c) 2009-2010 Satoshi Nakamoto
# Distributed under the MIT/X11 software license, see the accompanying
# file COPYING or http://www.opensource.org/licenses/mit-license.php.
Expand All @@ -6,25 +7,30 @@ TARGET_PLATFORM:=i686
#TARGET_PLATFORM:=x86_64

DEPSDIR:=/usr/$(TARGET_PLATFORM)-w64-mingw32
CC:=$(TARGET_PLATFORM)-w64-mingw32-gcc
CXX:=$(TARGET_PLATFORM)-w64-mingw32-g++
RANLIB=$(TARGET_PLATFORM)-w64-mingw32-ranlib
STRIP=$(TARGET_PLATFORM)-w64-mingw32-strip
CC:=$(TARGET_PLATFORM)-w64-mingw32.static-gcc
CXX:=$(TARGET_PLATFORM)-w64-mingw32.static-g++
RANLIB=$(TARGET_PLATFORM)-w64-mingw32.static-ranlib
STRIP=$(TARGET_PLATFORM)-w64-mingw32.static-strip

USE_UPNP:=0
USE_UPNP:=1

INCLUDEPATHS= \
-I"$(CURDIR)" \
-I"$(CURDIR)"/obj \
-I"$(DEPSDIR)/boost_1_55_0" \
-I"$(DEPSDIR)/db-6.0.20/build_unix" \
-I"$(DEPSDIR)/openssl-1.0.1f/include" \
-I"$(DEPSDIR)"
-I"/mnt/mxe/usr/i686-w64-mingw32.static/include/boost" \
-I"/mnt/mxe/usr/i686-w64-mingw32.static/" \
-I"/mnt/mxe/usr/i686-w64-mingw32.static/lib" \
-I"/mnt/mxe/usr/i686-w64-mingw32.static/include/openssl" \
-I"/mnt/mxe/usr/i686-w64-mingw32.static/lib" \
-I"/mnt/mxe/usr/i686-w64-mingw32.static/include/"

LIBPATHS= \
-L"$(DEPSDIR)/boost_1_55_0/stage/lib" \
-L"$(DEPSDIR)/db-6.0.20/build_unix" \
-L"$(DEPSDIR)/openssl-1.0.1f"
-L"/mnt/mxe/i686-w64-mingw32.static/lib" \
-L"/mnt/mxe/i686-w64-mingw32.static/lib" \
-L"/mnt/mxe/usr/i686-w64-mingw32.static/include/boost" \
-L"/mnt/mxe/usr/i686-w64-mingw32.static/" \
-L"/mnt/mxe/usr/i686-w64-mingw32.static/lib" \
-L"/mnt/mxe/usr/i686-w64-mingw32.static/include/"

LIBS= \
-l boost_system-mt \
Expand All @@ -35,7 +41,8 @@ LIBS= \
-l db_cxx \
-l ssl \
-l crypto \
-l z
-l z \
-Wl,-rpath,/usr/local/include -L/usr/local/include

DEFS=-D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB -DBOOST_SPIRIT_THREADSAFE
DEBUGFLAGS=-g
Expand All @@ -46,7 +53,7 @@ ifndef USE_UPNP
override USE_UPNP = -
endif
ifneq (${USE_UPNP}, -)
LIBPATHS += -L"$(DEPSDIR)/miniupnpc"
LIBPATHS += -L"/mnt/mxe/usr/i686-w64-mingw32.static/lib"
LIBS += -l miniupnpc -l iphlpapi
DEFS += -DSTATICLIB -DUSE_UPNP=$(USE_UPNP)
endif
Expand Down Expand Up @@ -140,3 +147,4 @@ clean:
cd leveldb && TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) clean && cd ..

FORCE:

Loading

0 comments on commit 92e90ce

Please sign in to comment.