diff options
| author | Mahmoud Badri <mahmoud.badri@qt.io> | 2019-03-12 15:49:33 +0200 |
|---|---|---|
| committer | Miikka Heikkinen <miikka.heikkinen@qt.io> | 2019-03-14 08:40:08 +0000 |
| commit | e9e2028aacb84f75d09d2e8580d1654bd9955d3a (patch) | |
| tree | 62c505b085bb6ae163442ea281b104674d11da4d | |
| parent | 85bfaab5ec1f6d7661f7f8cc5619dda1ad6c1d0b (diff) | |
Update variants slide view UI
Make variants appear as squares instead of numbers in the slide view.
Task-number: QT3DS-3087
Change-Id: If5857a9cfd20ce00e00b33a09bc71f3881946d77
Reviewed-by: Tomi Korpipää <tomi.korpipaa@qt.io>
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
| -rw-r--r-- | src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp | 4 | ||||
| -rw-r--r-- | src/Authoring/Studio/Palettes/Slide/SlideModel.cpp | 8 | ||||
| -rw-r--r-- | src/Authoring/Studio/Palettes/Slide/SlideView.qml | 13 |
3 files changed, 15 insertions, 10 deletions
diff --git a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp index 3749e25f..c33371ea 100644 --- a/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp +++ b/src/Authoring/Client/Code/Core/Utility/StudioPreferences.cpp @@ -63,6 +63,7 @@ static QColor s_xAxisColor; static QColor s_yAxisColor; static QColor s_zAxisColor; static QColor s_inspectorGroupHeaderColor; +static QColor s_variantsSlideViewBGColor; static QLinearGradient s_welcomeBackgroundGradient; static QColor s_timelineRowColorNormal; @@ -159,6 +160,7 @@ void CStudioPreferences::loadPreferences(const QString &filePath) s_yAxisColor = QColor("#64cd35"); s_zAxisColor = QColor("#1e9fcd"); s_inspectorGroupHeaderColor = QColor("#111111"); + s_variantsSlideViewBGColor = QColor("#111111"); s_welcomeBackgroundGradient = QLinearGradient(0.0, 0.0, 1.0, 0.0); s_welcomeBackgroundGradient.setColorAt(0.0, QColor("#343E55")); @@ -875,6 +877,8 @@ void CStudioPreferences::setQmlContextProperties(QQmlContext *qml) qml->setContextProperty(QStringLiteral("_valueWidth"), s_valueWidth); qml->setContextProperty(QStringLiteral("_inspectorGroupHeaderColor"), s_inspectorGroupHeaderColor); + qml->setContextProperty(QStringLiteral("_variantsSlideViewBGColor"), + s_variantsSlideViewBGColor); } QColor CStudioPreferences::studioColor1() diff --git a/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp b/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp index 3cf0a01e..a580d702 100644 --- a/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp +++ b/src/Authoring/Studio/Palettes/Slide/SlideModel.cpp @@ -61,12 +61,10 @@ QVariant SlideModel::data(const QModelIndex &index, int role) const if (slideIdx < m_variantsModel.size()) { const auto variantsDef = g_StudioApp.GetCore()->getProjectFile().variantsDef(); const auto keys = m_variantsModel[slideIdx].keys(); - QString templ = QStringLiteral(" <font color='%1'>%2</font>"); + QString templ = QString::fromWCharArray(L"<font color='%1'>\u25A0</font>"); QString slideVariants; - for (auto g : keys) { // variants groups - slideVariants.append(templ.arg(variantsDef[g].m_color) - .arg(m_variantsModel[slideIdx][g].length())); - } + for (auto g : keys) // variants groups + slideVariants.append(templ.arg(variantsDef[g].m_color)); return slideVariants; } diff --git a/src/Authoring/Studio/Palettes/Slide/SlideView.qml b/src/Authoring/Studio/Palettes/Slide/SlideView.qml index 93865fa3..9efa20a5 100644 --- a/src/Authoring/Studio/Palettes/Slide/SlideView.qml +++ b/src/Authoring/Studio/Palettes/Slide/SlideView.qml @@ -265,11 +265,14 @@ Rectangle { Label { // variants width: slideImage.width - font.pixelSize: _fontSize - padding: 3 - verticalAlignment: Text.AlignVCenter - background: Rectangle { color:"#111111" } - wrapMode: Text.WordWrap + font.pixelSize: 14 + font.letterSpacing: 2 + leftPadding: 3 + topPadding: -3 + bottomPadding: 8 + background: Rectangle { color:_variantsSlideViewBGColor } + wrapMode: Text.WrapAnywhere + lineHeight: .6 visible: model.variants !== undefined && model.variants !== "" text: model.variants ? model.variants : "" |