diff --git a/casinocoin-qt.pro b/casinocoin-qt.pro index 161121d..3725cea 100644 --- a/casinocoin-qt.pro +++ b/casinocoin-qt.pro @@ -1,13 +1,14 @@ TEMPLATE = app TARGET = casinocoin-qt macx:TARGET = "CasinoCoin-Qt" -VERSION = 1.3.0.0 +VERSION = 2.0.0.0 INCLUDEPATH += src src/json src/qt -QT += core gui network quick +QT += core gui network qml quick greaterThan(QT_MAJOR_VERSION, 4): QT += widgets DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE USE_IPV6 __NO_SYSTEM_INCLUDES CONFIG += no_include_pwd CONFIG += thread +CONFIG += static # for boost 1.37, add -mt to the boost libraries # use: qmake BOOST_LIB_SUFFIX=-mt @@ -280,7 +281,10 @@ HEADERS += src/qt/bitcoingui.h \ src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.h \ src/qt/gui20_skin.h \ src/qt/cscfusionstyle.h \ - src/qt/pryptopage.h + src/qt/pryptopage.h \ + src/qt/currencies.h \ + src/qt/CSCPublicAPI/jsoncoininfoparser.h \ + src/qt/infopage.h SOURCES += src/qt/bitcoin.cpp \ src/qt/bitcoingui.cpp \ @@ -371,7 +375,10 @@ SOURCES += src/qt/bitcoin.cpp \ src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.cpp \ src/qt/gui20_skin.cpp \ src/qt/cscfusionstyle.cpp \ - src/qt/pryptopage.cpp + src/qt/pryptopage.cpp \ + src/qt/currencies.cpp \ + src/qt/CSCPublicAPI/jsoncoininfoparser.cpp \ + src/qt/infopage.cpp RESOURCES += src/qt/bitcoin.qrc @@ -388,7 +395,8 @@ FORMS += src/qt/forms/sendcoinsdialog.ui \ src/qt/forms/askpassphrasedialog.ui \ src/qt/forms/rpcconsole.ui \ src/qt/forms/optionsdialog.ui \ - src/qt/forms/pryptopage.ui + src/qt/forms/pryptopage.ui \ + src/qt/forms/infopage.ui contains(USE_QRCODE, 1) { HEADERS += src/qt/qrcodedialog.h diff --git a/src/qt/addressbookpage.cpp b/src/qt/addressbookpage.cpp index 5574478..8c094cb 100644 --- a/src/qt/addressbookpage.cpp +++ b/src/qt/addressbookpage.cpp @@ -8,6 +8,8 @@ #include "csvmodelwriter.h" #include "guiutil.h" +#include "gui20_skin.h" + #ifdef USE_QRCODE #include "qrcodedialog.h" #endif @@ -26,7 +28,18 @@ AddressBookPage::AddressBookPage(Mode mode, Tabs tab, QWidget *parent) : tab(tab) { ui->setupUi(this); - + GUI20Skin& gui20Skin = GUI20Skin::Instance(); + ui->exportButton->setStyleSheet("background-color: rgb (" + QString::number( gui20Skin.GetColorToolbarMainGradientBegin().red() ) + + ", " + QString::number( gui20Skin.GetColorToolbarMainGradientBegin().green() ) + + ", " + QString::number( gui20Skin.GetColorToolbarMainGradientBegin().blue() ) + + ");" \ + "color: rgb(255, 255, 255);" \ + "pressed" \ + "{" \ + "background-color: rgb(170, 28, 33);" \ + "}" + ); + qDebug() << ui->exportButton->styleSheet(); #ifdef Q_OS_MAC // Icons on push buttons are very uncommon on Mac ui->newAddress->setIcon(QIcon()); ui->copyAddress->setIcon(QIcon()); diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 99df2a1..42c6df5 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -40,10 +40,10 @@ res/icons/filesave.png res/icons/qrcode.png res/icons/debugwindow.png - res/icons/adverts_arrow_left.png - res/icons/adverts_arrow_left_hover.png - res/icons/adverts_arrow_right.png - res/icons/adverts_arrow_right_hover.png + res/icons/adverts_arrow_left.png + res/icons/adverts_arrow_left_hover.png + res/icons/adverts_arrow_right.png + res/icons/adverts_arrow_right_hover.png res/icons/GUI20_mainToolBar_transactions.png res/icons/GUI20_mainToolBar_transactions_hover.png res/icons/GUI20_mainToolBar_send.png diff --git a/src/qt/cscfusionstyle.cpp b/src/qt/cscfusionstyle.cpp index 1dba402..a589bde 100644 --- a/src/qt/cscfusionstyle.cpp +++ b/src/qt/cscfusionstyle.cpp @@ -168,6 +168,10 @@ int CSCFusionStyle::styleHint(StyleHint hint, const QStyleOption *option, { return int(true); } + case SH_ComboBox_Popup: + { + qDebug() << "yep, there are some comboboxes!"; + } default: { return QProxyStyle::styleHint(hint, option, widget, returnData); diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui index 7704fc7..90865ad 100644 --- a/src/qt/forms/addressbookpage.ui +++ b/src/qt/forms/addressbookpage.ui @@ -115,6 +115,12 @@ Export the data in the current tab to a file + + false + + + + &Export @@ -122,6 +128,12 @@ :/icons/export:/icons/export + + true + + + true + diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index c968087..a29b13f 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -23,7 +23,7 @@ QTabWidget::North - 3 + 0 @@ -342,7 +342,7 @@ 10 70 491 - 24 + 29 @@ -374,7 +374,7 @@ 11 11 491 - 24 + 29 @@ -409,7 +409,7 @@ 11 42 491 - 24 + 29 @@ -533,21 +533,22 @@ + + QValidatedLineEdit + QLineEdit +
qvalidatedlineedit.h
+ BitcoinAmountField QSpinBox
bitcoinamountfield.h
+ 1 QValueComboBox QComboBox
qvaluecombobox.h
 - - QValidatedLineEdit - QLineEdit -
