diff options
author | hjk <hjk@qt.io> | 2022-07-12 17:29:31 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2022-07-13 11:22:36 +0000 |
commit | 04befed8c3b5682da17c059c49cbc91abbf8adb5 (patch) | |
tree | 0d7fb5bdeaea767b2b5815aaf15b649085cfcf65 /src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp | |
parent | b1f9cdac35afc4428a1af4a064395a88a5162854 (diff) |
CppEditor: Inline cppquickfixprojectsettingswidget.ui
A practically empty grid.
Change-Id: I6d23794244519de4c019aab6530482e28de964c5
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
Diffstat (limited to 'src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp')
-rw-r--r-- | src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp | 49 |
1 files changed, 29 insertions, 20 deletions
diff --git a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp b/src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp index 62299a937d..c1dd4e0e6a 100644 --- a/src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp +++ b/src/plugins/cppeditor/cppquickfixprojectsettingswidget.cpp @@ -24,36 +24,46 @@ ****************************************************************************/ #include "cppquickfixprojectsettingswidget.h" + #include "cppeditorconstants.h" #include "cppquickfixsettingswidget.h" -#include "ui_cppquickfixprojectsettingswidget.h" #include <QFile> +#include <QGridLayout> +#include <QPushButton> -using namespace CppEditor::Internal; +namespace CppEditor::Internal { CppQuickFixProjectSettingsWidget::CppQuickFixProjectSettingsWidget(ProjectExplorer::Project *project, QWidget *parent) : ProjectExplorer::ProjectSettingsWidget(parent) - , ui(new Ui::CppQuickFixProjectSettingsWidget) { setGlobalSettingsId(CppEditor::Constants::QUICK_FIX_SETTINGS_ID); m_projectSettings = CppQuickFixProjectsSettings::getSettings(project); - ui->setupUi(this); - m_settingsWidget = new CppEditor::Internal::CppQuickFixSettingsWidget(this); + + m_pushButton = new QPushButton(this); + + auto gridLayout = new QGridLayout(this); + gridLayout->setContentsMargins(0, 0, 0, 0); + gridLayout->addWidget(m_pushButton, 1, 0, 1, 1); + auto layout = new QVBoxLayout(); + gridLayout->addLayout(layout, 2, 0, 1, 2); + + m_settingsWidget = new CppQuickFixSettingsWidget(this); m_settingsWidget->loadSettings(m_projectSettings->getSettings()); + if (QLayout *layout = m_settingsWidget->layout()) layout->setContentsMargins(0, 0, 0, 0); - ui->layout->addWidget(m_settingsWidget); + layout->addWidget(m_settingsWidget); connect(this, &ProjectSettingsWidget::useGlobalSettingsChanged, this, &CppQuickFixProjectSettingsWidget::currentItemChanged); setUseGlobalSettings(m_projectSettings->isUsingGlobalSettings()); currentItemChanged(m_projectSettings->useCustomSettings()); - connect(ui->pushButton_custom, &QAbstractButton::clicked, + connect(m_pushButton, &QAbstractButton::clicked, this, &CppQuickFixProjectSettingsWidget::buttonCustomClicked); - connect(m_settingsWidget, &CppEditor::Internal::CppQuickFixSettingsWidget::settingsChanged, this, + connect(m_settingsWidget, &CppQuickFixSettingsWidget::settingsChanged, this, [this] { m_settingsWidget->saveSettings(m_projectSettings->getSettings()); if (!useGlobalSettings()) @@ -61,28 +71,25 @@ CppQuickFixProjectSettingsWidget::CppQuickFixProjectSettingsWidget(ProjectExplor }); } -CppQuickFixProjectSettingsWidget::~CppQuickFixProjectSettingsWidget() -{ - delete ui; -} +CppQuickFixProjectSettingsWidget::~CppQuickFixProjectSettingsWidget() = default; void CppQuickFixProjectSettingsWidget::currentItemChanged(bool useGlobalSettings) { if (useGlobalSettings) { const auto &path = m_projectSettings->filePathOfSettingsFile(); - ui->pushButton_custom->setToolTip(tr("Custom settings are saved in a file. If you use the " - "global settings, you can delete that file.")); - ui->pushButton_custom->setText(tr("Delete Custom Settings File")); - ui->pushButton_custom->setVisible(!path.isEmpty() && path.exists()); + m_pushButton->setToolTip(tr("Custom settings are saved in a file. If you use the " + "global settings, you can delete that file.")); + m_pushButton->setText(tr("Delete Custom Settings File")); + m_pushButton->setVisible(!path.isEmpty() && path.exists()); m_projectSettings->useGlobalSettings(); } else /*Custom*/ { if (!m_projectSettings->useCustomSettings()) { setUseGlobalSettings(!m_projectSettings->useCustomSettings()); return; } - ui->pushButton_custom->setToolTip(tr("Resets all settings to the global settings.")); - ui->pushButton_custom->setText(tr("Reset to Global")); - ui->pushButton_custom->setVisible(true); + m_pushButton->setToolTip(tr("Resets all settings to the global settings.")); + m_pushButton->setText(tr("Reset to Global")); + m_pushButton->setVisible(true); // otherwise you change the comboBox and exit and have no custom settings: m_projectSettings->saveOwnSettings(); } @@ -94,10 +101,12 @@ void CppQuickFixProjectSettingsWidget::buttonCustomClicked() if (useGlobalSettings()) { // delete file QFile::remove(m_projectSettings->filePathOfSettingsFile().toString()); - ui->pushButton_custom->setVisible(false); + m_pushButton->setVisible(false); } else /*Custom*/ { m_projectSettings->resetOwnSettingsToGlobal(); m_projectSettings->saveOwnSettings(); m_settingsWidget->loadSettings(m_projectSettings->getSettings()); } } + +} // CppEditor::Internal |