From e153d4666d18a5203527afa3a2b133f13874d927 Mon Sep 17 00:00:00 2001 From: Jakub Date: Mon, 16 Nov 2015 16:34:40 +0100 Subject: [PATCH] Compilation error fix. --- src/qt/gui20_skin.h | 3 +++ .../qtquick_controls/cpp/guibannerwidget.cpp | 22 ++++++++++++------- .../cpp/guimenutoolbarwidget.cpp | 1 - .../qml/QmlGUIBannerControl.qml | 2 +- .../qml/QmlGUIBannerWindow.qml | 2 +- .../qml/QmlGUIMenuToolbarWindow.qml | 2 +- 6 files changed, 20 insertions(+), 12 deletions(-) diff --git a/src/qt/gui20_skin.h b/src/qt/gui20_skin.h index 8a38ce5..9e2a501 100644 --- a/src/qt/gui20_skin.h +++ b/src/qt/gui20_skin.h @@ -63,6 +63,9 @@ public: const QColor GetColorToolbarMainTextWebsiteURL() const {return colorToolbarMainTextWebsiteURL;} const QColor GetColorToolbarMainTextVisitWebsite() const {return colorToolbarMainTextVisitWebsite;} + const QColor GetColorWindowBackground() const {return colorWindowBackground;} + const QColor GetColorFrameBackground() const {return colorFrameBackground;} + const QColor GetColorButtonTopGradient() const {return colorButtonTopGradient;} const QColor GetColorButtonBottomGradient() const {return colorButtonBottomGradient;} const QColor GetColorButtonMid() const {return colorButtonMid;} diff --git a/src/qt/qtquick_controls/cpp/guibannerwidget.cpp b/src/qt/qtquick_controls/cpp/guibannerwidget.cpp index 734d540..af50194 100644 --- a/src/qt/qtquick_controls/cpp/guibannerwidget.cpp +++ b/src/qt/qtquick_controls/cpp/guibannerwidget.cpp @@ -46,21 +46,21 @@ void GUIBannerWidget::registerCustomQmlTypes() QWidget* GUIBannerWidget::dockQmlToWidget() { QQuickView* pBannerWindow = new QQuickView; - QQmlContext* pContext = pBannerWindow->rootContext(); + QWidget* pPlaceHolder = 0; + if ( pBannerWindow ) { - pBannerWindow->setSource( QUrl( QStringLiteral( "qrc:/qml/qtquick_controls/qml/QmlGUIBannerWindow.qml" ) ) ); + QQmlContext* pContext = pBannerWindow->rootContext(); + if ( pContext ) + { + pContext->setContextProperty( "GUI20Skin", &GUI20Skin::Instance() ); + } QQmlEngine* pEngine = pBannerWindow->engine(); if ( pEngine ) { m_pQmlImageProvider = new QmlImageProvider(); pEngine->addImageProvider( "advertImages", m_pQmlImageProvider ); } - pPlaceHolder = QWidget::createWindowContainer( pBannerWindow, this ); - if ( pPlaceHolder ) - { - pPlaceHolder->setMinimumSize( 445, 115 ); - pPlaceHolder->setMaximumSize( 445, 115 ); - } + pBannerWindow->setSource( QUrl( QStringLiteral( "qrc:/qml/qtquick_controls/qml/QmlGUIBannerWindow.qml" ) ) ); QQuickItem* pRootObject = pBannerWindow->rootObject(); if ( pRootObject ) { @@ -71,6 +71,12 @@ QWidget* GUIBannerWidget::dockQmlToWidget() m_pBannerControl->setHeight( 115 ); } } + pPlaceHolder = QWidget::createWindowContainer( pBannerWindow, this ); + if ( pPlaceHolder ) + { + pPlaceHolder->setMinimumSize( 445, 115 ); + pPlaceHolder->setMaximumSize( 445, 115 ); + } } return pPlaceHolder; diff --git a/src/qt/qtquick_controls/cpp/guimenutoolbarwidget.cpp b/src/qt/qtquick_controls/cpp/guimenutoolbarwidget.cpp index 632b48e..4a3e9bd 100644 --- a/src/qt/qtquick_controls/cpp/guimenutoolbarwidget.cpp +++ b/src/qt/qtquick_controls/cpp/guimenutoolbarwidget.cpp @@ -52,7 +52,6 @@ void GUIMenuToolbarWidget::slotCurrentItemChanged() void GUIMenuToolbarWidget::slotOurWebsiteURLClicked() { - qDebug() << "clicked"; if ( m_pToolbarControl ) { QString strUrl = m_pToolbarControl->GetWebsiteURL(); diff --git a/src/qt/qtquick_controls/qml/QmlGUIBannerControl.qml b/src/qt/qtquick_controls/qml/QmlGUIBannerControl.qml index 9750936..5458ba3 100644 --- a/src/qt/qtquick_controls/qml/QmlGUIBannerControl.qml +++ b/src/qt/qtquick_controls/qml/QmlGUIBannerControl.qml @@ -5,7 +5,7 @@ GUIBannerControl { id: id_bannerControl - property color colorBackgroundInWidget: GUI20Skin.colorWindowBackground + property color colorBackgroundInWidget: GUI20Skin.colorFrameBackground Rectangle { id: id_leftArrow diff --git a/src/qt/qtquick_controls/qml/QmlGUIBannerWindow.qml b/src/qt/qtquick_controls/qml/QmlGUIBannerWindow.qml index 6c648cd..78037d5 100644 --- a/src/qt/qtquick_controls/qml/QmlGUIBannerWindow.qml +++ b/src/qt/qtquick_controls/qml/QmlGUIBannerWindow.qml @@ -7,7 +7,7 @@ Rectangle { id: id_bannerControlMain } - color: "transparent" + color: GUI20Skin.colorFrameBackground width: id_bannerControlMain.width height: id_bannerControlMain.height } diff --git a/src/qt/qtquick_controls/qml/QmlGUIMenuToolbarWindow.qml b/src/qt/qtquick_controls/qml/QmlGUIMenuToolbarWindow.qml index 0e69d5c..7d0491b 100644 --- a/src/qt/qtquick_controls/qml/QmlGUIMenuToolbarWindow.qml +++ b/src/qt/qtquick_controls/qml/QmlGUIMenuToolbarWindow.qml @@ -5,7 +5,7 @@ Rectangle id: id_toolbarRoot width: parent.width height: parent.height - color: "transparent" + color: GUI20Skin.colorWindowBackground QmlGUIMenuToolbarControl { id: id_toolbarControlMain