AskDavis/Casinotest
1
0
Fork 0
mirror of https://github.com/AskDavis/Casinotest.git synced 2026-01-01 05:05:57 -08:00
Code Issues Packages Projects Releases Wiki Activity

Compilation error fix.

Browse Source
This commit is contained in:
Jakub
2015-11-16 16:34:40 +01:00
parent 455e0af74c
commit e153d4666d
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/qt/gui20_skin.h
View File

@@ -63,6 +63,9 @@ public:
const QColor GetColorToolbarMainTextWebsiteURL() const {return colorToolbarMainTextWebsiteURL;} const QColor GetColorToolbarMainTextWebsiteURL() const {return colorToolbarMainTextWebsiteURL;}
const QColor GetColorToolbarMainTextVisitWebsite() const {return colorToolbarMainTextVisitWebsite;} 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 GetColorButtonTopGradient() const {return colorButtonTopGradient;}
const QColor GetColorButtonBottomGradient() const {return colorButtonBottomGradient;} const QColor GetColorButtonBottomGradient() const {return colorButtonBottomGradient;}
const QColor GetColorButtonMid() const {return colorButtonMid;} const QColor GetColorButtonMid() const {return colorButtonMid;}

22
src/qt/qtquick_controls/cpp/guibannerwidget.cpp
View File

@@ -46,21 +46,21 @@ void GUIBannerWidget::registerCustomQmlTypes()
QWidget* GUIBannerWidget::dockQmlToWidget() QWidget* GUIBannerWidget::dockQmlToWidget()
{ {
QQuickView* pBannerWindow = new QQuickView; 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(); QQmlEngine* pEngine = pBannerWindow->engine();
if ( pEngine ) if ( pEngine )
{ {
m_pQmlImageProvider = new QmlImageProvider(); m_pQmlImageProvider = new QmlImageProvider();
pEngine->addImageProvider( "advertImages", m_pQmlImageProvider ); pEngine->addImageProvider( "advertImages", m_pQmlImageProvider );
} }
pPlaceHolder = QWidget::createWindowContainer( pBannerWindow, this ); pBannerWindow->setSource( QUrl( QStringLiteral( "qrc:/qml/qtquick_controls/qml/QmlGUIBannerWindow.qml" ) ) );
if ( pPlaceHolder )
{
pPlaceHolder->setMinimumSize( 445, 115 );
pPlaceHolder->setMaximumSize( 445, 115 );
}
QQuickItem* pRootObject = pBannerWindow->rootObject(); QQuickItem* pRootObject = pBannerWindow->rootObject();
if ( pRootObject ) if ( pRootObject )
{ {
@@ -71,6 +71,12 @@ QWidget* GUIBannerWidget::dockQmlToWidget()
m_pBannerControl->setHeight( 115 ); m_pBannerControl->setHeight( 115 );
} }
} }
pPlaceHolder = QWidget::createWindowContainer( pBannerWindow, this );
if ( pPlaceHolder )
{
pPlaceHolder->setMinimumSize( 445, 115 );
pPlaceHolder->setMaximumSize( 445, 115 );
}
} }
return pPlaceHolder; return pPlaceHolder;

1
src/qt/qtquick_controls/cpp/guimenutoolbarwidget.cpp
View File

@@ -52,7 +52,6 @@ void GUIMenuToolbarWidget::slotCurrentItemChanged()
void GUIMenuToolbarWidget::slotOurWebsiteURLClicked() void GUIMenuToolbarWidget::slotOurWebsiteURLClicked()
{ {
qDebug() << "clicked";
if ( m_pToolbarControl ) if ( m_pToolbarControl )
{ {
QString strUrl = m_pToolbarControl->GetWebsiteURL(); QString strUrl = m_pToolbarControl->GetWebsiteURL();

2
src/qt/qtquick_controls/qml/QmlGUIBannerControl.qml
View File

@@ -5,7 +5,7 @@ GUIBannerControl
{ {
id: id_bannerControl id: id_bannerControl
property color colorBackgroundInWidget: GUI20Skin.colorWindowBackground property color colorBackgroundInWidget: GUI20Skin.colorFrameBackground
Rectangle Rectangle
{ {
id: id_leftArrow id: id_leftArrow

2
src/qt/qtquick_controls/qml/QmlGUIBannerWindow.qml
View File

@@ -7,7 +7,7 @@ Rectangle
{ {
id: id_bannerControlMain id: id_bannerControlMain
} }
color: "transparent" color: GUI20Skin.colorFrameBackground
width: id_bannerControlMain.width width: id_bannerControlMain.width
height: id_bannerControlMain.height height: id_bannerControlMain.height
} }

2
src/qt/qtquick_controls/qml/QmlGUIMenuToolbarWindow.qml
View File

@@ -5,7 +5,7 @@ Rectangle
id: id_toolbarRoot id: id_toolbarRoot
width: parent.width width: parent.width
height: parent.height height: parent.height
color: "transparent" color: GUI20Skin.colorWindowBackground
QmlGUIMenuToolbarControl QmlGUIMenuToolbarControl
{ {
id: id_toolbarControlMain id: id_toolbarControlMain