Skip to content

Commit

Permalink
Trezarcoin 2.0 Init
Browse files Browse the repository at this point in the history 
- New GUI
- TrezarMessage Layer
  • Loading branch information
Oliver Ziegler authored and Oliver Ziegler committed Jul 28, 2019
1 parent 6d3c4a2 commit 608736f
Show file tree
Hide file tree
Showing 92 changed files with 7,626 additions and 3,848 deletions.
10 changes: 5 additions & 5 deletions configure.ac
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
AC_PREREQ([2.60])
define(_CLIENT_VERSION_MAJOR, 1)
define(_CLIENT_VERSION_MINOR, 2)
define(_CLIENT_VERSION_REVISION, 1)
define(_CLIENT_VERSION_MAJOR, 2)
define(_CLIENT_VERSION_MINOR, 0)
define(_CLIENT_VERSION_REVISION, 0)
define(_CLIENT_VERSION_BUILD, 0)
define(_CLIENT_VERSION_IS_RELEASE, true)
define(_COPYRIGHT_YEAR, 2018)
define(_CLIENT_VERSION_IS_RELEASE, false)
define(_COPYRIGHT_YEAR, 2019)
define(_COPYRIGHT_HOLDERS,[The %s developers])
define(_COPYRIGHT_HOLDERS_SUBSTITUTION,[[TrezarCoin Core]])
AC_INIT([TrezarCoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[https://github.com/TrezarCoin/TrezarCoin],[trezarcoin],[https://trezarcoin.com/])
Expand Down
3 changes: 2 additions & 1 deletion contrib/bitcoin-qt.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,8 @@ FORMS += \
../src/qt/forms/sendcoinsdialog_kopie.ui \
../src/qt/forms/sendcoinsentry_kopie.ui \
../src/qt/forms/easysplitdialog.ui \
../src/qt/forms/easysplitentry.ui
../src/qt/forms/easysplitentry.ui \
../src/qt/forms/stakingdialog.ui

RESOURCES += \
../src/qt/bitcoin.qrc
53 changes: 48 additions & 5 deletions src/Makefile.qt.include
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,8 @@ QT_FORMS_UI = \
qt/forms/easysplitdialog.ui \
qt/forms/easysplitentry.ui \
qt/forms/signverifymessagedialog.ui \
qt/forms/transactiondescdialog.ui
qt/forms/transactiondescdialog.ui \
qt/forms/stakingdialog.ui

QT_MOC_CPP = \
qt/moc_addressbookpage.cpp \
Expand Down Expand Up @@ -160,7 +161,8 @@ QT_MOC_CPP = \
qt/moc_utilitydialog.cpp \
qt/moc_walletframe.cpp \
qt/moc_walletmodel.cpp \
qt/moc_walletview.cpp
qt/moc_walletview.cpp \
qt/moc_stakingdialog.cpp

BITCOIN_MM = \
qt/macdockiconhandler.mm \
Expand All @@ -173,6 +175,9 @@ QT_MOC = \
qt/overviewpage.moc \
qt/rpcconsole.moc

RES_CSS = \
qt/res/css/default.css

QT_QRC_CPP = qt/qrc_bitcoin.cpp
QT_QRC = qt/bitcoin.qrc
QT_QRC_LOCALE_CPP = qt/qrc_bitcoin_locale.cpp
Expand Down Expand Up @@ -235,7 +240,8 @@ BITCOIN_QT_H = \
qt/walletmodel.h \
qt/walletmodeltransaction.h \
qt/walletview.h \
qt/winshutdownmonitor.h
qt/winshutdownmonitor.h \
qt/stakingdialog.h

RES_ICONS = \
qt/res/icons/add.png \
Expand Down Expand Up @@ -289,7 +295,40 @@ RES_ICONS = \
qt/res/icons/tx_mined.png \
qt/res/icons/warning.png \
qt/res/icons/verify.png \
qt/res/icons/transaction_abandoned.png
qt/res/icons/transaction_abandoned.png \
qt/res/icons/addressbook.png \
qt/res/icons/copyclipboard.png \
qt/res/icons/logout.png \
qt/res/icons/overview_green.png \
qt/res/icons/receive_qr.png \
qt/res/icons/qr_green.png \
qt/res/icons/receive_green_big.png \
qt/res/icons/receive_green.png \
qt/res/icons/send_green_big.png \
qt/res/icons/send_green.png \
qt/res/icons/settings.png \
qt/res/icons/settings_green.png \
qt/res/icons/sync_globe.png \
qt/res/icons/history_green.png \
qt/res/icons/refresh.png \
qt/res/icons/staking_on.png \
qt/res/icons/staking_off.png \
qt/res/icons/tzc_green.png \
qt/res/icons/history_small.png \
qt/res/icons/copyclipboard_small.png \
qt/res/icons/greendot.png \
qt/res/icons/logout_menu.png \
qt/res/icons/send_menu.png \
qt/res/icons/receive_menu.png \
qt/res/icons/staking_on_menu.png \
qt/res/icons/staking_off_menu.png \
qt/res/icons/reddot.png \
qt/res/icons/settings_menu.png \
qt/res/icons/createWallet.png \
qt/res/icons/openWallet.png \
qt/res/icons/backgroundIntro.png



BITCOIN_QT_BASE_CPP = \
qt/bantablemodel.cpp \
Expand Down Expand Up @@ -344,7 +383,8 @@ BITCOIN_QT_WALLET_CPP = \
qt/walletframe.cpp \
qt/walletmodel.cpp \
qt/walletmodeltransaction.cpp \
qt/walletview.cpp
qt/walletview.cpp \
qt/stakingdialog.cpp

BITCOIN_QT_CPP = $(BITCOIN_QT_BASE_CPP)
if TARGET_WINDOWS
Expand All @@ -356,6 +396,9 @@ endif

RES_IMAGES =

RES_CSS = \
qt/res/css/default.css

RES_MOVIES = $(wildcard qt/res/movies/spinner-*.png)

BITCOIN_RC = qt/res/bitcoin-qt-res.rc
Expand Down
8 changes: 4 additions & 4 deletions src/init.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1090,8 +1090,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
return(InitError(strprintf(_("Invalid amount for -stakecombine=<amount>: '%s'"), mapArgs["-stakecombine"].c_str())));
if (nCombineThreshold < MIN_STAKE_AMOUNT)
nCombineThreshold = MIN_STAKE_AMOUNT;
if (nCombineThreshold > 25 * MIN_STAKE_AMOUNT)
nCombineThreshold = 25 * MIN_STAKE_AMOUNT;
if (nCombineThreshold > 50 * MIN_STAKE_AMOUNT)
nCombineThreshold = 50 * MIN_STAKE_AMOUNT;
}

/* Don't split outputs while staking below this limit */
Expand All @@ -1100,8 +1100,8 @@ bool AppInit2(boost::thread_group& threadGroup, CScheduler& scheduler)
return(InitError(strprintf(_("Invalid amount for -stakesplit=<amount>: '%s'"), mapArgs["-stakesplit"].c_str())));
if (nSplitThreshold < 2 * MIN_STAKE_AMOUNT)
nSplitThreshold = 2 * MIN_STAKE_AMOUNT;
if (nSplitThreshold > 50 * MIN_STAKE_AMOUNT)
nSplitThreshold = 50 * MIN_STAKE_AMOUNT;
if (nSplitThreshold > 100 * MIN_STAKE_AMOUNT)
nSplitThreshold = 100 * MIN_STAKE_AMOUNT;
}

fNoSmsg = GetBoolArg("-nosmsg", false);
Expand Down
36 changes: 34 additions & 2 deletions src/qt/bitcoin.qrc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<file alias="eye_minus">res/icons/eye_minus.png</file>
<file alias="eye_plus">res/icons/eye_plus.png</file>
<file alias="options">res/icons/configure.png</file>
<file alias="receiving_addresses">res/icons/receive.png</file>
<file alias="receive">res/icons/receive.png</file>
<file alias="editpaste">res/icons/editpaste.png</file>
<file alias="editcopy">res/icons/editcopy.png</file>
<file alias="add">res/icons/add.png</file>
Expand Down Expand Up @@ -51,9 +51,41 @@
<file alias="prompticon">res/icons/chevron.png</file>
<file alias="transaction_abandoned">res/icons/transaction_abandoned.png</file>
<file alias="staking_on">res/icons/staking_on.png</file>
<file alias="staking_off">res/icons/staking_off.png</file>
<file alias="key_export">res/icons/key_export.png</file>
<file alias="key_import">res/icons/key_import.png</file>
<file alias="addressbook">res/icons/addressbook.png</file>
<file alias="copyclipboard">res/icons/copyclipboard.png</file>
<file alias="logout">res/icons/logout.png</file>
<file alias="overview_green">res/icons/overview_green.png</file>
<file alias="receive_qr">res/icons/receive_qr.png</file>
<file alias="qr_green">res/icons/qr_green.png</file>
<file alias="receive_green_big">res/icons/receive_green_big.png</file>
<file alias="receive_green">res/icons/receive_green.png</file>
<file alias="send_green_big">res/icons/send_green_big.png</file>
<file alias="send_green">res/icons/send_green.png</file>
<file alias="settings">res/icons/settings.png</file>
<file alias="settings_green">res/icons/settings_green.png</file>
<file alias="sync_globe">res/icons/sync_globe.png</file>
<file alias="history_green">res/icons/history_green.png</file>
<file alias="refresh">res/icons/refresh.png</file>
<file alias="tzc_green">res/icons/tzc_green.png</file>
<file alias="staking_off">res/icons/staking_off.png</file>
<file alias="history_small">res/icons/history_small.png</file>
<file alias="copyclipboard_small">res/icons/copyclipboard_small.png</file>
<file alias="greendot">res/icons/greendot.png</file>
<file alias="logout_menu">res/icons/logout_menu.png</file>
<file alias="receive_menu">res/icons/receive_menu.png</file>
<file alias="send_menu">res/icons/send_menu.png</file>
<file alias="staking_on_menu">res/icons/staking_on_menu.png</file>
<file alias="staking_off_menu">res/icons/staking_off_menu.png</file>
<file alias="settings_menu">res/icons/settings_menu.png</file>
<file alias="reddot">res/icons/reddot.png</file>
<file alias="openWallet">res/icons/openWallet.png</file>
<file alias="createWallet">res/icons/createWallet.png</file>
<file alias="backgroundIntro">res/icons/backgroundIntro.png</file>
</qresource>
<qresource prefix="/css">
<file alias="default">res/css/default.css</file>
</qresource>
<qresource prefix="/movies">
<file alias="spinner-000">res/movies/spinner-000.png</file>
Expand Down
8 changes: 5 additions & 3 deletions src/qt/bitcoinamountfield.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -197,17 +197,19 @@ BitcoinAmountField::BitcoinAmountField(QWidget *parent) :
amount = new AmountSpinBox(this);
amount->setLocale(QLocale::c());
amount->installEventFilter(this);
amount->setMaximumWidth(170);
amount->setMaximumWidth(250);

QHBoxLayout *layout = new QHBoxLayout(this);
layout->addWidget(amount);
unit = new QValueComboBox(this);
unit->setModel(new BitcoinUnits(this));
layout->addWidget(unit);
unit->setStyleSheet("BitcoinAmountField { color:#55ff7f }");
unit->setVisible(false);
/*layout->addWidget(unit);
layout->addStretch(1);
layout->setContentsMargins(0,0,0,0);
setLayout(layout);
setLayout(layout);*/

setFocusPolicy(Qt::TabFocus);
setFocusProxy(amount);
Expand Down
Loading

0 comments on commit 608736f

Please sign in to comment.