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

QmlDesigner: Apply Toolbutton style to the toolbar and curveEditor

Browse Source 
Change-Id: I65879951025897a638f25ec4d52ce62710d26f54
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
Reviewed-by: Henning Gründl <henning.gruendl@qt.io>
This commit is contained in:
Ali Kianian
2023-02-21 14:56:59 +02:00
parent e46fe19768
commit 8abe67672e
2 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp
View File

@@ -8,6 +8,7 @@
#include "coreplugin/actionmanager/actionmanager.h" #include "coreplugin/actionmanager/actionmanager.h"
#include "coreplugin/icontext.h" #include "coreplugin/icontext.h"
#include "theme.h" #include "theme.h"
#include "utils/fileutils.h"
#include "utils/id.h" #include "utils/id.h"
#include <QAction> #include <QAction>
@@ -64,6 +65,9 @@ CurveEditorToolBar::CurveEditorToolBar(CurveEditorModel *model, QWidget* parent)
setFixedHeight(Theme::toolbarSize()); setFixedHeight(Theme::toolbarSize());
setContentsMargins(0, 0, 0, 0); setContentsMargins(0, 0, 0, 0);
QByteArray sheet = Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css");
setStyleSheet(Theme::replaceCssColors(QString::fromUtf8(sheet)));
QAction *tangentLinearAction = addAction(Theme::iconFromName(Theme::linear_medium), "Linear"); QAction *tangentLinearAction = addAction(Theme::iconFromName(Theme::linear_medium), "Linear");
QAction *tangentStepAction = addAction(Theme::iconFromName(Theme::step_medium), "Step"); QAction *tangentStepAction = addAction(Theme::iconFromName(Theme::step_medium), "Step");
QAction *tangentSplineAction = addAction(Theme::iconFromName(Theme::bezier_medium), "Spline"); QAction *tangentSplineAction = addAction(Theme::iconFromName(Theme::bezier_medium), "Spline");

6
src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp
View File

@@ -95,6 +95,9 @@ TimelineToolBar::TimelineToolBar(QWidget *parent)
: QToolBar(parent) : QToolBar(parent)
, m_grp() , m_grp()
{ {
QByteArray sheet = Utils::FileReader::fetchQrc(":/qmldesigner/stylesheet.css");
setStyleSheet(Theme::replaceCssColors(QString::fromUtf8(sheet)));
setContentsMargins(0, 0, 0, 0); setContentsMargins(0, 0, 0, 0);
setFixedHeight(Theme::toolbarSize()); setFixedHeight(Theme::toolbarSize());
createLeftControls(); createLeftControls();
@@ -275,7 +278,8 @@ void TimelineToolBar::createCenterControls()
addSpacing(2); addSpacing(2);
QIcon playbackIcon = TimelineUtils::mergeIcons( QIcon playbackIcon = TimelineUtils::mergeIcons(
Theme::iconFromName(Theme::Icon::pause), Theme::iconFromName(Theme::Icon::pause,
Theme::getColor(Theme::Color::DStextSelectedTextColor)),
Theme::iconFromName(Theme::Icon::playOutline_medium, Theme::iconFromName(Theme::Icon::playOutline_medium,
Theme::getColor(Theme::Color::IconsRunColor))); Theme::getColor(Theme::Color::IconsRunColor)));