From 9411ed14a52db49026b3878933d41d29c20ff89b Mon Sep 17 00:00:00 2001 From: Andre Jochems Date: Mon, 30 Nov 2015 17:06:15 +0100 Subject: [PATCH] Skins changes --- src/qt/gui20_skin.cpp | 4 +++- src/qt/gui20_skin.h | 2 ++ .../qml/QmlGUIExchangesListView.qml | 15 +++++++++++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/src/qt/gui20_skin.cpp b/src/qt/gui20_skin.cpp index 6af72bd..cb16aa3 100644 --- a/src/qt/gui20_skin.cpp +++ b/src/qt/gui20_skin.cpp @@ -4,7 +4,8 @@ GUI20Skin::GUI20Skin( QObject* a_pParent ) : QObject( a_pParent ) , colorToolbarMainGradientBegin( "#9c181c" ) - , colorToolbarMainGradientEnd( "#ae1e22" ) +// , colorToolbarMainGradientEnd( "#ae1e22" ) + , colorToolbarMainGradientEnd( "#a61b22" ) , colorToolbarMainCurrent( "#761316" ) , colorToolbarMainBottomCurrent( "#e1252b" ) , colorToolbarMainTextCurrent( "#ffffff" ) @@ -26,6 +27,7 @@ GUI20Skin::GUI20Skin( QObject* a_pParent ) , colorTextActiveAutocomplete( "#6B3D3D" ) , colorTextDisabled( "#707070" ) , colorTextDisabledAutocomplete( "#8B5D5D" ) + , colorTextBlack("#000000") { } diff --git a/src/qt/gui20_skin.h b/src/qt/gui20_skin.h index 9e2a501..bde59fa 100644 --- a/src/qt/gui20_skin.h +++ b/src/qt/gui20_skin.h @@ -112,6 +112,8 @@ private: const QColor colorTextDisabled; const QColor colorTextDisabledAutocomplete; + const QColor colorTextBlack; + public: static GUI20Skin& Instance(); private: diff --git a/src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml b/src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml index 80bc193..77965ea 100644 --- a/src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml +++ b/src/qt/qtquick_controls/qml/QmlGUIExchangesListView.qml @@ -89,7 +89,9 @@ GUIExchangesListView id: id_exchangeNameText anchors.fill: id_exchangeNameRectangle text: qsTr( m_exchangeName ) - color: GUI20Skin.colorToolbarMainGradientEnd + color: GUI20Skin.colorToolbarMainGradientEnd + font.bold: true + font.pointSize: 9 } } Rectangle @@ -119,6 +121,7 @@ GUIExchangesListView id: id_priceBidTextValue anchors.left: id_priceBidTextDescription.right text: qsTr( m_bidPrice ) + font.bold: true color: GUI20Skin.colorTextActive } } @@ -141,6 +144,7 @@ GUIExchangesListView id: id_priceAskTextValue anchors.left: id_priceAskTextDescription.right text: qsTr( m_askPrice ) + font.bold: true color: GUI20Skin.colorTextActive } } @@ -162,6 +166,7 @@ GUIExchangesListView id: id_volume24hTextValue anchors.left: id_volume24hTextDescription.right text: qsTr( m_volume24H ) + font.bold: true color: GUI20Skin.colorTextActive } } @@ -194,6 +199,7 @@ GUIExchangesListView id: id_priceLastTextValue anchors.left: id_priceLastTextDescription.right text: qsTr( m_lastPrice ) + font.bold: true color: GUI20Skin.colorTextActive } } @@ -215,6 +221,7 @@ GUIExchangesListView id: id_exchangeTimeValue anchors.left: id_exchangeTimeDescription.right text: qsTr( m_lastUpdateTime ) + font.bold: true color: GUI20Skin.colorTextActive } } @@ -230,9 +237,9 @@ GUIExchangesListView { id: id_exchangeLinkText anchors.fill: id_exchangeLink - text: qsTr( "Go to site" ) - font.underline: true - color: GUI20Skin.colorToolbarMainGradientEnd + text: qsTr( "Trade Casinocoin at %1" ).arg(m_exchangeName) + font.underline: true + color: GUI20Skin.colorTextBlack MouseArea { id: id_linkMouseArea