diff --git a/src/libs/utils/styledbar.cpp b/src/libs/utils/styledbar.cpp index a20aba6e1ae..7b00c4b4953 100644 --- a/src/libs/utils/styledbar.cpp +++ b/src/libs/utils/styledbar.cpp @@ -3,6 +3,8 @@ #include "styledbar.h" +#include "stylehelper.h" + #include #include @@ -11,14 +13,14 @@ using namespace Utils; StyledBar::StyledBar(QWidget *parent) : QWidget(parent) { - setProperty("panelwidget", true); - setProperty("panelwidget_singlerow", true); + StyleHelper::setPanelWidget(this); + StyleHelper::setPanelWidgetSingleRow(this); setProperty("lightColored", false); } void StyledBar::setSingleRow(bool singleRow) { - setProperty("panelwidget_singlerow", singleRow); + StyleHelper::setPanelWidgetSingleRow(this, singleRow); } bool StyledBar::isSingleRow() const diff --git a/src/libs/utils/stylehelper.cpp b/src/libs/utils/stylehelper.cpp index 9f849b9a612..f27fb2f8fcb 100644 --- a/src/libs/utils/stylehelper.cpp +++ b/src/libs/utils/stylehelper.cpp @@ -634,6 +634,16 @@ QLinearGradient StyleHelper::statusBarGradient(const QRect &statusBarRect) return grad; } +void StyleHelper::setPanelWidget(QWidget *widget, bool value) +{ + widget->setProperty("panelwidget", value); +} + +void StyleHelper::setPanelWidgetSingleRow(QWidget *widget, bool value) +{ + widget->setProperty("panelwidget_singlerow", value); +} + bool StyleHelper::isQDSTheme() { return creatorTheme() ? creatorTheme()->flag(Theme::QDSTheme) : false; diff --git a/src/libs/utils/stylehelper.h b/src/libs/utils/stylehelper.h index da93bb3c3a5..c7766b0ffeb 100644 --- a/src/libs/utils/stylehelper.h +++ b/src/libs/utils/stylehelper.h @@ -72,6 +72,8 @@ public: static void tintImage(QImage &img, const QColor &tintColor); static QLinearGradient statusBarGradient(const QRect &statusBarRect); + static void setPanelWidget(QWidget *widget, bool value = true); + static void setPanelWidgetSingleRow(QWidget *widget, bool value = true); static bool isQDSTheme(); diff --git a/src/plugins/debugger/debuggermainwindow.cpp b/src/plugins/debugger/debuggermainwindow.cpp index 047fc3ec89b..8dfe23d8b14 100644 --- a/src/plugins/debugger/debuggermainwindow.cpp +++ b/src/plugins/debugger/debuggermainwindow.cpp @@ -162,13 +162,13 @@ DebuggerMainWindowPrivate::DebuggerMainWindowPrivate(DebuggerMainWindow *parent) { m_centralWidgetStack = new QStackedWidget; m_statusLabel = new Utils::StatusLabel; - m_statusLabel->setProperty("panelwidget", true); + StyleHelper::setPanelWidget(m_statusLabel); m_statusLabel->setIndent(2 * QFontMetrics(q->font()).horizontalAdvance(QChar('x'))); m_editorPlaceHolder = new EditorManagerPlaceHolder; m_perspectiveChooser = new QComboBox; m_perspectiveChooser->setObjectName("PerspectiveChooser"); - m_perspectiveChooser->setProperty("panelwidget", true); + StyleHelper::setPanelWidget(m_perspectiveChooser); m_perspectiveChooser->setSizeAdjustPolicy(QComboBox::AdjustToContents); connect(m_perspectiveChooser, &QComboBox::activated, this, [this](int item) { Perspective *perspective = Perspective::findPerspective(m_perspectiveChooser->itemData(item).toString()); @@ -507,7 +507,7 @@ QWidget *DebuggerMainWindow::centralWidgetStack() void DebuggerMainWindow::addSubPerspectiveSwitcher(QWidget *widget) { widget->setVisible(false); - widget->setProperty("panelwidget", true); + StyleHelper::setPanelWidget(widget); d->m_subPerspectiveSwitcherLayout->addWidget(widget); } @@ -810,7 +810,7 @@ QToolButton *PerspectivePrivate::setupToolButton(QAction *action) { QTC_ASSERT(action, return nullptr); auto toolButton = new QToolButton(m_innerToolBar); - toolButton->setProperty("panelwidget", true); + StyleHelper::setPanelWidget(toolButton); toolButton->setDefaultAction(action); toolButton->setToolTip(action->toolTip()); m_innerToolBarLayout->addWidget(toolButton); @@ -833,7 +833,7 @@ void Perspective::addToolBarWidget(QWidget *widget) { QTC_ASSERT(widget, return); // QStyle::polish is called before it is added to the toolbar, explicitly make it a panel widget - widget->setProperty("panelwidget", true); + StyleHelper::setPanelWidget(widget); widget->setParent(d->m_innerToolBar); d->m_innerToolBarLayout->addWidget(widget); } diff --git a/src/plugins/perfprofiler/perfprofilertool.cpp b/src/plugins/perfprofiler/perfprofilertool.cpp index 8362ccc4ed8..b199f227481 100644 --- a/src/plugins/perfprofiler/perfprofilertool.cpp +++ b/src/plugins/perfprofiler/perfprofilertool.cpp @@ -34,6 +34,7 @@ #include #include +#include #include #include @@ -151,9 +152,9 @@ PerfProfilerTool::PerfProfilerTool() m_filterMenu = new QMenu(m_filterButton); m_aggregateButton = new QToolButton; m_recordedLabel = new QLabel; - m_recordedLabel->setProperty("panelwidget", true); + StyleHelper::setPanelWidget(m_recordedLabel); m_delayLabel = new QLabel; - m_delayLabel->setProperty("panelwidget", true); + StyleHelper::setPanelWidget(m_delayLabel); m_objectsToDelete << m_recordButton << m_clearButton << m_filterButton << m_aggregateButton << m_recordedLabel << m_delayLabel; diff --git a/src/plugins/projectexplorer/miniprojecttargetselector.cpp b/src/plugins/projectexplorer/miniprojecttargetselector.cpp index af9fdf5c50b..558e4fa7122 100644 --- a/src/plugins/projectexplorer/miniprojecttargetselector.cpp +++ b/src/plugins/projectexplorer/miniprojecttargetselector.cpp @@ -653,7 +653,7 @@ MiniProjectTargetSelector::MiniProjectTargetSelector(QAction *targetSelectorActi QWidget(parent), m_projectAction(targetSelectorAction) { - setProperty("panelwidget", true); + StyleHelper::setPanelWidget(this); setContentsMargins(QMargins(0, 1, 1, 8)); setWindowFlags(Qt::Popup); diff --git a/src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp b/src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp index 452940aa5f1..27a14968c61 100644 --- a/src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp +++ b/src/plugins/qmldesigner/components/curveeditor/curveeditortoolbar.cpp @@ -8,7 +8,9 @@ #include "coreplugin/actionmanager/actionmanager.h" #include "coreplugin/icontext.h" #include "theme.h" -#include "utils/id.h" + +#include +#include #include #include @@ -154,8 +156,8 @@ CurveEditorToolBar::CurveEditorToolBar(CurveEditorModel *model, QWidget* parent) m_zoomSlider = new QSlider(Qt::Horizontal); m_zoomSlider->setRange(0, 100); - m_zoomSlider->setProperty("panelwidget", true); - m_zoomSlider->setProperty("panelwidget_singlerow", true); + Utils::StyleHelper::setPanelWidget(m_zoomSlider); + Utils::StyleHelper::setPanelWidgetSingleRow(m_zoomSlider); m_zoomSlider->setFixedWidth(120); connect(m_zoomSlider, &QSlider::valueChanged, [this](int value) { diff --git a/src/plugins/qmldesigner/components/formeditor/seekerslider.cpp b/src/plugins/qmldesigner/components/formeditor/seekerslider.cpp index caa7dcbd307..804f061657a 100644 --- a/src/plugins/qmldesigner/components/formeditor/seekerslider.cpp +++ b/src/plugins/qmldesigner/components/formeditor/seekerslider.cpp @@ -4,6 +4,7 @@ #include "seekerslider.h" #include +#include #include #include @@ -15,8 +16,8 @@ namespace QmlDesigner { SeekerSlider::SeekerSlider(QWidget *parent) : QSlider(parent) { - setProperty("panelwidget", true); - setProperty("panelwidget_singlerow", true); + Utils::StyleHelper::setPanelWidget(this); + Utils::StyleHelper::setPanelWidgetSingleRow(this); setOrientation(Qt::Horizontal); setFixedWidth(120); setMaxValue(30); diff --git a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp index d10e14e7cb7..acd0b7401b0 100644 --- a/src/plugins/qmldesigner/components/formeditor/toolbox.cpp +++ b/src/plugins/qmldesigner/components/formeditor/toolbox.cpp @@ -5,6 +5,8 @@ #include +#include + #include #include #include @@ -17,7 +19,7 @@ ToolBox::ToolBox(QWidget *parentWidget) , m_leftToolBar(new QToolBar(QLatin1String("LeftSidebar"), this)) , m_rightToolBar(new QToolBar(QLatin1String("RightSidebar"), this)) { - setProperty("panelwidget", false); + Utils::StyleHelper::setPanelWidget(this, false); m_leftToolBar->setFloatable(true); m_leftToolBar->setMovable(true); @@ -29,18 +31,18 @@ ToolBox::ToolBox(QWidget *parentWidget) setFixedHeight(Theme::toolbarSize()); - m_leftToolBar->setProperty("panelwidget", false); - m_leftToolBar->setProperty("panelwidget_singlerow", false); + Utils::StyleHelper::setPanelWidget(m_leftToolBar, false); + Utils::StyleHelper::setPanelWidgetSingleRow(m_leftToolBar, false); m_leftToolBar->setFixedHeight(Theme::toolbarSize()); - m_rightToolBar->setProperty("panelwidget", false); - m_rightToolBar->setProperty("panelwidget_singlerow", false); + Utils::StyleHelper::setPanelWidget(m_rightToolBar, false); + Utils::StyleHelper::setPanelWidgetSingleRow(m_rightToolBar, false); m_rightToolBar->setFixedHeight(Theme::toolbarSize()); m_rightToolBar->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Expanding); auto stretchToolbar = new QToolBar(this); - stretchToolbar->setProperty("panelwidget", false); - stretchToolbar->setProperty("panelwidget_singlerow", false); + Utils::StyleHelper::setPanelWidget(stretchToolbar, false); + Utils::StyleHelper::setPanelWidgetSingleRow(stretchToolbar, false); stretchToolbar->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); m_rightToolBar->setOrientation(Qt::Horizontal); diff --git a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp index c920b8b4288..b4ab0583c70 100644 --- a/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp +++ b/src/plugins/qmldesigner/components/timelineeditor/timelinetoolbar.cpp @@ -22,6 +22,7 @@ #include #include +#include #include #include @@ -430,8 +431,8 @@ void TimelineToolBar::createRightControls() m_scale = new QSlider(this); m_scale->setOrientation(Qt::Horizontal); - m_scale->setProperty("panelwidget", true); - m_scale->setProperty("panelwidget_singlerow", true); + Utils::StyleHelper::setPanelWidget(m_scale); + Utils::StyleHelper::setPanelWidgetSingleRow(m_scale); m_scale->setMaximumWidth(200); m_scale->setMinimumWidth(100); m_scale->setMinimum(0); diff --git a/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp b/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp index 81d6b9a11b0..194a4ad221a 100644 --- a/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp +++ b/src/plugins/qmldesigner/components/transitioneditor/transitioneditortoolbar.cpp @@ -23,6 +23,7 @@ #include #include +#include #include #include @@ -249,8 +250,8 @@ void TransitionEditorToolBar::createRightControls() addSpacing(10); m_scale = new QSlider(this); - m_scale->setProperty("panelwidget", true); - m_scale->setProperty("panelwidget_singlerow", true); + Utils::StyleHelper::setPanelWidget(m_scale); + Utils::StyleHelper::setPanelWidgetSingleRow(m_scale); m_scale->setOrientation(Qt::Horizontal); m_scale->setMaximumWidth(200); m_scale->setMinimumWidth(100); diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index dc33663e895..a82b6d74e0e 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -49,6 +49,7 @@ #include #include #include +#include #include #include @@ -197,7 +198,7 @@ QmlProfilerTool::QmlProfilerTool() this, &QmlProfilerTool::toggleVisibleFeature); d->m_timeLabel = new QLabel(); - d->m_timeLabel->setProperty("panelwidget", true); + StyleHelper::setPanelWidget(d->m_timeLabel); d->m_timeLabel->setIndent(10); updateTimeDisplay(); connect(d->m_timeLabel, &QObject::destroyed, &d->m_recordingTimer, &QTimer::stop);