Utils: Align enum StyleHelper::UiElement with upcoming design system #1

This change demotes the existing H1 and H2 to H3 and H4. It is supposed
to not change the visual appearance.

Change-Id: Idc3056307f0286a2d4d276ba79125ba93d5ac428
Reviewed-by: Cristian Adam <cristian.adam@qt.io>

src/libs/utils/stylehelper.cpp

@@ -941,17 +941,17 @@ QFont StyleHelper::UiFont(UiElement element)
 
     switch (element) {
     case UiElementH1:
+        break;
+    case UiElementH2:
+        break;
+    case UiElementH3:
         font.setPointSizeF(font.pointSizeF() * 1.6);
         font.setBold(true);
         break;
-    case UiElementH2:
+    case UiElementH4:
         font.setPointSizeF(font.pointSizeF() * 1.2);
         font.setBold(true);
         break;
-    case UiElementH3:
-        break;
-    case UiElementH4:
-        break;
     case UiElementPanelTitle: {
         font.setPointSizeF(panelTitleSize);
         font.setBold(true);

src/plugins/coreplugin/dialogs/settingsdialog.cpp

@@ -570,7 +570,7 @@ void SettingsDialog::showPage(const Id pageId)
 
 void SettingsDialog::createGui()
 {
-    m_headerLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH2));
+    m_headerLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH4));
 
     auto headerHLayout = new QHBoxLayout;
     const int leftMargin = QApplication::style()->pixelMetric(QStyle::PM_LayoutLeftMargin);

src/plugins/projectexplorer/buildsettingspropertiespage.cpp

@@ -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::UiElementH2));
+        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::UiElementH2));
+    label->setFont(StyleHelper::UiFont(StyleHelper::UiElementH4));
 
     label->setContentsMargins(0, 18, 0, 0);
 

src/plugins/projectexplorer/panelswidget.cpp

@@ -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::UiElementH1));
+    nameLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH3));
     m_layout->addWidget(nameLabel);
     m_layout->addWidget(Layouting::createHr());
 }

src/plugins/projectexplorer/projectwindow.cpp

@@ -570,7 +570,7 @@ public:
         selectorView->setAutoFillBackground(true);
 
         auto activeLabel = new QLabel(Tr::tr("Active Project"));
-        activeLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH2));
+        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::UiElementH2);
+            opt.font = StyleHelper::UiFont(StyleHelper::UiElementH4);
             break;
             }
         }

src/plugins/projectexplorer/runsettingspropertiespage.cpp

@@ -69,7 +69,7 @@ RunSettingsWidget::RunSettingsWidget(Target *target) :
 
     runLabel->setBuddy(m_runConfigurationCombo);
 
-    const QFont f = Utils::StyleHelper::UiFont(Utils::StyleHelper::UiElementH2);
+    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::UiElementH2));
+    label->setFont(Utils::StyleHelper::UiFont(Utils::StyleHelper::UiElementH4));
 
     label->setContentsMargins(0, 18, 0, 0);
 

src/plugins/projectexplorer/targetsettingspanel.cpp

@@ -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::UiElementH2));
+        label->setFont(StyleHelper::UiFont(StyleHelper::UiElementH4));
         label->setContentsMargins(10, 10, 10, 10);
         label->setAlignment(Qt::AlignTop);
 

src/plugins/welcome/introductionwidget.cpp

@@ -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::UiElementH1));
+    m_continueLabel->setFont(StyleHelper::UiFont(StyleHelper::UiElementH3));
     m_continueLabel->setPalette(palette());
     layout->addWidget(m_continueLabel);
     m_bodyCss = "font-size: 16px;";