QtSupport: Drop codegensettingspagewidget.ui

Change-Id: Ifece92f9fa96bc27c2723766f18c995ae1e6d809
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: <github-actions-qt-creator@cristianadam.eu>

5 files changed, 67 insertions, 149 deletions

diff --git a/src/plugins/qtsupport/CMakeLists.txt b/src/plugins/qtsupport/CMakeLists.txt
index 1fc1457e8c..afe14575d0 100644
--- a/src/plugins/qtsupport/CMakeLists.txt
+++ b/src/plugins/qtsupport/CMakeLists.txt
@@ -7,7 +7,6 @@ add_qtc_plugin(QtSupport
     codegenerator.cpp codegenerator.h
     codegensettings.cpp codegensettings.h
     codegensettingspage.cpp codegensettingspage.h
-    codegensettingspagewidget.ui
     exampleslistmodel.cpp exampleslistmodel.h
     gettingstartedwelcomepage.cpp gettingstartedwelcomepage.h
     profilereader.cpp profilereader.h
diff --git a/src/plugins/qtsupport/codegensettingspage.cpp b/src/plugins/qtsupport/codegensettingspage.cpp
index af4ac0b34a..1d86bba170 100644
--- a/src/plugins/qtsupport/codegensettingspage.cpp
+++ b/src/plugins/qtsupport/codegensettingspage.cpp
@@ -27,17 +27,18 @@
 
 #include "codegensettings.h"
 #include "qtsupportconstants.h"
-#include "ui_codegensettingspagewidget.h"
 
 #include <coreplugin/icore.h>
+
 #include <cppeditor/cppeditorconstants.h>
 
-#include <QCoreApplication>
+#include <utils/layoutbuilder.h>
 
-namespace QtSupport {
-namespace Internal {
+#include <QCheckBox>
+#include <QCoreApplication>
+#include <QRadioButton>
 
-// ---------- CodeGenSettingsPageWidget
+namespace QtSupport::Internal {
 
 class CodeGenSettingsPageWidget : public Core::IOptionsPageWidget
 {
@@ -50,61 +51,89 @@ private:
     void apply() final;
 
     int uiEmbedding() const;
-    void setUiEmbedding(int);
 
-    Ui::CodeGenSettingsPageWidget m_ui;
+    QRadioButton *m_ptrAggregationRadioButton;
+    QRadioButton *m_aggregationButton;
+    QRadioButton *m_multipleInheritanceButton;
+    QCheckBox *m_retranslateCheckBox;
+    QCheckBox *m_includeQtModuleCheckBox;
+    QCheckBox *m_addQtVersionCheckBox;
 };
 
 CodeGenSettingsPageWidget::CodeGenSettingsPageWidget()
 {
-    m_ui.setupUi(this);
+    resize(340, 232);
 
     CodeGenSettings parameters;
     parameters.fromSettings(Core::ICore::settings());
 
-    m_ui.retranslateCheckBox->setChecked(parameters.retranslationSupport);
-    m_ui.includeQtModuleCheckBox->setChecked(parameters.includeQtModule);
-    m_ui.addQtVersionCheckBox->setChecked(parameters.addQtVersionCheck);
-    setUiEmbedding(parameters.embedding);
-
-    connect(m_ui.includeQtModuleCheckBox, &QAbstractButton::toggled,
-            m_ui.addQtVersionCheckBox, &QWidget::setEnabled);
+    using namespace Utils::Layouting;
+
+    m_ptrAggregationRadioButton = new QRadioButton(tr("Aggregation as a pointer member"));
+    m_ptrAggregationRadioButton->setChecked
+        (parameters.embedding == CodeGenSettings::PointerAggregatedUiClass);
+
+    m_aggregationButton = new QRadioButton(tr("Aggregation"));
+    m_aggregationButton->setChecked
+        (parameters.embedding == CodeGenSettings::AggregatedUiClass);
+
+    m_multipleInheritanceButton = new QRadioButton(tr("Multiple inheritance"));
+    m_multipleInheritanceButton->setChecked
+        (parameters.embedding == CodeGenSettings::InheritedUiClass);
+
+    m_retranslateCheckBox = new QCheckBox(tr("Support for changing languages at runtime"));
+    m_retranslateCheckBox->setChecked(parameters.retranslationSupport);
+
+    m_includeQtModuleCheckBox = new QCheckBox(tr("Use Qt module name in #include-directive"));
+    m_includeQtModuleCheckBox->setChecked(parameters.includeQtModule);
+
+    m_addQtVersionCheckBox = new QCheckBox(tr("Add Qt version #ifdef for module names"));
+    m_addQtVersionCheckBox->setChecked(parameters.addQtVersionCheck);
+    m_addQtVersionCheckBox->setEnabled(false);
+
+    Column {
+        Group {
+            Title(tr("Embedding of the UI Class")),
+            Column {
+                m_ptrAggregationRadioButton,
+                m_aggregationButton,
+                m_multipleInheritanceButton
+            }
+        },
+        Group {
+            Title(tr("Code Generation")),
+            Column {
+                m_retranslateCheckBox,
+                m_includeQtModuleCheckBox,
+                m_addQtVersionCheckBox
+            }
+        },
+        Stretch()
+    }.attachTo(this);
+
+    connect(m_includeQtModuleCheckBox, &QAbstractButton::toggled,
+            m_addQtVersionCheckBox, &QWidget::setEnabled);
 }
 
 void CodeGenSettingsPageWidget::apply()
 {
     CodeGenSettings rc;
     rc.embedding = static_cast<CodeGenSettings::UiClassEmbedding>(uiEmbedding());
-    rc.retranslationSupport = m_ui.retranslateCheckBox->isChecked();
-    rc.includeQtModule = m_ui.includeQtModuleCheckBox->isChecked();
-    rc.addQtVersionCheck = m_ui.addQtVersionCheckBox->isChecked();
+    rc.retranslationSupport = m_retranslateCheckBox->isChecked();
+    rc.includeQtModule = m_includeQtModuleCheckBox->isChecked();
+    rc.addQtVersionCheck = m_addQtVersionCheckBox->isChecked();
     rc.toSettings(Core::ICore::settings());
 }
 
 int CodeGenSettingsPageWidget::uiEmbedding() const
 {
-    if (m_ui.ptrAggregationRadioButton->isChecked())
+    if (m_ptrAggregationRadioButton->isChecked())
         return CodeGenSettings::PointerAggregatedUiClass;
-    if (m_ui.aggregationButton->isChecked())
+    if (m_aggregationButton->isChecked())
         return CodeGenSettings::AggregatedUiClass;
     return CodeGenSettings::InheritedUiClass;
 }
 
-void CodeGenSettingsPageWidget::setUiEmbedding(int v)
-{
-    switch (v) {
-    case CodeGenSettings::PointerAggregatedUiClass:
-        m_ui.ptrAggregationRadioButton->setChecked(true);
-        break;
-    case CodeGenSettings::AggregatedUiClass:
-        m_ui.aggregationButton->setChecked(true);
-        break;
-    case CodeGenSettings::InheritedUiClass:
-        m_ui.multipleInheritanceButton->setChecked(true);
-        break;
-    }
-}
-
 // ---------- CodeGenSettingsPage
 
 CodeGenSettingsPage::CodeGenSettingsPage()
@@ -118,5 +147,4 @@ CodeGenSettingsPage::CodeGenSettingsPage()
     setWidgetCreator([] { return new CodeGenSettingsPageWidget; });
 }
 
-} // namespace Internal
-} // namespace QtSupport
+} // QtSupport::Internal
diff --git a/src/plugins/qtsupport/codegensettingspage.h b/src/plugins/qtsupport/codegensettingspage.h
index fe5c871d9d..2f5b5b1799 100644
--- a/src/plugins/qtsupport/codegensettingspage.h
+++ b/src/plugins/qtsupport/codegensettingspage.h
@@ -27,8 +27,7 @@
 
 #include <coreplugin/dialogs/ioptionspage.h>
 