qvalidatedlineedit.h
- diff --git a/src/qt/forms/pryptopage.ui b/src/qt/forms/pryptopage.ui index bde819e..8eb2734 100644 --- a/src/qt/forms/pryptopage.ui +++ b/src/qt/forms/pryptopage.ui @@ -18,8 +18,8 @@ 10 10 - 501 - 281 + 381 + 191 @@ -28,72 +28,68 @@ QFrame::Sunken - - - - 10 - 10 - 461 - 21 - - - - Enter your Prypto Code and Security Code to redeem your Prypto card. - - - Qt::AutoText - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter - - - true - - - - - - 10 - 40 - 361 - 112 - - - - - - - Prypto Code - - - - - - - Security Code - - - - - - - - - - Qt::ImhDigitsOnly - - - - - - - Redeem - - - - - + + + + + + 0 + 80 + + + + Enter your Prypto Code and Security Code to redeem your Prypto card. + + + Qt::AutoText + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter + + + true + + + + + + + + + Prypto Code + + + + + + + + + + Security Code + + + + + + + Qt::ImhDigitsOnly + + + + + + + Redeem + + + + + + + frame + formLayoutWidget diff --git a/src/qt/forms/rpcconsole.ui b/src/qt/forms/rpcconsole.ui index 07aa5ee..cb89722 100644 --- a/src/qt/forms/rpcconsole.ui +++ b/src/qt/forms/rpcconsole.ui @@ -7,7 +7,7 @@ 0 0 740 - 450 + 468 @@ -17,7 +17,7 @@ - 0 + 1 diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 29fb552..812d30b 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -13,7 +13,7 @@ Send Coins - + 8 @@ -79,13 +79,12 @@ - 10 75 true - color: rgb(166, 27, 31); + color:rgb(166,27,31);font-weight:bold; Coin Control Features @@ -131,7 +130,7 @@ - color: rgb(166, 27, 31); + color:rgb(166,27,31);font-weight:bold; Insufficient funds! @@ -625,62 +624,6 @@ - - - - true - - - - - 0 - 0 - 826 - 138 - - - - background-color: rgb(255, 255, 255); - - - - 0 - - - 0 - - - 0 - - - 0 - - - - - - 6 - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - @@ -783,6 +726,9 @@ Confirm the send action + + false + background-color: rgb(170, 28, 33); color: rgb(255, 255, 255); @@ -805,6 +751,62 @@ background-color: rgb(170, 28, 33); + + + + true + + + + + 0 + 0 + 826 + 143 + + + + background-color: rgb(255, 255, 255); + + + + 0 + + + 0 + + + 0 + + + 0 + + + + + + 6 + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + diff --git a/src/qt/forms/sendcoinsentry.ui b/src/qt/forms/sendcoinsentry.ui index a335f9c..d1bde90 100644 --- a/src/qt/forms/sendcoinsentry.ui +++ b/src/qt/forms/sendcoinsentry.ui @@ -92,7 +92,7 @@ - + Remove this recipient @@ -109,10 +109,16 @@ 20 + + true + + + true + - + Choose address from address book @@ -132,10 +138,16 @@ Alt+A + + true + + + true + - + Paste address from clipboard @@ -155,6 +167,12 @@ Alt+P + + true + + + true + @@ -162,17 +180,17 @@ + + QValidatedLineEdit + QLineEdit +
qvalidatedlineedit.h
+ BitcoinAmountField QSpinBox
bitcoinamountfield.h
1 - - QValidatedLineEdit - QLineEdit -
qvalidatedlineedit.h
- diff --git a/src/qt/qtquick_controls/qml/QmlGUIMenuToolbarWindow.qml b/src/qt/qtquick_controls/qml/QmlGUIMenuToolbarWindow.qml index 7d0491b..7c52952 100644 --- a/src/qt/qtquick_controls/qml/QmlGUIMenuToolbarWindow.qml +++ b/src/qt/qtquick_controls/qml/QmlGUIMenuToolbarWindow.qml @@ -3,8 +3,8 @@ import QtQuick 2.0 Rectangle { id: id_toolbarRoot - width: parent.width - height: parent.height + width: parent ? parent.width : 0 + height: parent ? parent.height : 0 color: GUI20Skin.colorWindowBackground QmlGUIMenuToolbarControl { diff --git a/src/qt/res/icons/configure.png b/src/qt/res/icons/configure.png index 9aad829..621bb6f 100644 Binary files a/src/qt/res/icons/configure.png and b/src/qt/res/icons/configure.png differ diff --git a/src/qt/res/icons/connect1_16.png b/src/qt/res/icons/connect1_16.png index f488cac..c9cf060 100644 Binary files a/src/qt/res/icons/connect1_16.png and b/src/qt/res/icons/connect1_16.png differ diff --git a/src/qt/res/icons/connect2_16.png b/src/qt/res/icons/connect2_16.png index 0b03fa3..17f3fe7 100644 Binary files a/src/qt/res/icons/connect2_16.png and b/src/qt/res/icons/connect2_16.png differ diff --git a/src/qt/res/icons/connect3_16.png b/src/qt/res/icons/connect3_16.png index c182ca6..81e8886 100644 Binary files a/src/qt/res/icons/connect3_16.png and b/src/qt/res/icons/connect3_16.png differ diff --git a/src/qt/res/icons/debugwindow.png b/src/qt/res/icons/debugwindow.png index a55f208..4fa7473 100644 Binary files a/src/qt/res/icons/debugwindow.png and b/src/qt/res/icons/debugwindow.png differ diff --git a/src/qt/res/icons/edit.png b/src/qt/res/icons/edit.png index 101be87..9f87f4b 100644 Binary files a/src/qt/res/icons/edit.png and b/src/qt/res/icons/edit.png differ diff --git a/src/qt/res/icons/export-red.png b/src/qt/res/icons/export-red.png new file mode 100644 index 0000000..9abcd83 Binary files /dev/null and b/src/qt/res/icons/export-red.png differ diff --git a/src/qt/res/icons/filesave.png b/src/qt/res/icons/filesave.png index 335d189..86eface 100644 Binary files a/src/qt/res/icons/filesave.png and b/src/qt/res/icons/filesave.png differ diff --git a/src/qt/res/icons/history.png b/src/qt/res/icons/history.png index a6f705a..fefe865 100644 Binary files a/src/qt/res/icons/history.png and b/src/qt/res/icons/history.png differ diff --git a/src/qt/res/icons/key.png b/src/qt/res/icons/key.png index 507f3bd..d8d6f0d 100644 Binary files a/src/qt/res/icons/key.png and b/src/qt/res/icons/key.png differ diff --git a/src/qt/res/icons/lock_closed.png b/src/qt/res/icons/lock_closed.png index f9968ed..cc1c140 100644 Binary files a/src/qt/res/icons/lock_closed.png and b/src/qt/res/icons/lock_closed.png differ diff --git a/src/qt/res/icons/lock_open.png b/src/qt/res/icons/lock_open.png index b77f3aa..7feabb8 100644 Binary files a/src/qt/res/icons/lock_open.png and b/src/qt/res/icons/lock_open.png differ diff --git a/src/qt/res/icons/mining.png b/src/qt/res/icons/mining.png index cbb5d83..14f71d9 100644 Binary files a/src/qt/res/icons/mining.png and b/src/qt/res/icons/mining.png differ diff --git a/src/qt/res/icons/mining_active.png b/src/qt/res/icons/mining_active.png index 174dabf..c5df6a1 100644 Binary files a/src/qt/res/icons/mining_active.png and b/src/qt/res/icons/mining_active.png differ diff --git a/src/qt/res/icons/mining_inactive.png b/src/qt/res/icons/mining_inactive.png index a4f8b84..0a53dfd 100644 Binary files a/src/qt/res/icons/mining_inactive.png and b/src/qt/res/icons/mining_inactive.png differ diff --git a/src/qt/res/icons/notsynced.png b/src/qt/res/icons/notsynced.png index ab8b041..c374f84 100644 Binary files a/src/qt/res/icons/notsynced.png and b/src/qt/res/icons/notsynced.png differ diff --git a/src/qt/res/icons/quit.png b/src/qt/res/icons/quit.png index 15f7dc3..062788a 100644 Binary files a/src/qt/res/icons/quit.png and b/src/qt/res/icons/quit.png differ diff --git a/src/qt/res/icons/receive.png b/src/qt/res/icons/receive.png index c9046ab..b921b28 100644 Binary files a/src/qt/res/icons/receive.png and b/src/qt/res/icons/receive.png differ diff --git a/src/qt/res/icons/send.png b/src/qt/res/icons/send.png index cd7b4dc..3a08d11 100644 Binary files a/src/qt/res/icons/send.png and b/src/qt/res/icons/send.png differ diff --git a/src/qt/res/icons/synced.png b/src/qt/res/icons/synced.png index a5bfb76..402c621 100644 Binary files a/src/qt/res/icons/synced.png and b/src/qt/res/icons/synced.png differ diff --git a/src/qt/res/icons/transaction0.png b/src/qt/res/icons/transaction0.png index d2bd5a5..63f9ac0 100644 Binary files a/src/qt/res/icons/transaction0.png and b/src/qt/res/icons/transaction0.png differ