diff --git a/casinocoin-qt.pro b/casinocoin-qt.pro index 3725cea..727161d 100644 --- a/casinocoin-qt.pro +++ b/casinocoin-qt.pro @@ -177,208 +177,212 @@ QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wformat -Wform # Input DEPENDPATH += src src/json src/qt HEADERS += src/qt/bitcoingui.h \ - src/qt/transactiontablemodel.h \ - src/qt/addresstablemodel.h \ - src/qt/optionsdialog.h \ - src/qt/sendcoinsdialog.h \ - src/qt/coincontroldialog.h \ - src/qt/coincontroltreewidget.h \ - src/qt/addressbookpage.h \ - src/qt/signverifymessagedialog.h \ - src/qt/aboutdialog.h \ - src/qt/editaddressdialog.h \ - src/qt/bitcoinaddressvalidator.h \ - src/alert.h \ - src/addrman.h \ - src/base58.h \ - src/bignum.h \ - src/checkpoints.h \ - src/coincontrol.h \ - src/compat.h \ - src/sync.h \ - src/util.h \ - src/hash.h \ - src/uint256.h \ - src/serialize.h \ - src/main.h \ - src/net.h \ - src/key.h \ - src/db.h \ - src/walletdb.h \ - src/script.h \ - src/init.h \ - src/bloom.h \ - src/mruset.h \ - src/checkqueue.h \ - src/json/json_spirit_writer_template.h \ - src/json/json_spirit_writer.h \ - src/json/json_spirit_value.h \ - src/json/json_spirit_utils.h \ - src/json/json_spirit_stream_reader.h \ - src/json/json_spirit_reader_template.h \ - src/json/json_spirit_reader.h \ - src/json/json_spirit_error_position.h \ - src/json/json_spirit.h \ - src/qt/clientmodel.h \ - src/qt/guiutil.h \ - src/qt/transactionrecord.h \ - src/qt/guiconstants.h \ - src/qt/optionsmodel.h \ - src/qt/monitoreddatamapper.h \ - src/qt/transactiondesc.h \ - src/qt/transactiondescdialog.h \ - src/qt/bitcoinamountfield.h \ - src/wallet.h \ - src/keystore.h \ - src/qt/transactionfilterproxy.h \ - src/qt/transactionview.h \ - src/qt/walletmodel.h \ - src/qt/walletview.h \ - src/qt/walletstack.h \ - src/qt/walletframe.h \ - src/bitcoinrpc.h \ - src/qt/overviewpage.h \ - src/qt/csvmodelwriter.h \ - src/crypter.h \ - src/qt/sendcoinsentry.h \ - src/qt/qvalidatedlineedit.h \ - src/qt/bitcoinunits.h \ - src/qt/qvaluecombobox.h \ - src/qt/askpassphrasedialog.h \ - src/protocol.h \ - src/qt/notificator.h \ - src/qt/paymentserver.h \ - src/allocators.h \ - src/ui_interface.h \ - src/qt/rpcconsole.h \ - src/scrypt.h \ - src/version.h \ - src/netbase.h \ - src/clientversion.h \ - src/txdb.h \ - src/leveldb.h \ - src/threadsafety.h \ - src/limitedmap.h \ - src/qt/macnotificationhandler.h \ - src/qt/splashscreen.h \ - src/qt/CSCPublicAPI/casinocoinwebapi.h \ - src/qt/CSCPublicAPI/casinocoinwebapiparser.h \ - src/qt/CSCPublicAPI/jsonactivepromotionsparser.h \ - src/qt/CSCPublicAPI/jsonsingleactivepromotion.h \ - src/qt/qtquick_controls/cpp/guibannercontrol.h \ - src/qt/qtquick_controls/cpp/guibannerlistview.h \ - src/qt/qtquick_controls/cpp/guibannerwidget.h \ - src/qt/qtquick_controls/cpp/listiteminterface.h \ - src/qt/qtquick_controls/cpp/qmlbannerlistitem.h \ - src/qt/qtquick_controls/cpp/qmlbannerlistmodel.h \ - src/qt/qtquick_controls/cpp/qmlimageprovider.h \ - src/qt/qtquick_controls/cpp/qmllistitem.h \ - src/qt/qtquick_controls/cpp/qmllistmodel.h \ - src/qt/qtquick_controls/cpp/qmlmenutoolbarmodel.h \ - src/qt/qtquick_controls/cpp/qmlmenutoolbaritem.h \ - src/qt/qtquick_controls/cpp/guimenutoolbarwidget.h \ - src/qt/qtquick_controls/cpp/guimenutoolbarlistview.h \ - src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.h \ - src/qt/gui20_skin.h \ - src/qt/cscfusionstyle.h \ - src/qt/pryptopage.h \ - src/qt/currencies.h \ - src/qt/CSCPublicAPI/jsoncoininfoparser.h \ - src/qt/infopage.h + src/qt/transactiontablemodel.h \ + src/qt/addresstablemodel.h \ + src/qt/optionsdialog.h \ + src/qt/sendcoinsdialog.h \ + src/qt/coincontroldialog.h \ + src/qt/coincontroltreewidget.h \ + src/qt/addressbookpage.h \ + src/qt/signverifymessagedialog.h \ + src/qt/aboutdialog.h \ + src/qt/editaddressdialog.h \ + src/qt/bitcoinaddressvalidator.h \ + src/alert.h \ + src/addrman.h \ + src/base58.h \ + src/bignum.h \ + src/checkpoints.h \ + src/coincontrol.h \ + src/compat.h \ + src/sync.h \ + src/util.h \ + src/hash.h \ + src/uint256.h \ + src/serialize.h \ + src/main.h \ + src/net.h \ + src/key.h \ + src/db.h \ + src/walletdb.h \ + src/script.h \ + src/init.h \ + src/bloom.h \ + src/mruset.h \ + src/checkqueue.h \ + src/json/json_spirit_writer_template.h \ + src/json/json_spirit_writer.h \ + src/json/json_spirit_value.h \ + src/json/json_spirit_utils.h \ + src/json/json_spirit_stream_reader.h \ + src/json/json_spirit_reader_template.h \ + src/json/json_spirit_reader.h \ + src/json/json_spirit_error_position.h \ + src/json/json_spirit.h \ + src/qt/clientmodel.h \ + src/qt/guiutil.h \ + src/qt/transactionrecord.h \ + src/qt/guiconstants.h \ + src/qt/optionsmodel.h \ + src/qt/monitoreddatamapper.h \ + src/qt/transactiondesc.h \ + src/qt/transactiondescdialog.h \ + src/qt/bitcoinamountfield.h \ + src/wallet.h \ + src/keystore.h \ + src/qt/transactionfilterproxy.h \ + src/qt/transactionview.h \ + src/qt/walletmodel.h \ + src/qt/walletview.h \ + src/qt/walletstack.h \ + src/qt/walletframe.h \ + src/bitcoinrpc.h \ + src/qt/overviewpage.h \ + src/qt/csvmodelwriter.h \ + src/crypter.h \ + src/qt/sendcoinsentry.h \ + src/qt/qvalidatedlineedit.h \ + src/qt/bitcoinunits.h \ + src/qt/qvaluecombobox.h \ + src/qt/askpassphrasedialog.h \ + src/protocol.h \ + src/qt/notificator.h \ + src/qt/paymentserver.h \ + src/allocators.h \ + src/ui_interface.h \ + src/qt/rpcconsole.h \ + src/scrypt.h \ + src/version.h \ + src/netbase.h \ + src/clientversion.h \ + src/txdb.h \ + src/leveldb.h \ + src/threadsafety.h \ + src/limitedmap.h \ + src/qt/macnotificationhandler.h \ + src/qt/splashscreen.h \ + src/qt/CSCPublicAPI/casinocoinwebapi.h \ + src/qt/CSCPublicAPI/casinocoinwebapiparser.h \ + src/qt/CSCPublicAPI/jsonactivepromotionsparser.h \ + src/qt/CSCPublicAPI/jsonactiveexchangesparser.h \ + src/qt/CSCPublicAPI/jsonsingleactivepromotion.h \ + src/qt/CSCPublicAPI/jsonsingleactiveexchange.h \ + src/qt/qtquick_controls/cpp/guibannercontrol.h \ + src/qt/qtquick_controls/cpp/guibannerlistview.h \ + src/qt/qtquick_controls/cpp/guibannerwidget.h \ + src/qt/qtquick_controls/cpp/listiteminterface.h \ + src/qt/qtquick_controls/cpp/qmlbannerlistitem.h \ + src/qt/qtquick_controls/cpp/qmlbannerlistmodel.h \ + src/qt/qtquick_controls/cpp/qmlimageprovider.h \ + src/qt/qtquick_controls/cpp/qmllistitem.h \ + src/qt/qtquick_controls/cpp/qmllistmodel.h \ + src/qt/qtquick_controls/cpp/qmlmenutoolbarmodel.h \ + src/qt/qtquick_controls/cpp/qmlmenutoolbaritem.h \ + src/qt/qtquick_controls/cpp/guimenutoolbarwidget.h \ + src/qt/qtquick_controls/cpp/guimenutoolbarlistview.h \ + src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.h \ + src/qt/gui20_skin.h \ + src/qt/cscfusionstyle.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 \ - src/qt/transactiontablemodel.cpp \ - src/qt/addresstablemodel.cpp \ - src/qt/optionsdialog.cpp \ - src/qt/sendcoinsdialog.cpp \ - src/qt/coincontroldialog.cpp \ - src/qt/coincontroltreewidget.cpp \ - src/qt/addressbookpage.cpp \ - src/qt/signverifymessagedialog.cpp \ - src/qt/aboutdialog.cpp \ - src/qt/editaddressdialog.cpp \ - src/qt/bitcoinaddressvalidator.cpp \ - src/alert.cpp \ - src/version.cpp \ - src/sync.cpp \ - src/util.cpp \ - src/hash.cpp \ - src/netbase.cpp \ - src/key.cpp \ - src/script.cpp \ - src/main.cpp \ - src/init.cpp \ - src/net.cpp \ - src/bloom.cpp \ - src/checkpoints.cpp \ - src/addrman.cpp \ - src/db.cpp \ - src/walletdb.cpp \ - src/qt/clientmodel.cpp \ - src/qt/guiutil.cpp \ - src/qt/transactionrecord.cpp \ - src/qt/optionsmodel.cpp \ - src/qt/monitoreddatamapper.cpp \ - src/qt/transactiondesc.cpp \ - src/qt/transactiondescdialog.cpp \ - src/qt/bitcoinstrings.cpp \ - src/qt/bitcoinamountfield.cpp \ - src/wallet.cpp \ - src/keystore.cpp \ - src/qt/transactionfilterproxy.cpp \ - src/qt/transactionview.cpp \ - src/qt/walletmodel.cpp \ - src/qt/walletview.cpp \ - src/qt/walletstack.cpp \ - src/qt/walletframe.cpp \ - src/bitcoinrpc.cpp \ - src/rpcdump.cpp \ - src/rpcnet.cpp \ - src/rpcmining.cpp \ - src/rpcwallet.cpp \ - src/rpcblockchain.cpp \ - src/rpcrawtransaction.cpp \ - src/qt/overviewpage.cpp \ - src/qt/csvmodelwriter.cpp \ - src/crypter.cpp \ - src/qt/sendcoinsentry.cpp \ - src/qt/qvalidatedlineedit.cpp \ - src/qt/bitcoinunits.cpp \ - src/qt/qvaluecombobox.cpp \ - src/qt/askpassphrasedialog.cpp \ - src/protocol.cpp \ - src/qt/notificator.cpp \ - src/qt/paymentserver.cpp \ - src/qt/rpcconsole.cpp \ - src/scrypt.cpp \ - src/noui.cpp \ - src/leveldb.cpp \ - src/txdb.cpp \ - src/qt/splashscreen.cpp \ - src/qt/CSCPublicAPI/casinocoinwebapi.cpp \ - src/qt/CSCPublicAPI/casinocoinwebapiparser.cpp \ - src/qt/CSCPublicAPI/jsonactivepromotionsparser.cpp \ - src/qt/CSCPublicAPI/jsonsingleactivepromotion.cpp \ - src/qt/qtquick_controls/cpp/guibannercontrol.cpp \ - src/qt/qtquick_controls/cpp/guibannerlistview.cpp \ - src/qt/qtquick_controls/cpp/guibannerwidget.cpp \ - src/qt/qtquick_controls/cpp/qmlbannerlistitem.cpp \ - src/qt/qtquick_controls/cpp/qmlbannerlistmodel.cpp \ - src/qt/qtquick_controls/cpp/qmlimageprovider.cpp \ - src/qt/qtquick_controls/cpp/qmllistitem.cpp \ - src/qt/qtquick_controls/cpp/qmllistmodel.cpp \ - src/qt/qtquick_controls/cpp/qmlmenutoolbarmodel.cpp \ - src/qt/qtquick_controls/cpp/qmlmenutoolbaritem.cpp \ - src/qt/qtquick_controls/cpp/guimenutoolbarwidget.cpp \ - src/qt/qtquick_controls/cpp/guimenutoolbarlistview.cpp \ - src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.cpp \ - src/qt/gui20_skin.cpp \ - src/qt/cscfusionstyle.cpp \ - src/qt/pryptopage.cpp \ - src/qt/currencies.cpp \ - src/qt/CSCPublicAPI/jsoncoininfoparser.cpp \ - src/qt/infopage.cpp + src/qt/bitcoingui.cpp \ + src/qt/transactiontablemodel.cpp \ + src/qt/addresstablemodel.cpp \ + src/qt/optionsdialog.cpp \ + src/qt/sendcoinsdialog.cpp \ + src/qt/coincontroldialog.cpp \ + src/qt/coincontroltreewidget.cpp \ + src/qt/addressbookpage.cpp \ + src/qt/signverifymessagedialog.cpp \ + src/qt/aboutdialog.cpp \ + src/qt/editaddressdialog.cpp \ + src/qt/bitcoinaddressvalidator.cpp \ + src/alert.cpp \ + src/version.cpp \ + src/sync.cpp \ + src/util.cpp \ + src/hash.cpp \ + src/netbase.cpp \ + src/key.cpp \ + src/script.cpp \ + src/main.cpp \ + src/init.cpp \ + src/net.cpp \ + src/bloom.cpp \ + src/checkpoints.cpp \ + src/addrman.cpp \ + src/db.cpp \ + src/walletdb.cpp \ + src/qt/clientmodel.cpp \ + src/qt/guiutil.cpp \ + src/qt/transactionrecord.cpp \ + src/qt/optionsmodel.cpp \ + src/qt/monitoreddatamapper.cpp \ + src/qt/transactiondesc.cpp \ + src/qt/transactiondescdialog.cpp \ + src/qt/bitcoinstrings.cpp \ + src/qt/bitcoinamountfield.cpp \ + src/wallet.cpp \ + src/keystore.cpp \ + src/qt/transactionfilterproxy.cpp \ + src/qt/transactionview.cpp \ + src/qt/walletmodel.cpp \ + src/qt/walletview.cpp \ + src/qt/walletstack.cpp \ + src/qt/walletframe.cpp \ + src/bitcoinrpc.cpp \ + src/rpcdump.cpp \ + src/rpcnet.cpp \ + src/rpcmining.cpp \ + src/rpcwallet.cpp \ + src/rpcblockchain.cpp \ + src/rpcrawtransaction.cpp \ + src/qt/overviewpage.cpp \ + src/qt/csvmodelwriter.cpp \ + src/crypter.cpp \ + src/qt/sendcoinsentry.cpp \ + src/qt/qvalidatedlineedit.cpp \ + src/qt/bitcoinunits.cpp \ + src/qt/qvaluecombobox.cpp \ + src/qt/askpassphrasedialog.cpp \ + src/protocol.cpp \ + src/qt/notificator.cpp \ + src/qt/paymentserver.cpp \ + src/qt/rpcconsole.cpp \ + src/scrypt.cpp \ + src/noui.cpp \ + src/leveldb.cpp \ + src/txdb.cpp \ + src/qt/splashscreen.cpp \ + src/qt/CSCPublicAPI/casinocoinwebapi.cpp \ + src/qt/CSCPublicAPI/casinocoinwebapiparser.cpp \ + src/qt/CSCPublicAPI/jsonactivepromotionsparser.cpp \ + src/qt/CSCPublicAPI/jsonactiveexchangesparser.cpp \ + src/qt/CSCPublicAPI/jsonsingleactivepromotion.cpp \ + src/qt/CSCPublicAPI/jsonsingleactiveexchange.cpp \ + src/qt/qtquick_controls/cpp/guibannercontrol.cpp \ + src/qt/qtquick_controls/cpp/guibannerlistview.cpp \ + src/qt/qtquick_controls/cpp/guibannerwidget.cpp \ + src/qt/qtquick_controls/cpp/qmlbannerlistitem.cpp \ + src/qt/qtquick_controls/cpp/qmlbannerlistmodel.cpp \ + src/qt/qtquick_controls/cpp/qmlimageprovider.cpp \ + src/qt/qtquick_controls/cpp/qmllistitem.cpp \ + src/qt/qtquick_controls/cpp/qmllistmodel.cpp \ + src/qt/qtquick_controls/cpp/qmlmenutoolbarmodel.cpp \ + src/qt/qtquick_controls/cpp/qmlmenutoolbaritem.cpp \ + src/qt/qtquick_controls/cpp/guimenutoolbarwidget.cpp \ + src/qt/qtquick_controls/cpp/guimenutoolbarlistview.cpp \ + src/qt/qtquick_controls/cpp/guimenutoolbarcontrol.cpp \ + src/qt/gui20_skin.cpp \ + src/qt/cscfusionstyle.cpp \ + src/qt/pryptopage.cpp \ + src/qt/currencies.cpp \ + src/qt/CSCPublicAPI/jsoncoininfoparser.cpp \ + src/qt/infopage.cpp RESOURCES += src/qt/bitcoin.qrc diff --git a/src/qt/bitcoin.qrc b/src/qt/bitcoin.qrc index 65a9830..bdf8c76 100644 --- a/src/qt/bitcoin.qrc +++ b/src/qt/bitcoin.qrc @@ -60,10 +60,10 @@ res/icons/GUI20_mainToolBar_contacts_hover.png res/icons/prypto.png res/icons/checkbox_tick.png - res/icons/adverts_arrow_bottom_hover.png - res/icons/adverts_arrow_bottom.png - res/icons/adverts_arrow_top.png - res/icons/adverts_arrow_top_hover.png + res/icons/adverts_arrow_bottom_hover.png + res/icons/adverts_arrow_bottom.png + res/icons/adverts_arrow_top.png + res/icons/adverts_arrow_top_hover.png res/icons/radiobutton_tick.png diff --git a/src/qt/bitcoinamountfield.cpp b/src/qt/bitcoinamountfield.cpp index b12e296..3bae928 100644 --- a/src/qt/bitcoinamountfield.cpp +++ b/src/qt/bitcoinamountfield.cpp @@ -13,19 +13,22 @@ BitcoinAmountField::BitcoinAmountField(QWidget *parent): QWidget(parent), amount(0), currentUnit(-1) { - amount = new QDoubleSpinBox(this); - amount->setLocale(QLocale::c()); + + unit = new QValueComboBox(this); + unit->setModel(new BitcoinUnits(this)); + unit->setSizePolicy( QSizePolicy::Preferred, QSizePolicy::Fixed ); + + amount = new QDoubleSpinBox(this); + amount->setLocale(QLocale::c()); amount->setDecimals(8); + amount->setSizePolicy( QSizePolicy::Expanding, QSizePolicy::Fixed ); amount->installEventFilter(this); - amount->setMaximumWidth(170); amount->setSingleStep(0.001); QHBoxLayout *layout = new QHBoxLayout(this); layout->addWidget(amount); - unit = new QValueComboBox(this); - unit->setModel(new BitcoinUnits(this)); layout->addWidget(unit); - layout->addStretch(1); +// layout->addStretch(1); layout->setContentsMargins(0,0,0,0); setLayout(layout); diff --git a/src/qt/cscfusionstyle.cpp b/src/qt/cscfusionstyle.cpp index ebceaa4..cc9836f 100644 --- a/src/qt/cscfusionstyle.cpp +++ b/src/qt/cscfusionstyle.cpp @@ -92,25 +92,16 @@ int CSCFusionStyle::pixelMetric(PixelMetric metric, switch (metric) { case PM_DefaultFrameWidth: - { - return 8; - } case PM_ComboBoxFrameWidth: + case PM_SpinBoxFrameWidth: + case PM_CheckBoxLabelSpacing: + case PM_HeaderMargin: { return 8; } case PM_IndicatorHeight: - { - return 18; - } case PM_IndicatorWidth: - { - return 18; - } case PM_ExclusiveIndicatorWidth: - { - return 18; - } case PM_ExclusiveIndicatorHeight: { return 18; @@ -144,10 +135,6 @@ int CSCFusionStyle::styleHint(StyleHint hint, const QStyleOption *option, { return int(true); } - case SH_ScrollView_FrameOnlyAroundContents: - { - return int(true); - } default: { return QProxyStyle::styleHint(hint, option, widget, returnData); @@ -183,46 +170,46 @@ void CSCFusionStyle::drawPrimitive(PrimitiveElement element, painter->restore(); break; } - case PE_IndicatorArrowDown: - case PE_IndicatorArrowUp: - case PE_IndicatorArrowLeft: - case PE_IndicatorArrowRight: - { - int x, y, width, height; - option->rect.getRect(&x, &y, &width, &height); - painter->save(); - painter->setRenderHint(QPainter::Antialiasing, true); - QImage imgArrow; - QString strPath = ":/icons/advertsArrow"; - if ( element == PE_IndicatorArrowDown ) - { - strPath.append( "Down" ); - } - else if ( element == PE_IndicatorArrowLeft ) - { - strPath.append( "Left" ); - } - else if ( element == PE_IndicatorArrowUp ) - { - strPath.append( "Top" ); - } - else if ( element == PE_IndicatorArrowRight ) - { - strPath.append( "Right" ); - } +// case PE_IndicatorArrowDown: +// case PE_IndicatorArrowUp: +// case PE_IndicatorArrowLeft: +// case PE_IndicatorArrowRight: +// { +// int x, y, width, height; +// option->rect.getRect(&x, &y, &width, &height); +// painter->save(); +// painter->setRenderHint(QPainter::Antialiasing, true); +// QImage imgArrow; +// QString strPath = ":/icons/advertsArrow"; +// if ( element == PE_IndicatorArrowDown || PE_IndicatorSpinDown || PE_IndicatorSpinMinus ) +// { +// strPath.append( "Down" ); +// } +// else if ( element == PE_IndicatorArrowLeft ) +// { +// strPath.append( "Left" ); +// } +// else if ( element == PE_IndicatorArrowUp || PE_IndicatorSpinUp || PE_IndicatorSpinPlus ) +// { +// strPath.append( "Up" ); +// } +// else if ( element == PE_IndicatorArrowRight ) +// { +// strPath.append( "Right" ); +// } - if ( option->state & QStyle::State_MouseOver ) - { - strPath.append( "Hover" ); - } - qDebug() << "gonna draw: " << strPath; - imgArrow.load( strPath ); - int iTopLeftX = x + ( ( ( width - imgArrow.width() ) / 2 ) ); - int iTopLeftY = y + ( ( ( height - imgArrow.height() ) / 2 ) ); - painter->drawImage( QPoint( iTopLeftX, iTopLeftY), imgArrow ); - painter->restore(); - break; - } +// if ( option->state & QStyle::State_MouseOver ) +// { +// strPath.append( "Hover" ); +// } +// qDebug() << "gonna draw: " << strPath; +// imgArrow.load( strPath ); +// int iTopLeftX = x + ( ( ( width - imgArrow.width() ) / 2 ) ); +// int iTopLeftY = y + ( ( ( height - imgArrow.height() ) / 2 ) ); +// painter->drawImage( QPoint( iTopLeftX, iTopLeftY), imgArrow ); +// painter->restore(); +// break; +// } case PE_FrameGroupBox: case PE_FrameWindow: case PE_Frame: @@ -288,7 +275,6 @@ void CSCFusionStyle::drawPrimitive(PrimitiveElement element, painter->restore(); break; } - case PE_PanelButtonTool: case PE_PanelButtonCommand: { GUI20Skin& skin = GUI20Skin::Instance(); @@ -304,7 +290,6 @@ void CSCFusionStyle::drawPrimitive(PrimitiveElement element, int radius = 5; QPainterPath roundRect = roundRectPath( QRect( x + 1, y + 1, width - 1, height - 1 ), radius ); - QBrush brush; if (option->state & (State_Sunken | State_On)) diff --git a/src/qt/forms/addressbookpage.ui b/src/qt/forms/addressbookpage.ui index d298937..90fd42e 100644 --- a/src/qt/forms/addressbookpage.ui +++ b/src/qt/forms/addressbookpage.ui @@ -123,7 +123,7 @@ color: rgb(255, 255, 255); pressed { -background-color: rgb(170, 28, 33); +background-color: rgb(166, 27, 31); } diff --git a/src/qt/forms/infopage.ui b/src/qt/forms/infopage.ui index 636d747..167ef20 100644 --- a/src/qt/forms/infopage.ui +++ b/src/qt/forms/infopage.ui @@ -29,15 +29,15 @@ 15 - - + + QFrame::StyledPanel QFrame::Sunken - + 20 @@ -57,11 +57,465 @@ color: rgb(166, 27, 31); - Casinos + Exchanges + + + + false + + + QFrame::StyledPanel + + + QFrame::Sunken + + + + + + QFormLayout::AllNonFixedFieldsGrow + + + 15 + + + 10 + + + 10 + + + 10 + + + 10 + + + 10 + + + + + + + + Current number of blocks + + + true + + + + + + + + 75 + true + + + + + + + - + + + true + + + + + + + + + + Last block time + + + true + + + + + + + + 75 + true + + + + + + + - + + + true + + + + + + + + + + Coin Supply + + + true + + + + + + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 0 + 0 + 0 + + + + + + + 0 + 0 + 0 + + + + + + + 255 + 255 + 255 + + + + + + + 255 + 255 + 255 + + + + + + + + + 75 + true + + + + + + + - + + + true + + + + + + + + + + Number of connections + + + true + + + + + + + + 75 + true + + + + + + + - + + + true + + + + + + + + + + Difficulty + + + true + + + + + + + + 75 + true + + + + + + + - + + + true + + + + + + + + + + Network Hashrate + + + true + + + + + + + + 75 + true + + + + + + + - + + + true + + + + + + + + + + Transactions + + + true + + + + + + + + 75 + true + + + + + + + - + + + true + + + + + + + + + + MS Shell Dlg 2 + 10 + 75 + true + + + + color: rgb(166, 27, 31); + + + Information + + + + + + @@ -95,15 +549,15 @@ - - + + QFrame::StyledPanel QFrame::Sunken - + 20 @@ -123,7 +577,7 @@ color: rgb(166, 27, 31); - Exchanges + Casinos diff --git a/src/qt/forms/optionsdialog.ui b/src/qt/forms/optionsdialog.ui index cce8ecd..aea0bda 100644 --- a/src/qt/forms/optionsdialog.ui +++ b/src/qt/forms/optionsdialog.ui @@ -60,24 +60,14 @@ Qt::PlainText + + transactionFee + - - - - Qt::Horizontal - - - - 40 - 20 - - - - @@ -179,7 +169,7 @@ - + @@ -189,6 +179,9 @@ Qt::PlainText + + proxyIp + @@ -199,6 +192,9 @@ Qt::PlainText + + proxyPort + @@ -209,6 +205,9 @@ Qt::PlainText + + socksVersion + @@ -248,7 +247,7 @@ - 55 + 140 16777215 @@ -342,6 +341,9 @@ Qt::PlainText + + lang + @@ -363,6 +365,9 @@ Qt::PlainText + + unit + diff --git a/src/qt/forms/overviewpage.ui b/src/qt/forms/overviewpage.ui index c2cffac..cd9d2d7 100644 --- a/src/qt/forms/overviewpage.ui +++ b/src/qt/forms/overviewpage.ui @@ -6,8 +6,8 @@ 0 0 - 782 - 406 + 805 + 550 @@ -257,9 +257,9 @@ - - - + + + diff --git a/src/qt/forms/sendcoinsdialog.ui b/src/qt/forms/sendcoinsdialog.ui index 3bbedda..bbae4b9 100644 --- a/src/qt/forms/sendcoinsdialog.ui +++ b/src/qt/forms/sendcoinsdialog.ui @@ -753,6 +753,15 @@ background-color: rgb(166, 27, 31); + + + + + QFrame::NoFrame + + + QFrame::Plain + true @@ -761,12 +770,12 @@ background-color: rgb(166, 27, 31); 0 0 - 826 - 143 + 832 + 169 - background-color: rgb(255, 255, 255); + @@ -783,6 +792,12 @@ background-color: rgb(166, 27, 31); + + false + + + + 6 diff --git a/src/qt/forms/signverifymessagedialog.ui b/src/qt/forms/signverifymessagedialog.ui index a72fe15..926eb8c 100644 --- a/src/qt/forms/signverifymessagedialog.ui +++ b/src/qt/forms/signverifymessagedialog.ui @@ -20,7 +20,7 @@ - 0 + 1 diff --git a/src/qt/transactionview.cpp b/src/qt/transactionview.cpp index a43e29c..c1ff468 100644 --- a/src/qt/transactionview.cpp +++ b/src/qt/transactionview.cpp @@ -25,6 +25,7 @@ #include #include #include +#include TransactionView::TransactionView(QWidget *parent) : QWidget(parent), model(0), transactionProxyModel(0), @@ -44,11 +45,7 @@ TransactionView::TransactionView(QWidget *parent) : #endif dateWidget = new QComboBox(this); -#ifdef Q_OS_MAC - dateWidget->setFixedWidth(121); -#else - dateWidget->setFixedWidth(120); -#endif + dateWidget->addItem(tr("All"), All); dateWidget->addItem(tr("Today"), Today); dateWidget->addItem(tr("This week"), ThisWeek); @@ -59,11 +56,6 @@ TransactionView::TransactionView(QWidget *parent) : hlayout->addWidget(dateWidget); typeWidget = new QComboBox(this); -#ifdef Q_OS_MAC - typeWidget->setFixedWidth(121); -#else - typeWidget->setFixedWidth(120); -#endif typeWidget->addItem(tr("All"), TransactionFilterProxy::ALL_TYPES); typeWidget->addItem(tr("Received with"), TransactionFilterProxy::TYPE(TransactionRecord::RecvWithAddress) | @@ -87,11 +79,6 @@ TransactionView::TransactionView(QWidget *parent) : #if QT_VERSION >= 0x040700 /* Do not move this to the XML file, Qt before 4.7 will choke on it */ amountWidget->setPlaceholderText(tr("Min amount")); -#endif -#ifdef Q_OS_MAC - amountWidget->setFixedWidth(97); -#else - amountWidget->setFixedWidth(100); #endif amountWidget->setValidator(new QDoubleValidator(0, 1e20, 8, this)); hlayout->addWidget(amountWidget); @@ -381,9 +368,13 @@ void TransactionView::showDetails() QWidget *TransactionView::createDateRangeWidget() { + QString strCalendarsStyleSheet = "QToolButton {height: 60px; width: 120px;}\ + QAbstractItemView {selection-background-color: #F5E5E5;selection-color: #000000;}\ + QListView {background-color:white;}\ + "; dateRangeWidget = new QFrame(); - dateRangeWidget->setFrameStyle(QFrame::Panel | QFrame::Raised); dateRangeWidget->setContentsMargins(1,1,1,1); + dateRangeWidget->setStyleSheet(""); QHBoxLayout *layout = new QHBoxLayout(dateRangeWidget); layout->setContentsMargins(0,0,0,0); layout->addSpacing(23); @@ -392,7 +383,10 @@ QWidget *TransactionView::createDateRangeWidget() dateFrom = new QDateTimeEdit(this); dateFrom->setDisplayFormat("dd/MM/yy"); dateFrom->setCalendarPopup(true); - dateFrom->setMinimumWidth(100); + + dateFrom->calendarWidget()->setStyleSheet( strCalendarsStyleSheet ); + + dateFrom->setMinimumWidth(100); dateFrom->setDate(QDate::currentDate().addDays(-7)); layout->addWidget(dateFrom); layout->addWidget(new QLabel(tr("to"))); @@ -400,6 +394,9 @@ QWidget *TransactionView::createDateRangeWidget() dateTo = new QDateTimeEdit(this); dateTo->setDisplayFormat("dd/MM/yy"); dateTo->setCalendarPopup(true); + + dateTo->calendarWidget()->setStyleSheet( strCalendarsStyleSheet ); + dateTo->setMinimumWidth(100); dateTo->setDate(QDate::currentDate()); layout->addWidget(dateTo); diff --git a/src/qt/walletview.cpp b/src/qt/walletview.cpp index 4adfb0d..f18327f 100644 --- a/src/qt/walletview.cpp +++ b/src/qt/walletview.cpp @@ -47,6 +47,7 @@ WalletView::WalletView(QWidget *parent, BitcoinGUI *_gui): vbox->addWidget(transactionView); QPushButton *exportButton = new QPushButton(tr("&Export"), this); exportButton->setToolTip(tr("Export the data in the current tab to a file")); + exportButton->setStyleSheet( "background-color: rgb(170, 28, 33);\ncolor: rgb(255, 255, 255);\npressed\n{\nbackground-color: rgb(166, 27, 31);\n}" ); #ifndef Q_OS_MAC // Icons on push buttons are very uncommon on Mac exportButton->setIcon(QIcon(":/icons/export")); #endif