-namespace QtSupport {
-namespace Internal {
+namespace QtSupport::Internal {
 
 class CodeGenSettingsPage final : public Core::IOptionsPage
 {
@@ -36,5 +35,4 @@ public:
     CodeGenSettingsPage();
 };
 
-} // namespace Internal
-} // namespace QtSupport
+} // QtSupport::Internal
diff --git a/src/plugins/qtsupport/codegensettingspagewidget.ui b/src/plugins/qtsupport/codegensettingspagewidget.ui
deleted file mode 100644
index 4469ce90a3..0000000000
--- a/src/plugins/qtsupport/codegensettingspagewidget.ui
+++ /dev/null
@@ -1,106 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>QtSupport::Internal::CodeGenSettingsPageWidget</class>
- <widget class="QWidget" name="QtSupport::Internal::CodeGenSettingsPageWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>340</width>
-    <height>232</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
-   <item>
-    <widget class="QGroupBox" name="uiclassGroupBox">
-     <property name="title">
-      <string>Embedding of the UI Class</string>
-     </property>
-     <property name="checkable">
-      <bool>false</bool>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QRadioButton" name="ptrAggregationRadioButton">
-        <property name="text">
-         <string>Aggregation as a pointer member</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="aggregationButton">
-        <property name="text">
-         <string>Aggregation</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QRadioButton" name="multipleInheritanceButton">
-        <property name="text">
-         <string>Multiple inheritance</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-     <zorder>aggregationButton</zorder>
-     <zorder>multipleInheritanceButton</zorder>
-     <zorder>ptrAggregationRadioButton</zorder>
-    </widget>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="codeGenerationGroupBox">
-     <property name="title">
-      <string>Code Generation</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <widget class="QCheckBox" name="retranslateCheckBox">
-        <property name="text">
-         <string>Support for changing languages at runtime</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="includeQtModuleCheckBox">
-        <property name="text">
-         <string>Use Qt module name in #include-directive</string>
-        </property>
-       </widget>
-      </item>
-      <item>
-       <widget class="QCheckBox" name="addQtVersionCheckBox">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>Add Qt version #ifdef for module names</string>
-        </property>
-       </widget>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item>
-    <spacer name="verticalSpacer">
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::MinimumExpanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>0</width>
-       <height>0</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-  </layout>
- </widget>
- <resources/>
- <connections/>
-</ui>
diff --git a/src/plugins/qtsupport/qtsupport.qbs b/src/plugins/qtsupport/qtsupport.qbs
index a2aa541933..40bbafd92b 100644
--- a/src/plugins/qtsupport/qtsupport.qbs
+++ b/src/plugins/qtsupport/qtsupport.qbs
@@ -64,7 +64,6 @@ Project {
             "codegensettings.h",
             "codegensettingspage.cpp",
             "codegensettingspage.h",
-            "codegensettingspagewidget.ui",
             "qtbuildaspects.cpp",
             "qtbuildaspects.h",
             "qtconfigwidget.cpp",