forked from qt-creator/qt-creator
Utils: Fix function name case StyleHelper::Uifont -> uifont
Oopsie. Change-Id: I66c4b56f43c50e3dfc5c17ffd95d778d496b77f2 Reviewed-by: Cristian Adam <cristian.adam@qt.io> Reviewed-by: <github-actions-qt-creator@cristianadam.eu>
This commit is contained in:
@@ -942,7 +942,7 @@ static QStringList brandFontFamilies()
|
||||
return families;
|
||||
}
|
||||
|
||||
QFont StyleHelper::UiFont(UiElement element)
|
||||
QFont StyleHelper::uiFont(UiElement element)
|
||||
{
|
||||
QFont font;
|
||||
|
||||
|
@@ -81,7 +81,7 @@ QTCREATOR_UTILS_EXPORT QColor sidebarShadow();
|
||||
QTCREATOR_UTILS_EXPORT QColor toolBarDropShadowColor();
|
||||
QTCREATOR_UTILS_EXPORT QColor notTooBrightHighlightColor();
|
||||
|
||||
QTCREATOR_UTILS_EXPORT QFont UiFont(UiElement element);
|
||||
QTCREATOR_UTILS_EXPORT QFont uiFont(UiElement element);
|
||||
|
||||
// Sets the base color and makes sure all top level widgets are updated
|
||||
QTCREATOR_UTILS_EXPORT void setBaseColor(const QColor &color);
|
||||
|
@@ -570,7 +570,7 @@ void SettingsDialog::showPage(const Id pageId)
|
||||
|
||||
void SettingsDialog::createGui()
|
||||
{
|
||||
m_headerLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH4));
|
||||
m_headerLabel->setFont(StyleHelper::uiFont(StyleHelper::UiElementH4));
|
||||
|
||||
auto headerHLayout = new QHBoxLayout;
|
||||
const int leftMargin = QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin);
|
||||
|
@@ -181,9 +181,9 @@ void FancyToolButton::paintEvent(QPaintEvent *event)
|
||||
const bool isTitledAction = defaultAction() && defaultAction()->property("titledAction").toBool();
|
||||
// draw popup texts
|
||||
if (isTitledAction && !m_iconsOnly) {
|
||||
const QFont normalFont = StyleHelper::UiFont(StyleHelper::UiElementCaption);
|
||||
const QFont normalFont = StyleHelper::uiFont(StyleHelper::UiElementCaption);
|
||||
QRect centerRect = rect();
|
||||
const QFont boldFont = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
|
||||
const QFont boldFont = StyleHelper::uiFont(StyleHelper::UiElementCaptionStrong);
|
||||
const QFontMetrics fm(normalFont);
|
||||
const QFontMetrics boldFm(boldFont);
|
||||
const int lineHeight = boldFm.height();
|
||||
@@ -284,7 +284,7 @@ QSize FancyToolButton::sizeHint() const
|
||||
|
||||
QSizeF buttonSize = iconSize().expandedTo(QSize(64, 38));
|
||||
if (defaultAction() && defaultAction()->property("titledAction").toBool()) {
|
||||
const QFont boldFont = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
|
||||
const QFont boldFont = StyleHelper::uiFont(StyleHelper::UiElementCaptionStrong);
|
||||
const QFontMetrics fm(boldFont);
|
||||
const qreal lineHeight = fm.height();
|
||||
const int extraHeight = 10 // Spacing between top and projectName
|
||||
|
@@ -68,7 +68,7 @@ QSize FancyTabBar::tabSizeHint(bool minimum) const
|
||||
Core::Constants::MODEBAR_ICONSONLY_BUTTON_SIZE / (minimum ? 3 : 1)};
|
||||
}
|
||||
|
||||
const QFont boldFont = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
|
||||
const QFont boldFont = StyleHelper::uiFont(StyleHelper::UiElementCaptionStrong);
|
||||
const QFontMetrics fm(boldFont);
|
||||
const int spacing = 8;
|
||||
const int width = 60 + spacing + 2;
|
||||
@@ -283,7 +283,7 @@ static void paintIconAndText(QPainter *painter, const QRect &rect,
|
||||
const QIcon &icon, const QString &text,
|
||||
bool enabled, bool selected)
|
||||
{
|
||||
const QFont boldFont = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
|
||||
const QFont boldFont = StyleHelper::uiFont(StyleHelper::UiElementCaptionStrong);
|
||||
painter->setFont(boldFont);
|
||||
|
||||
const bool drawIcon = rect.height() > 36;
|
||||
|
@@ -178,7 +178,7 @@ void WelcomePageButton::setSize(Size size)
|
||||
const int hMargin = size == SizeSmall ? 12 : 26;
|
||||
const int vMargin = size == SizeSmall ? 2 : 4;
|
||||
d->m_layout->setContentsMargins(hMargin, vMargin, hMargin, vMargin);
|
||||
d->m_label->setFont(size == SizeSmall ? font() : StyleHelper::UiFont(StyleHelper::UiElementH2));
|
||||
d->m_label->setFont(size == SizeSmall ? font() : StyleHelper::uiFont(StyleHelper::UiElementH2));
|
||||
}
|
||||
|
||||
void WelcomePageButton::setWithAccentColor(bool withAccent)
|
||||
|
@@ -166,7 +166,7 @@ QSize ProgressBar::sizeHint() const
|
||||
int width = 50;
|
||||
int height = PROGRESSBAR_HEIGHT + 5;
|
||||
if (m_titleVisible) {
|
||||
const QFont font = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
|
||||
const QFont font = StyleHelper::uiFont(StyleHelper::UiElementCaptionStrong);
|
||||
const QFontMetrics fm(font);
|
||||
width = qMax(width, fm.horizontalAdvance(m_title) + 16);
|
||||
height += fm.height() + 5;
|
||||
@@ -213,7 +213,7 @@ void ProgressBar::paintEvent(QPaintEvent *)
|
||||
percent = 1;
|
||||
|
||||
QPainter p(this);
|
||||
const QFont fnt = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
|
||||
const QFont fnt = StyleHelper::uiFont(StyleHelper::UiElementCaptionStrong);
|
||||
const QFontMetrics fm(fnt);
|
||||
|
||||
const int titleHeight = m_titleVisible ? fm.height() + 5 : 4;
|
||||
|
@@ -661,7 +661,7 @@ void ProgressManagerPrivate::updateStatusDetailsWidget()
|
||||
} else if (progress->isSubtitleVisibleInStatusBar() && !progress->subtitle().isEmpty()) {
|
||||
if (!m_statusDetailsLabel) {
|
||||
m_statusDetailsLabel = new QLabel(m_summaryProgressWidget);
|
||||
const QFont font = StyleHelper::UiFont(StyleHelper::UiElementCaptionStrong);
|
||||
const QFont font = StyleHelper::uiFont(StyleHelper::UiElementCaptionStrong);
|
||||
m_statusDetailsLabel->setFont(font);
|
||||
}
|
||||
m_statusDetailsLabel->setText(progress->subtitle());
|
||||
|
@@ -67,7 +67,7 @@ SearchBox::SearchBox(QWidget *parent)
|
||||
m_lineEdit = new FancyLineEdit;
|
||||
m_lineEdit->setFiltering(true);
|
||||
m_lineEdit->setFrame(false);
|
||||
m_lineEdit->setFont(StyleHelper::UiFont(StyleHelper::UiElementH2));
|
||||
m_lineEdit->setFont(StyleHelper::uiFont(StyleHelper::UiElementH2));
|
||||
m_lineEdit->setMinimumHeight(33);
|
||||
m_lineEdit->setAttribute(Qt::WA_MacShowFocusRect, false);
|
||||
|
||||
@@ -785,7 +785,7 @@ ListModel *SectionedGridView::addSection(const Section §ion, const QList<Lis
|
||||
}.emerge();
|
||||
m_sectionLabels.append(sectionLabel);
|
||||
sectionLabel->setContentsMargins(0, ItemGap, 0, 0);
|
||||
sectionLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH2));
|
||||
sectionLabel->setFont(StyleHelper::uiFont(StyleHelper::UiElementH2));
|
||||
auto scrollArea = qobject_cast<QScrollArea *>(widget(0));
|
||||
auto vbox = qobject_cast<QVBoxLayout *>(scrollArea->widget()->layout());
|
||||
|
||||
@@ -842,7 +842,7 @@ void SectionedGridView::zoomInSection(const Section §ion)
|
||||
noMargin
|
||||
}.emerge();
|
||||
sectionLabel->setContentsMargins(0, ItemGap, 0, 0);
|
||||
sectionLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH2));
|
||||
sectionLabel->setFont(StyleHelper::uiFont(StyleHelper::UiElementH2));
|
||||
|
||||
auto gridView = new GridView(zoomedInWidget);
|
||||
gridView->setItemDelegate(m_itemDelegate);
|
||||
|
@@ -49,7 +49,7 @@ BuildProgress::BuildProgress(TaskWindow *taskWindow, Qt::Orientation orientation
|
||||
warningLayout->addWidget(m_warningIcon);
|
||||
warningLayout->addWidget(m_warningLabel);
|
||||
|
||||
const QFont f = Utils::StyleHelper::UiFont(Utils::StyleHelper::UiElementCaptionStrong);
|
||||
const QFont f = Utils::StyleHelper::uiFont(Utils::StyleHelper::UiElementCaptionStrong);
|
||||
m_errorLabel->setFont(f);
|
||||
m_warningLabel->setFont(f);
|
||||
m_errorLabel->setPalette(Utils::StyleHelper::sidebarFontPalette(m_errorLabel->palette()));
|
||||
|
@@ -54,7 +54,7 @@ BuildSettingsWidget::BuildSettingsWidget(Target *target) :
|
||||
if (!BuildConfigurationFactory::find(m_target)) {
|
||||
auto noSettingsLabel = new QLabel(this);
|
||||
noSettingsLabel->setText(Tr::tr("No build settings available"));
|
||||
noSettingsLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH4));
|
||||
noSettingsLabel->setFont(StyleHelper::uiFont(StyleHelper::UiElementH4));
|
||||
vbox->addWidget(noSettingsLabel);
|
||||
return;
|
||||
}
|
||||
@@ -126,7 +126,7 @@ void BuildSettingsWidget::addSubWidget(NamedWidget *widget)
|
||||
|
||||
auto label = new QLabel(this);
|
||||
label->setText(widget->displayName());
|
||||
label->setFont(StyleHelper::UiFont(StyleHelper::UiElementH4));
|
||||
label->setFont(StyleHelper::uiFont(StyleHelper::UiElementH4));
|
||||
|
||||
label->setContentsMargins(0, 18, 0, 0);
|
||||
|
||||
|
@@ -100,7 +100,7 @@ void PanelsWidget::addPropertiesPanel(const QString &displayName)
|
||||
auto nameLabel = new QLabel(m_root);
|
||||
nameLabel->setText(displayName);
|
||||
nameLabel->setContentsMargins(0, ABOVE_HEADING_MARGIN, 0, 0);
|
||||
nameLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH3));
|
||||
nameLabel->setFont(StyleHelper::uiFont(StyleHelper::UiElementH3));
|
||||
m_layout->addWidget(nameLabel);
|
||||
m_layout->addWidget(Layouting::createHr());
|
||||
}
|
||||
|
@@ -583,11 +583,11 @@ public:
|
||||
manageSessionsButton->setOnClicked([] { SessionManager::showSessionManager(); });
|
||||
|
||||
auto sessionsLabel = new QLabel(this);
|
||||
sessionsLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH2));
|
||||
sessionsLabel->setFont(StyleHelper::uiFont(StyleHelper::UiElementH2));
|
||||
sessionsLabel->setText(Tr::tr("Sessions"));
|
||||
|
||||
auto recentProjectsLabel = new QLabel(this);
|
||||
recentProjectsLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH2));
|
||||
recentProjectsLabel->setFont(StyleHelper::uiFont(StyleHelper::UiElementH2));
|
||||
recentProjectsLabel->setText(Tr::tr("Projects"));
|
||||
|
||||
auto sessionsList = new TreeView(this, "Sessions");
|
||||
|
@@ -570,7 +570,7 @@ public:
|
||||
selectorView->setAutoFillBackground(true);
|
||||
|
||||
auto activeLabel = new QLabel(Tr::tr("Active Project"));
|
||||
activeLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH4));
|
||||
activeLabel->setFont(StyleHelper::uiFont(StyleHelper::UiElementH4));
|
||||
|
||||
auto innerLayout = new QVBoxLayout;
|
||||
innerLayout->setSpacing(10);
|
||||
@@ -903,7 +903,7 @@ void SelectorDelegate::paint(QPainter *painter, const QStyleOptionViewItem &opti
|
||||
case 2: {
|
||||
QColor col = creatorTheme()->color(Theme::TextColorNormal);
|
||||
opt.palette.setColor(QPalette::Text, col);
|
||||
opt.font = StyleHelper::UiFont(StyleHelper::UiElementH4);
|
||||
opt.font = StyleHelper::uiFont(StyleHelper::UiElementH4);
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
@@ -69,7 +69,7 @@ RunSettingsWidget::RunSettingsWidget(Target *target) :
|
||||
|
||||
runLabel->setBuddy(m_runConfigurationCombo);
|
||||
|
||||
const QFont f = Utils::StyleHelper::UiFont(Utils::StyleHelper::UiElementH4);
|
||||
const QFont f = Utils::StyleHelper::uiFont(Utils::StyleHelper::UiElementH4);
|
||||
runTitle->setFont(f);
|
||||
deployTitle->setFont(f);
|
||||
|
||||
@@ -498,7 +498,7 @@ void RunSettingsWidget::addSubWidget(QWidget *widget, QLabel *label)
|
||||
{
|
||||
widget->setContentsMargins({});
|
||||
|
||||
label->setFont(Utils::StyleHelper::UiFont(Utils::StyleHelper::UiElementH4));
|
||||
label->setFont(Utils::StyleHelper::uiFont(Utils::StyleHelper::UiElementH4));
|
||||
|
||||
label->setContentsMargins(0, 18, 0, 0);
|
||||
|
||||
|
@@ -185,7 +185,7 @@ void TargetGroupItemPrivate::ensureWidget()
|
||||
|
||||
auto label = new QLabel;
|
||||
label->setText(Tr::tr("No kit defined in this project."));
|
||||
label->setFont(StyleHelper::UiFont(StyleHelper::UiElementH4));
|
||||
label->setFont(StyleHelper::uiFont(StyleHelper::UiElementH4));
|
||||
label->setContentsMargins(10, 10, 10, 10);
|
||||
label->setAlignment(Qt::AlignTop);
|
||||
|
||||
|
@@ -20,7 +20,7 @@ DragShapeButton::DragShapeButton(QWidget *parent)
|
||||
setMinimumSize(75, 75);
|
||||
setMaximumSize(75, 75);
|
||||
setIconSize(QSize(45, 45));
|
||||
setFont(Utils::StyleHelper::UiFont(Utils::StyleHelper::UiElementCaption));
|
||||
setFont(Utils::StyleHelper::uiFont(Utils::StyleHelper::UiElementCaption));
|
||||
}
|
||||
|
||||
void DragShapeButton::setShapeInfo(int groupIndex, int shapeIndex)
|
||||
|
@@ -78,7 +78,7 @@ IntroductionWidget::IntroductionWidget(QWidget *parent)
|
||||
m_continueLabel->setAlignment(Qt::AlignCenter);
|
||||
m_continueLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred);
|
||||
m_continueLabel->setWordWrap(true);
|
||||
m_continueLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH3));
|
||||
m_continueLabel->setFont(StyleHelper::uiFont(StyleHelper::UiElementH3));
|
||||
m_continueLabel->setPalette(palette());
|
||||
layout->addWidget(m_continueLabel);
|
||||
m_bodyCss = "font-size: 16px;";
|
||||
|
@@ -160,7 +160,7 @@ public:
|
||||
|
||||
hbox->addSpacing(16);
|
||||
|
||||
const QFont welcomeFont = StyleHelper::UiFont(StyleHelper::UiElementH1);
|
||||
const QFont welcomeFont = StyleHelper::uiFont(StyleHelper::UiElementH1);
|
||||
|
||||
auto welcomeLabel = new QLabel("Welcome to");
|
||||
welcomeLabel->setFont(welcomeFont);
|
||||
@@ -245,7 +245,7 @@ public:
|
||||
vbox->addItem(newVBox);
|
||||
|
||||
auto newLabel = new QLabel(Tr::tr("New to Qt?"), mainWidget);
|
||||
newLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH2));
|
||||
newLabel->setFont(StyleHelper::uiFont(StyleHelper::UiElementH2));
|
||||
newLabel->setAlignment(Qt::AlignHCenter);
|
||||
newVBox->addWidget(newLabel);
|
||||
|
||||
|
Reference in New Issue
Block a user