ClangTools: Inline project settings widget

Allows nicer translatable strings. Also remove the extra white space in the outer layout. Change-Id: I9b7c82f932f8b0f0a7fc78a3aba6d2ea292dc670 Reviewed-by: Christian Stenger <christian.stenger@qt.io>
2021-12-02 10:36:56 +01:00
parent d097314873
commit 251b47c834
6 changed files with 93 additions and 188 deletions
--- a/src/plugins/clangtools/CMakeLists.txt
+++ b/src/plugins/clangtools/CMakeLists.txt
@@ -23,7 +23,7 @@ add_qtc_plugin(ClangTools
    clangtoolslogfilereader.cpp clangtoolslogfilereader.h
    clangtoolsplugin.cpp clangtoolsplugin.h
    clangtoolsprojectsettings.cpp clangtoolsprojectsettings.h
-    clangtoolsprojectsettingswidget.cpp clangtoolsprojectsettingswidget.h clangtoolsprojectsettingswidget.ui
+    clangtoolsprojectsettingswidget.cpp clangtoolsprojectsettingswidget.h
    clangtoolssettings.cpp clangtoolssettings.h
    clangtoolsutils.cpp clangtoolsutils.h
    clazychecks.ui
--- a/src/plugins/clangtools/clangtools.pro
+++ b/src/plugins/clangtools/clangtools.pro
@@ -69,7 +69,6 @@ HEADERS += \

 FORMS += \
    clangselectablefilesdialog.ui \
-    clangtoolsprojectsettingswidget.ui \
    clazychecks.ui \
    filterdialog.ui \
    runsettingswidget.ui \
--- a/src/plugins/clangtools/clangtools.qbs
+++ b/src/plugins/clangtools/clangtools.qbs
@@ -54,7 +54,6 @@ QtcPlugin {
        "clangtoolsprojectsettings.h",
        "clangtoolsprojectsettingswidget.cpp",
        "clangtoolsprojectsettingswidget.h",
-        "clangtoolsprojectsettingswidget.ui",
        "clangtoolssettings.cpp",
        "clangtoolssettings.h",
        "clangtoolsutils.cpp",
--- a/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp
+++ b/src/plugins/clangtools/clangtoolsprojectsettingswidget.cpp
@@ -24,22 +24,27 @@
 ****************************************************************************/

 #include "clangtoolsprojectsettingswidget.h"
-#include "ui_clangtoolsprojectsettingswidget.h"

 #include "clangtool.h"
 #include "clangtoolsconstants.h"
 #include "clangtoolsprojectsettings.h"
 #include "clangtoolssettings.h"
 #include "clangtoolsutils.h"
+#include "runsettingswidget.h"

 #include <coreplugin/icore.h>
+
+#include <cppeditor/clangdiagnosticconfigsmodel.h>
 #include <cppeditor/clangdiagnosticconfigsselectionwidget.h>

+#include <utils/layoutbuilder.h>
 #include <utils/qtcassert.h>

 #include <QAbstractTableModel>
-
-#include <cppeditor/clangdiagnosticconfigsmodel.h>
+#include <QComboBox>
+#include <QLabel>
+#include <QPushButton>
+#include <QTreeView>

 namespace ClangTools {
 namespace Internal {
@@ -65,21 +70,64 @@ private:
    SuppressedDiagnosticsList m_diagnostics;
 };

-enum { UseGlobalSettings, UseCustomSettings }; // Values in sync with m_ui->globalCustomComboBox
+enum { UseGlobalSettings, UseCustomSettings }; // Values in sync with m_globalCustomComboBox

 ProjectSettingsWidget::ProjectSettingsWidget(ProjectExplorer::Project *project, QWidget *parent) :
    QWidget(parent),
-    m_ui(new Ui::ProjectSettingsWidget)
-  , m_projectSettings(ClangToolsProjectSettings::getSettings(project))
+    m_projectSettings(ClangToolsProjectSettings::getSettings(project))
 {
-    m_ui->setupUi(this);
+    m_globalCustomComboBox = new QComboBox;
+    m_globalCustomComboBox->addItem(tr("Use Global Settings"));
+    m_globalCustomComboBox->addItem(tr("Use Customized Settings"));
+
+    m_restoreGlobal = new QPushButton(tr("Restore Global Settings"));
+
+    auto gotoGlobalSettingsLabel =
+            new QLabel("<a href=\"target\">" + tr("Open Global Settings") + "</a>");
+
+    auto gotoAnalyzerModeLabel =
+            new QLabel("<a href=\"target\">" + tr("Go to Analyzer") + "</a>");
+
+    m_runSettingsWidget = new ClangTools::Internal::RunSettingsWidget(this);
+
+    m_diagnosticsView = new QTreeView;
+    m_diagnosticsView->setSelectionMode(QAbstractItemView::SingleSelection);
+
+    m_removeSelectedButton = new QPushButton(tr("Remove Selected"), this);
+    m_removeAllButton = new QPushButton(tr("Remove All"));
+
+    using namespace Utils::Layouting;
+
+    Column {
+        Row {
+            m_globalCustomComboBox,
+            m_restoreGlobal,
+            gotoGlobalSettingsLabel,
+            Stretch(),
+            gotoAnalyzerModeLabel
+        },
+
+        m_runSettingsWidget,
+
+        Group {
+            Title(tr("Suppressed diagnostics")),
+            Row {
+                m_diagnosticsView,
+                Column {
+                    m_removeSelectedButton,
+                    m_removeAllButton,
+                    Stretch()
+                }
+            }
+        }
+    }.attachTo(this, false);

    // Use global/custom settings combo box
    const int globalOrCustomIndex = m_projectSettings->useGlobalSettings() ? UseGlobalSettings
                                                                           : UseCustomSettings;
-    m_ui->globalCustomComboBox->setCurrentIndex(globalOrCustomIndex);
+    m_globalCustomComboBox->setCurrentIndex(globalOrCustomIndex);
    onGlobalCustomChanged(globalOrCustomIndex);
-    connect(m_ui->globalCustomComboBox,
+    connect(m_globalCustomComboBox,
            QOverload<int>::of(&QComboBox::currentIndexChanged),
            this,
            QOverload<int>::of(&ProjectSettingsWidget::onGlobalCustomChanged));
@@ -89,27 +137,27 @@ ProjectSettingsWidget::ProjectSettingsWidget(ProjectExplorer::Project *project,
            &ClangToolsSettings::changed,
            this,
            QOverload<>::of(&ProjectSettingsWidget::onGlobalCustomChanged));
-    connect(m_ui->restoreGlobal, &QPushButton::clicked, this, [this]() {
-        m_ui->runSettingsWidget->fromSettings(ClangToolsSettings::instance()->runSettings());
+    connect(m_restoreGlobal, &QPushButton::clicked, this, [this]() {
+        m_runSettingsWidget->fromSettings(ClangToolsSettings::instance()->runSettings());
    });

    // Links
-    connect(m_ui->gotoGlobalSettingsLabel, &QLabel::linkActivated, [](const QString &) {
+    connect(gotoGlobalSettingsLabel, &QLabel::linkActivated, [](const QString &) {
        Core::ICore::showOptionsDialog(ClangTools::Constants::SETTINGS_PAGE_ID);
    });

-    connect(m_ui->gotoAnalyzerModeLabel, &QLabel::linkActivated, [](const QString &) {
+    connect(gotoAnalyzerModeLabel, &QLabel::linkActivated, [](const QString &) {
        ClangTool::instance()->selectPerspective();
    });

    // Run options
-    connect(m_ui->runSettingsWidget, &RunSettingsWidget::changed, [this]() {
+    connect(m_runSettingsWidget, &RunSettingsWidget::changed, [this]() {
        // Save project run settings
-        m_projectSettings->setRunSettings(m_ui->runSettingsWidget->toSettings());
+        m_projectSettings->setRunSettings(m_runSettingsWidget->toSettings());

        // Save global custom configs
        const CppEditor::ClangDiagnosticConfigs configs
-            = m_ui->runSettingsWidget->diagnosticSelectionWidget()->customConfigs();
+            = m_runSettingsWidget->diagnosticSelectionWidget()->customConfigs();
        ClangToolsSettings::instance()->setDiagnosticConfigs(configs);
        ClangToolsSettings::instance()->writeSettings();
    });
@@ -122,26 +170,21 @@ ProjectSettingsWidget::ProjectSettingsWidget(ProjectExplorer::Project *project,
                    model->setDiagnostics(m_projectSettings->suppressedDiagnostics());
                    updateButtonStates();
            });
-    m_ui->diagnosticsView->setModel(model);
+    m_diagnosticsView->setModel(model);
    updateButtonStates();
-    connect(m_ui->diagnosticsView->selectionModel(), &QItemSelectionModel::selectionChanged,
+    connect(m_diagnosticsView->selectionModel(), &QItemSelectionModel::selectionChanged,
            [this](const QItemSelection &, const QItemSelection &) {
                updateButtonStateRemoveSelected();
            });
-    connect(m_ui->removeSelectedButton, &QAbstractButton::clicked,
+    connect(m_removeSelectedButton, &QAbstractButton::clicked,
            [this](bool) { removeSelected(); });
-    connect(m_ui->removeAllButton, &QAbstractButton::clicked,
+    connect(m_removeAllButton, &QAbstractButton::clicked,
            [this](bool) { m_projectSettings->removeAllSuppressedDiagnostics();});
 }

-ProjectSettingsWidget::~ProjectSettingsWidget()
-{
-    delete m_ui;
-}
-
 void ProjectSettingsWidget::onGlobalCustomChanged()
 {
-    onGlobalCustomChanged(m_ui->globalCustomComboBox->currentIndex());
+    onGlobalCustomChanged(m_globalCustomComboBox->currentIndex());
 }

 void ProjectSettingsWidget::onGlobalCustomChanged(int index)
@@ -149,9 +192,9 @@ void ProjectSettingsWidget::onGlobalCustomChanged(int index)
    const bool useGlobal = index == UseGlobalSettings;
    const RunSettings runSettings = useGlobal ? ClangToolsSettings::instance()->runSettings()
                                              : m_projectSettings->runSettings();
-    m_ui->runSettingsWidget->fromSettings(runSettings);
-    m_ui->runSettingsWidget->setEnabled(!useGlobal);
-    m_ui->restoreGlobal->setEnabled(!useGlobal);
+    m_runSettingsWidget->fromSettings(runSettings);
+    m_runSettingsWidget->setEnabled(!useGlobal);
+    m_restoreGlobal->setEnabled(!useGlobal);

    m_projectSettings->setUseGlobalSettings(useGlobal);
 }
@@ -164,22 +207,22 @@ void ProjectSettingsWidget::updateButtonStates()

 void ProjectSettingsWidget::updateButtonStateRemoveSelected()
 {
-    const auto selectedRows = m_ui->diagnosticsView->selectionModel()->selectedRows();
+    const auto selectedRows = m_diagnosticsView->selectionModel()->selectedRows();
    QTC_ASSERT(selectedRows.count() <= 1, return);
-    m_ui->removeSelectedButton->setEnabled(!selectedRows.isEmpty());
+    m_removeSelectedButton->setEnabled(!selectedRows.isEmpty());
 }

 void ProjectSettingsWidget::updateButtonStateRemoveAll()
 {
-    m_ui->removeAllButton->setEnabled(m_ui->diagnosticsView->model()->rowCount() > 0);
+    m_removeAllButton->setEnabled(m_diagnosticsView->model()->rowCount() > 0);
 }

 void ProjectSettingsWidget::removeSelected()
 {
-    const auto selectedRows = m_ui->diagnosticsView->selectionModel()->selectedRows();
+    const auto selectedRows = m_diagnosticsView->selectionModel()->selectedRows();
    QTC_ASSERT(selectedRows.count() == 1, return);
    const auto * const model
-            = static_cast<SuppressedDiagnosticsModel *>(m_ui->diagnosticsView->model());
+            = static_cast<SuppressedDiagnosticsModel *>(m_diagnosticsView->model());
    m_projectSettings->removeSuppressedDiagnostic(model->diagnosticAt(selectedRows.first().row()));
 }

--- a/src/plugins/clangtools/clangtoolsprojectsettingswidget.h
+++ b/src/plugins/clangtools/clangtoolsprojectsettingswidget.h
@@ -27,13 +27,19 @@

 #include <QWidget>

+QT_BEGIN_NAMESPACE
+class QComboBox;
+class QPushButton;
+class QTreeView;
+QT_END_NAMESPACE
+
 namespace ProjectExplorer { class Project; }

 namespace ClangTools {
 namespace Internal {
-class ClangToolsProjectSettings;

-namespace Ui { class ProjectSettingsWidget; }
+class ClangToolsProjectSettings;
+class RunSettingsWidget;

 class ProjectSettingsWidget : public QWidget
 {
@@ -41,7 +47,6 @@ class ProjectSettingsWidget : public QWidget

 public:
    explicit ProjectSettingsWidget(ProjectExplorer::Project *project, QWidget *parent = nullptr);
-    ~ProjectSettingsWidget() override;

 private:
    void onGlobalCustomChanged();
@@ -52,7 +57,13 @@ private:
    void updateButtonStateRemoveAll();
    void removeSelected();

-    Ui::ProjectSettingsWidget *const m_ui;
+    QComboBox *m_globalCustomComboBox;
+    QPushButton *m_restoreGlobal;
+    RunSettingsWidget *m_runSettingsWidget;
+    QTreeView *m_diagnosticsView;
+    QPushButton *m_removeSelectedButton;
+    QPushButton *m_removeAllButton;
+
    QSharedPointer<ClangToolsProjectSettings> const m_projectSettings;
 };

--- a/src/plugins/clangtools/clangtoolsprojectsettingswidget.ui
+++ b/src/plugins/clangtools/clangtoolsprojectsettingswidget.ui
@@ -1,147 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<ui version="4.0">
- <class>ClangTools::Internal::ProjectSettingsWidget</class>
- <widget class="QWidget" name="ClangTools::Internal::ProjectSettingsWidget">
-  <property name="geometry">
-   <rect>
-    <x>0</x>
-    <y>0</y>
-    <width>634</width>
-    <height>399</height>
-   </rect>
-  </property>
-  <property name="windowTitle">
-   <string/>
-  </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
-   <item>
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
-      <widget class="QComboBox" name="globalCustomComboBox">
-       <item>
-        <property name="text">
-         <string>Use Global Settings</string>
-        </property>
-       </item>
-       <item>
-        <property name="text">
-         <string>Use Customized Settings</string>
-        </property>
-       </item>
-      </widget>
-     </item>
-     <item>
-      <widget class="QPushButton" name="restoreGlobal">
-       <property name="text">
-        <string>Restore Global Settings</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QLabel" name="gotoGlobalSettingsLabel">
-       <property name="text">
-        <string>&lt;a href=&quot;target&quot;&gt;Open Global Settings&lt;/a&gt;</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer name="horizontalSpacer">
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-     <item>
-      <widget class="QLabel" name="gotoAnalyzerModeLabel">
-       <property name="text">
-        <string>&lt;a href=&quot;target&quot;&gt;Go to Analyzer&lt;/a&gt;</string>
-       </property>
-      </widget>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="ClangTools::Internal::RunSettingsWidget" name="runSettingsWidget" native="true"/>
-   </item>
-   <item>
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>Suppressed diagnostics</string>
-     </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
-      <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_2">
-        <item>
-         <widget class="QTreeView" name="diagnosticsView">
-          <property name="selectionMode">
-           <enum>QAbstractItemView::SingleSelection</enum>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <layout class="QVBoxLayout" name="verticalLayout">
-          <item>
-           <widget class="QPushButton" name="removeSelectedButton">
-            <property name="text">
-             <string>Remove Selected</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <widget class="QPushButton" name="removeAllButton">
-            <property name="text">
-             <string>Remove All</string>
-            </property>
-           </widget>
-          </item>
-          <item>
-           <spacer name="verticalSpacer">
-            <property name="orientation">
-             <enum>Qt::Vertical</enum>
-            </property>
-            <property name="sizeHint" stdset="0">
-             <size>
-              <width>20</width>
-              <height>40</height>
-             </size>
-            </property>
-           </spacer>
-          </item>
-         </layout>
-        </item>
-       </layout>
-      </item>
-     </layout>
-    </widget>
-   </item>
-  </layout>
- </widget>
- <customwidgets>
-  <customwidget>
-   <class>ClangTools::Internal::RunSettingsWidget</class>
-   <extends>QWidget</extends>
-   <header>clangtools/runsettingswidget.h</header>
-   <container>1</container>
-  </customwidget>
- </customwidgets>
- <resources/>
- <connections/>
-</ui>