diff --git a/src/qt/forms/infopage.ui b/src/qt/forms/infopage.ui index a15726c..c45bdb8 100644 --- a/src/qt/forms/infopage.ui +++ b/src/qt/forms/infopage.ui @@ -29,17 +29,36 @@ 15 - - + + QFrame::StyledPanel QFrame::Sunken - + + + + + Qt::Vertical + + + QSizePolicy::Expanding + + + + 20 + 10 + + + + + + + - + 10 @@ -51,70 +70,24 @@ color: rgb(166, 27, 31); - News + Exchanges - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Sunken - - - - - - - 10 - 75 - true - - - - color: rgb(166, 27, 31); - - - Casinos - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - + + + 0 + 0 + + + + Qt::LeftToRight + false @@ -126,7 +99,7 @@ - + 10 @@ -138,14 +111,14 @@ color: rgb(166, 27, 31); - Casinos + Information - QFormLayout::AllNonFixedFieldsGrow + QFormLayout::ExpandingFieldsGrow 15 @@ -167,14 +140,22 @@ + + + true + + Current number of blocks + + Qt::AutoText + - true + false @@ -206,7 +187,7 @@ Last block time - true + false @@ -238,7 +219,7 @@ Coin Supply - true + false @@ -442,7 +423,7 @@ Number of connections - true + false @@ -474,7 +455,7 @@ Difficulty - true + false @@ -506,7 +487,7 @@ Network Hashrate - true + false @@ -563,64 +544,6 @@ - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - QFrame::StyledPanel - - - QFrame::Sunken - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - 10 - 75 - true - - - - color: rgb(166, 27, 31); - - - Exchanges - - - diff --git a/src/qt/infopage.cpp b/src/qt/infopage.cpp index 484d12f..ad226e6 100644 --- a/src/qt/infopage.cpp +++ b/src/qt/infopage.cpp @@ -17,8 +17,8 @@ InfoPage::InfoPage(QWidget *parent) : ui(new Ui::InfoPage) { ui->setupUi(this); - ui->casinoInfoBox->setVisible(false); - ui->newsItemsBox->setVisible(false); +// ui->casinoInfoBox->setVisible(false); +// ui->newsItemsBox->setVisible(false); createExchangesWidget(); } diff --git a/src/qt/qtquick_controls/cpp/guibannercontrol.cpp b/src/qt/qtquick_controls/cpp/guibannercontrol.cpp index eaee5dd..59b7d14 100644 --- a/src/qt/qtquick_controls/cpp/guibannercontrol.cpp +++ b/src/qt/qtquick_controls/cpp/guibannercontrol.cpp @@ -35,7 +35,7 @@ void GUIBannerControl::slotPopulateListView( JsonActivePromotionsParser* a_pActi if ( m_pAdvertsView ) { QmlBannerListModel* pAdvertsModel = new QmlBannerListModel( *a_pActivePromotions ); - m_pAdvertsView->SetModel( pAdvertsModel ); + m_pAdvertsView->setModel( pAdvertsModel ); } } diff --git a/src/qt/qtquick_controls/cpp/guibannerlistview.cpp b/src/qt/qtquick_controls/cpp/guibannerlistview.cpp index e8cc33f..149b46f 100644 --- a/src/qt/qtquick_controls/cpp/guibannerlistview.cpp +++ b/src/qt/qtquick_controls/cpp/guibannerlistview.cpp @@ -13,7 +13,7 @@ GUIBannerListView::GUIBannerListView( QQuickItem* a_pParent ) { } -void GUIBannerListView::Clear() +void GUIBannerListView::clear() { if ( m_pModel ) { @@ -21,7 +21,7 @@ void GUIBannerListView::Clear() } } -void GUIBannerListView::OnClicked( int a_iItemIndex ) +void GUIBannerListView::onClicked( int a_iItemIndex ) { if ( m_pModel ) { @@ -39,7 +39,7 @@ GUIBannerListView::~GUIBannerListView() } } -void GUIBannerListView::SetModel( QmlBannerListModel* a_pModel ) +void GUIBannerListView::setModel( QmlBannerListModel* a_pModel ) { if ( m_pModel ) { diff --git a/src/qt/qtquick_controls/cpp/guibannerlistview.h b/src/qt/qtquick_controls/cpp/guibannerlistview.h index 592741e..1b18741 100644 --- a/src/qt/qtquick_controls/cpp/guibannerlistview.h +++ b/src/qt/qtquick_controls/cpp/guibannerlistview.h @@ -16,12 +16,12 @@ public: explicit GUIBannerListView( QQuickItem *a_pParent = 0 ); virtual ~GUIBannerListView(); /** Destructor **/ - void SetModel( QmlBannerListModel* a_pModel ); - QmlBannerListModel* GetModel() const { return m_pModel; } + void setModel( QmlBannerListModel* a_pModel ); + QmlBannerListModel* setModel() const { return m_pModel; } - void Clear(); + void clear(); - Q_INVOKABLE void OnClicked( int a_iItemIndex ); + Q_INVOKABLE void onClicked( int a_iItemIndex ); signals: void signalModelChanged(); diff --git a/src/qt/qtquick_controls/cpp/guiexchangescontrol.cpp b/src/qt/qtquick_controls/cpp/guiexchangescontrol.cpp index a4d9c86..5d9e59a 100644 --- a/src/qt/qtquick_controls/cpp/guiexchangescontrol.cpp +++ b/src/qt/qtquick_controls/cpp/guiexchangescontrol.cpp @@ -18,7 +18,7 @@ GUIExchangesControl::~GUIExchangesControl() } } -void GUIExchangesControl::InitializeExchangesView( GUIExchangesListView* a_pView ) +void GUIExchangesControl::initializeExchangesView( GUIExchangesListView* a_pView ) { if ( a_pView ) { @@ -35,7 +35,7 @@ void GUIExchangesControl::slotPopulateListView( JsonActiveExchangesParser* a_pAc if ( m_pExchangesView ) { QmlExchangesListModel* pExchangesModel = new QmlExchangesListModel( *a_pActiveExchanges ); - m_pExchangesView->SetModel( pExchangesModel ); + m_pExchangesView->setModel( pExchangesModel ); } } diff --git a/src/qt/qtquick_controls/cpp/guiexchangescontrol.h b/src/qt/qtquick_controls/cpp/guiexchangescontrol.h index 400cc0e..ed19ee5 100644 --- a/src/qt/qtquick_controls/cpp/guiexchangescontrol.h +++ b/src/qt/qtquick_controls/cpp/guiexchangescontrol.h @@ -14,8 +14,8 @@ public: GUIExchangesControl( QQuickItem* a_pParent = 0 ); virtual ~GUIExchangesControl(); - Q_INVOKABLE void InitializeExchangesView( GUIExchangesListView* a_pView ); - GUIExchangesListView* GetExchangesView() const { return m_pExchangesView; } + Q_INVOKABLE void initializeExchangesView( GUIExchangesListView* a_pView ); + GUIExchangesListView* getExchangesView() const { return m_pExchangesView; } public slots: void slotPopulateListView( JsonActiveExchangesParser* a_pActiveExchanges ); diff --git a/src/qt/qtquick_controls/cpp/guiexchangeslistview.cpp b/src/qt/qtquick_controls/cpp/guiexchangeslistview.cpp index e672de0..b23e5b0 100644 --- a/src/qt/qtquick_controls/cpp/guiexchangeslistview.cpp +++ b/src/qt/qtquick_controls/cpp/guiexchangeslistview.cpp @@ -13,7 +13,7 @@ GUIExchangesListView::GUIExchangesListView( QQuickItem* a_pParent ) { } -void GUIExchangesListView::Clear() +void GUIExchangesListView::clear() { if ( m_pModel ) { @@ -21,7 +21,7 @@ void GUIExchangesListView::Clear() } } -void GUIExchangesListView::OnClicked( int a_iItemIndex ) +void GUIExchangesListView::onClicked( int a_iItemIndex ) { if ( m_pModel ) { @@ -39,7 +39,7 @@ GUIExchangesListView::~GUIExchangesListView() } } -void GUIExchangesListView::SetModel( QmlExchangesListModel* a_pModel ) +void GUIExchangesListView::setModel( QmlExchangesListModel* a_pModel ) { if ( m_pModel ) { diff --git a/src/qt/qtquick_controls/cpp/guiexchangeslistview.h b/src/qt/qtquick_controls/cpp/guiexchangeslistview.h index d351291..c9997cc 100644 --- a/src/qt/qtquick_controls/cpp/guiexchangeslistview.h +++ b/src/qt/qtquick_controls/cpp/guiexchangeslistview.h @@ -16,12 +16,13 @@ public: explicit GUIExchangesListView( QQuickItem *a_pParent = 0 ); virtual ~GUIExchangesListView(); /** Destructor **/ - void SetModel( QmlExchangesListModel* a_pModel ); - QmlExchangesListModel* GetModel() const { return m_pModel; } + void setModel( QmlExchangesListModel* a_pModel ); + QmlExchangesListModel* getModel() const { return m_pModel; } - void Clear(); + void clear(); + + Q_INVOKABLE void onClicked( int a_iItemIndex ); - Q_INVOKABLE void OnClicked( int a_iItemIndex ); signals: void signalModelChanged(); diff --git a/src/qt/qtquick_controls/cpp/guiexchangeswidget.cpp b/src/qt/qtquick_controls/cpp/guiexchangeswidget.cpp index 57568a2..c202408 100644 --- a/src/qt/qtquick_controls/cpp/guiexchangeswidget.cpp +++ b/src/qt/qtquick_controls/cpp/guiexchangeswidget.cpp @@ -68,14 +68,14 @@ QWidget* GUIExchangesWidget::dockQmlToWidget() m_pExchangesControl = pRootObject->findChild(); if ( m_pExchangesControl ) { - m_pExchangesControl->setWidth( 400 ); - m_pExchangesControl->setHeight( 120 ); + m_pExchangesControl->setWidth( 500 ); + m_pExchangesControl->setHeight( 200 ); } } pPlaceHolder = QWidget::createWindowContainer( pExchangesWindow, this ); if ( pPlaceHolder ) { - pPlaceHolder->setMinimumSize( 400, 120 ); + pPlaceHolder->setMinimumSize( 500, 200 ); } } diff --git a/src/qt/qtquick_controls/cpp/qmlexchangeslistitem.cpp b/src/qt/qtquick_controls/cpp/qmlexchangeslistitem.cpp index 0307cf5..ad15fe2 100644 --- a/src/qt/qtquick_controls/cpp/qmlexchangeslistitem.cpp +++ b/src/qt/qtquick_controls/cpp/qmlexchangeslistitem.cpp @@ -1,15 +1,27 @@ #include "qmlexchangeslistitem.h" #include +#include -QmlExchangesListItem::QmlExchangesListItem(QString a_strImageSource, QString a_strDestinationUrl, QString a_strExchangesName, double a_dBidPrice, double a_dAskPrice, double a_dLastPrice, QString a_strDescription, QObject* a_pParent ) +QmlExchangesListItem::QmlExchangesListItem(QString a_strImageSource, + QString a_strDestinationUrl, + QString a_strExchangesName, + double a_dBidPrice, + double a_dAskPrice, + double a_dLastPrice, + QString a_strDescription, + double a_dVolume24H, + QString a_strLastUpdateTime, + QObject* a_pParent ) : QmlListItem ( QVariant( a_strImageSource ) , QVariant( a_strDestinationUrl ) , QVariant( a_strExchangesName ) - , QVariant( GetFormattedPrice( a_dBidPrice ) ) - , QVariant( GetFormattedPrice( a_dAskPrice ) ) - , QVariant( GetFormattedPrice( a_dLastPrice ) ) + , QVariant( getFormattedPrice( a_dBidPrice ) ) + , QVariant( getFormattedPrice( a_dAskPrice ) ) + , QVariant( getFormattedPrice( a_dLastPrice ) ) , QVariant( a_strDescription ) + , QVariant( QString::number(a_dVolume24H) ) + , QVariant( getFormattedDateTime(a_strLastUpdateTime) ) , a_pParent ) { @@ -19,17 +31,19 @@ QmlExchangesListItem::QmlExchangesListItem( const JsonSingleActiveExchange& a_rE : QmlListItem ( QVariant( a_rExchangeDescription.getImageName() ) , QVariant( a_rExchangeDescription.getAccessUrl() ) , QVariant( a_rExchangeDescription.getExchangeName() ) - , QVariant( GetFormattedPrice( a_rExchangeDescription.getLastBidPriceBTC() ) ) - , QVariant( GetFormattedPrice( a_rExchangeDescription.getLastAskPriceBTC() ) ) - , QVariant( GetFormattedPrice( a_rExchangeDescription.getLastPriceBTC() ) ) + , QVariant( getFormattedPrice( a_rExchangeDescription.getLastBidPriceBTC() ) ) + , QVariant( getFormattedPrice( a_rExchangeDescription.getLastAskPriceBTC() ) ) + , QVariant( getFormattedPrice( a_rExchangeDescription.getLastPriceBTC() ) ) , QVariant( a_rExchangeDescription.getDescription() ) + , QVariant( QString::number(a_rExchangeDescription.getVolume24H()) ) + , QVariant( getFormattedDateTime( a_rExchangeDescription.getLastUpdateTime() ) ) , a_pParent ) { } QmlExchangesListItem::QmlExchangesListItem( QObject* a_pParent ) - : QmlListItem( QVariant( "" ), QVariant( "" ), QVariant( "" ), QVariant( "" ), QVariant( "" ), QVariant( "" ), QVariant( "" ), a_pParent ) + : QmlListItem( QVariant( "" ), QVariant( "" ), QVariant( "" ), QVariant( "" ), QVariant( "" ), QVariant( "" ), QVariant( "" ), QVariant( "" ), QVariant( "" ), a_pParent ) { } @@ -48,10 +62,18 @@ QHash QmlExchangesListItem::RoleNames() const aRoleNames[ROLE_ASK_PRICE] = "m_askPrice"; aRoleNames[ROLE_LAST_PRICE] = "m_lastPrice"; aRoleNames[ROLE_DESCRIPTION] = "m_description"; + aRoleNames[ROLE_VOLUME24H] = "m_volume24H"; + aRoleNames[ROLE_LAST_UPDATE_TIME] = "m_lastUpdateTime"; return aRoleNames; } -QString QmlExchangesListItem::GetFormattedPrice(double a_dPrice) +QString QmlExchangesListItem::getFormattedPrice(double a_dPrice) { return QString::number( a_dPrice, 'f', 8 ); } + +QString QmlExchangesListItem::getFormattedDateTime( QString isoDateTime) +{ + QDateTime datetime = QDateTime::fromString(isoDateTime, Qt::ISODate); + return datetime.toString("dd-MM-yyyy HH:mm:ss"); +} diff --git a/src/qt/qtquick_controls/cpp/qmlexchangeslistitem.h b/src/qt/qtquick_controls/cpp/qmlexchangeslistitem.h index ec34886..f874ad6 100644 --- a/src/qt/qtquick_controls/cpp/qmlexchangeslistitem.h +++ b/src/qt/qtquick_controls/cpp/qmlexchangeslistitem.h @@ -16,6 +16,8 @@ public: , ROLE_ASK_PRICE = ROLE_5 , ROLE_LAST_PRICE = ROLE_6 , ROLE_DESCRIPTION = ROLE_7 + , ROLE_VOLUME24H = ROLE_8 + , ROLE_LAST_UPDATE_TIME = ROLE_9 }; explicit QmlExchangesListItem @@ -26,6 +28,8 @@ public: , double a_dAskPrice , double a_dLastPrice , QString a_strDescription + , double a_dVolume24H + , QString a_strLastUpdateTime , QObject *a_pParent = 0 ); explicit QmlExchangesListItem ( const JsonSingleActiveExchange& a_rExchangeDescription @@ -41,7 +45,8 @@ signals: public slots: private: - QString GetFormattedPrice( double a_dPrice ); + QString getFormattedPrice( double a_dPrice ); + QString getFormattedDateTime( QString isoDateTime); }; #endif // QMLEXCHANGESLISTITEM_H diff --git a/src/qt/qtquick_controls/cpp/qmllistitem.cpp b/src/qt/qtquick_controls/cpp/qmllistitem.cpp index a88bd52..3ffd8cd 100644 --- a/src/qt/qtquick_controls/cpp/qmllistitem.cpp +++ b/src/qt/qtquick_controls/cpp/qmllistitem.cpp @@ -191,6 +191,7 @@ QHash QmlListItem::RoleNames() const aRoleNames[ROLE_6] = "m_role6"; aRoleNames[ROLE_7] = "m_role7"; aRoleNames[ROLE_8] = "m_role8"; + aRoleNames[ROLE_9] = "m_role9"; return aRoleNames; } diff --git a/src/qt/qtquick_controls/qml/QmlGUIBannerListView.qml b/src/qt/qtquick_controls/qml/QmlGUIBannerListView.qml index 273baa7..950344b 100644 --- a/src/qt/qtquick_controls/qml/QmlGUIBannerListView.qml +++ b/src/qt/qtquick_controls/qml/QmlGUIBannerListView.qml @@ -57,7 +57,7 @@ GUIBannerListView anchors.fill: id_listElement onClicked: { - id_bannerView.OnClicked( index ) + id_bannerView.onClicked( index ) } } } diff --git a/src/qt/qtquick_controls/qml/QmlGUIExchangesControl.qml b/src/qt/qtquick_controls/qml/QmlGUIExchangesControl.qml index 0fcd4cf..4e14ca8 100644 --- a/src/qt/qtquick_controls/qml/QmlGUIExchangesControl.qml +++ b/src/qt/qtquick_controls/qml/QmlGUIExchangesControl.qml @@ -24,7 +24,7 @@ GUIExchangesControl anchors.fill: id_ExchangessArea Component.onCompleted: { - id_ExchangesControl.InitializeExchangesView( id_ExchangesListView ) + id_ExchangesControl.initializeExchangesView( id_ExchangesListView ) } } } diff --git a/src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml b/src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml index dc09f51..3938f19 100644 --- a/src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml +++ b/src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml @@ -1,5 +1,6 @@ -import QtQuick 2.0 +import QtQuick 2.2 import CasinoCoinControls 1.0 +import QtQuick.Controls 1.4 GUIExchangesListView { @@ -10,18 +11,25 @@ GUIExchangesListView property alias m_ListModel: id_listView.model property alias m_PathView: id_listView - ListView - { - id: id_listView - anchors.fill: id_ExchangesView + ScrollView + { + id: id_ExchangesScrollView + anchors.fill: parent - clip: true - visible: true - interactive: contentHeight > id_listView.height ? true : false + ListView + { + id: id_listView + anchors.fill: id_ExchangesScrollView + height: 250 + width: 500 + clip: true + visible: true + interactive: contentHeight > id_listView.height ? true : false - model: id_ExchangesView.p_pListModel - delegate: id_elementDelegate - } + model: id_ExchangesView.p_pListModel + delegate: id_elementDelegate + } + } Component { @@ -31,9 +39,9 @@ GUIExchangesListView id: id_listElement objectName: id_ExchangesView.objectName + "_Element" + index - width: 400 - height: 100 - Row + width: 750 + height: 125 + Row { id: id_row anchors.fill: id_listElement @@ -41,8 +49,8 @@ GUIExchangesListView { id: id_imageRectangle - width: id_listElement.width / 3 - height: 80 + width: id_listElement.width / 5 + height: 100 anchors.verticalCenter: id_row.verticalCenter Image { @@ -58,7 +66,7 @@ GUIExchangesListView anchors.fill: id_imageRectangle onClicked: { - id_ExchangesView.OnClicked( index ) + id_ExchangesView.onClicked( index ) } } } @@ -67,7 +75,7 @@ GUIExchangesListView id: id_otherInfoRectangle width: id_listElement.width - id_imageRectangle.width - height: 90 + height: 100 anchors.verticalCenter: id_row.verticalCenter Column { @@ -77,7 +85,7 @@ GUIExchangesListView { id: id_exchangeNameRectangle width: id_otherInfoRectangle.width - height: id_otherInfoRectangle.height / 3 + height: id_otherInfoRectangle.height / 4 Text { id: id_exchangeNameText @@ -89,7 +97,7 @@ GUIExchangesListView { id: id_pricesRectangle width: id_otherInfoRectangle.width - height: id_otherInfoRectangle.height / 3 + height: id_otherInfoRectangle.height / 4 Row { id: id_pricesRow @@ -97,62 +105,86 @@ GUIExchangesListView Rectangle { id: id_priceBid - width: id_pricesRectangle.width / 3 + width: id_pricesRectangle.width / 4 height: id_pricesRectangle.height Text { id: id_priceBidText anchors.fill: id_priceBid - text: qsTr( m_bidPrice ) + text: qsTr("Bid: %1").arg(m_bidPrice) } } Rectangle { id: id_priceAsk - width: id_pricesRectangle.width / 3 + width: id_pricesRectangle.width / 4 height: id_pricesRectangle.height Text { id: id_priceAskText anchors.fill: id_priceAsk - text: qsTr( m_askPrice ) + text: qsTr("Ask: %1").arg(m_askPrice) } } Rectangle { id: id_priceLast - width: id_pricesRectangle.width / 3 + width: id_pricesRectangle.width / 4 height: id_pricesRectangle.height Text { id: id_priceLastText anchors.fill: id_priceLast - text: qsTr( m_lastPrice ) + text: qsTr("Last: %1").arg(m_lastPrice) } } + Rectangle + { + id: id_volume24h + width: id_pricesRectangle.width / 4 + height: id_pricesRectangle.height + Text + { + id: id_volume24hText + anchors.fill: id_volume24h + text: qsTr("Volume: %1").arg(m_volume24H) + } + } } } Rectangle { - id: id_exchangeLink + id: id_exchangeLastUpdateTime width: id_otherInfoRectangle.width - height: id_otherInfoRectangle.height / 3 + height: id_otherInfoRectangle.height / 4 Text { - id: id_exchangeLinkText - anchors.fill: id_exchangeLink - text: qsTr( "Go to site" ) - MouseArea - { - id: id_linkMouseArea - anchors.fill: id_exchangeLinkText - onClicked: - { - id_ExchangesView.OnClicked( index ) - } - } + id: id_exchangeTime + anchors.fill: id_exchangeLastUpdateTime + text: qsTr( m_lastUpdateTime ) } } + Rectangle + { + id: id_exchangeLink + width: id_otherInfoRectangle.width + height: id_otherInfoRectangle.height / 4 + Text + { + id: id_exchangeLinkText + anchors.fill: id_exchangeLink + text: qsTr( "Go to site" ) + MouseArea + { + id: id_linkMouseArea + anchors.fill: id_exchangeLinkText + onClicked: + { + id_ExchangesView.onClicked( index ) + } + } + } + } } } } diff --git a/src/qt/qtquick_controls/qml/QmlGUIExchangesWindow.qml b/src/qt/qtquick_controls/qml/QmlGUIExchangesWindow.qml index 67c2d0f..5202c28 100644 --- a/src/qt/qtquick_controls/qml/QmlGUIExchangesWindow.qml +++ b/src/qt/qtquick_controls/qml/QmlGUIExchangesWindow.qml @@ -3,12 +3,14 @@ import QtQuick 2.2 Rectangle { id: id_root - QmlGUIExchangesControl - { - id: id_ExchangesControlMain - } + + QmlGUIExchangesControl + { + id: id_ExchangesControlMain + + } + width: 500 + height: 250 color: GUI20Skin.colorFrameBackground - width: id_ExchangesControlMain.width - height: id_ExchangesControlMain.height }