feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlDesigner: Fix for color roles

Browse Source 
Change-Id: I6336130d7db684a13081e5a128753816bf5bbcc5
Fixes: QDS-4038
Fixes: QDS-4039
Reviewed-by: Thomas Hartmann <thomas.hartmann@qt.io>
This commit is contained in:
Aleksei German
2021-03-26 18:12:03 +01:00
parent de597ce821
commit 0768ec8687
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/plugins/qmldesigner/components/annotationeditor/annotationtabwidget.cpp
View File

@@ -39,6 +39,9 @@ AnnotationTabWidget::AnnotationTabWidget(QWidget *parent)
{
auto *commentCornerWidget = new QToolBar;
//Making it look similar to timeline editor button:
commentCornerWidget->setStyleSheet("QToolBar { background-color: transparent; border-width: 1px; }");
auto *commentAddAction = new QAction(TimelineIcons::ADD_TIMELINE.icon(),
tr("Add Comment")); //timeline icons?
auto *commentRemoveAction = new QAction(TimelineIcons::REMOVE_TIMELINE.icon(),

10
src/plugins/qmldesigner/components/richtexteditor/richtexteditor.cpp
View File

@@ -119,6 +119,14 @@ RichTextEditor::RichTextEditor(QWidget *parent)
ui->textEdit->setTextInteractionFlags(Qt::TextEditorInteraction | Qt::LinksAccessibleByMouse);
ui->tableBar->setVisible(false);
const QColor backColor = Theme::getColor(Theme::DSpanelBackground);
const QString toolBarStyleSheet =
QString("QToolBar { background-color: %1; border-width: 1px }").arg(backColor.name());
ui->toolBar->setStyleSheet(toolBarStyleSheet);
ui->tableBar->setStyleSheet(toolBarStyleSheet);
setupEditActions();
setupTextActions();
setupImageActions();
@@ -201,7 +209,7 @@ void RichTextEditor::setDocumentBaseUrl(const QUrl& url)
QIcon RichTextEditor::getIcon(Theme::Icon icon)
{
const QString fontName = "qtds_propertyIconFont.ttf";
const QColor iconColorNormal(Theme::getColor(Theme::IconsBaseColor));
const QColor iconColorNormal(Theme::getColor(Theme::DStextColor));
return Utils::StyleHelper::getIconFromIconFont(
fontName, Theme::getIconUnicode(icon), 20, 20, iconColorNormal);

9
src/plugins/qmldesigner/components/timelineeditor/timelinewidget.cpp
View File

@@ -205,9 +205,10 @@ TimelineWidget::TimelineWidget(TimelineView *view)
auto *topSpacer = new QSpacerItem(40, 20, QSizePolicy::Minimum, QSizePolicy::Expanding);
auto *bottomSpacer = new QSpacerItem(40, 20, QSizePolicy::Minimum, QSizePolicy::Expanding);
QString labelText =
tr("This file does not contain a timeline. <br><br> \
To create an animation, add a timeline by clicking the + button.");
const QString labelText =
tr("This file does not contain a timeline. <br><br>"
"To create an animation, add a timeline by clicking the + button.");
onboardingTopLabel->setText(labelText);
onboardingTopLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
@@ -241,7 +242,7 @@ TimelineWidget::TimelineWidget(TimelineView *view)
{
QPalette timelinePalette;
timelinePalette.setColor(QPalette::Text, Utils::creatorTheme()->color(
Utils::Theme::QmlDesigner_FormEditorForegroundColor));
Utils::Theme::DStextColor));
timelinePalette.setColor(QPalette::WindowText, timelinePalette.color(QPalette::Text));
timelinePalette.setColor(QPalette::Window, Utils::creatorTheme()->color(
Utils::Theme::QmlDesigner_BackgroundColorDarkAlternate));