From 57b32ed7737c588b51135a649675ec17f0c3bf69 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 30 Sep 2022 10:27:20 +0200 Subject: [PATCH] CppEditor: Inline cpppreprocessordialog.ui Change-Id: I2941e6fd3da93d1a71fb7d98e6d39634ae957d42 Reviewed-by: Alessandro Portale Reviewed-by: --- src/plugins/cppeditor/CMakeLists.txt | 2 +- src/plugins/cppeditor/cppeditor.qbs | 1 - .../cppeditor/cpppreprocessordialog.cpp | 48 +++++++---- src/plugins/cppeditor/cpppreprocessordialog.h | 12 +-- .../cppeditor/cpppreprocessordialog.ui | 81 ------------------- 5 files changed, 41 insertions(+), 103 deletions(-) delete mode 100644 src/plugins/cppeditor/cpppreprocessordialog.ui diff --git a/src/plugins/cppeditor/CMakeLists.txt b/src/plugins/cppeditor/CMakeLists.txt index 66c81ebc5ca..98395e52b97 100644 --- a/src/plugins/cppeditor/CMakeLists.txt +++ b/src/plugins/cppeditor/CMakeLists.txt @@ -65,7 +65,7 @@ add_qtc_plugin(CppEditor cppoutlinemodel.cpp cppoutlinemodel.h cppparsecontext.cpp cppparsecontext.h cpppointerdeclarationformatter.cpp cpppointerdeclarationformatter.h - cpppreprocessordialog.cpp cpppreprocessordialog.h cpppreprocessordialog.ui + cpppreprocessordialog.cpp cpppreprocessordialog.h cppprojectfile.cpp cppprojectfile.h cppprojectfilecategorizer.cpp cppprojectfilecategorizer.h cppprojectinfogenerator.cpp cppprojectinfogenerator.h diff --git a/src/plugins/cppeditor/cppeditor.qbs b/src/plugins/cppeditor/cppeditor.qbs index 1eb2755b390..5cb82d12a69 100644 --- a/src/plugins/cppeditor/cppeditor.qbs +++ b/src/plugins/cppeditor/cppeditor.qbs @@ -150,7 +150,6 @@ QtcPlugin { "cppprojectpartchooser.h", "cpppreprocessordialog.cpp", "cpppreprocessordialog.h", - "cpppreprocessordialog.ui", "cppprojectfile.cpp", "cppprojectfile.h", "cppprojectfilecategorizer.cpp", diff --git a/src/plugins/cppeditor/cpppreprocessordialog.cpp b/src/plugins/cppeditor/cpppreprocessordialog.cpp index 1b9aedcc575..a7c1a6cddad 100644 --- a/src/plugins/cppeditor/cpppreprocessordialog.cpp +++ b/src/plugins/cppeditor/cpppreprocessordialog.cpp @@ -2,7 +2,6 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "cpppreprocessordialog.h" -#include "ui_cpppreprocessordialog.h" #include "cppeditorwidget.h" #include "cppeditorconstants.h" @@ -10,28 +9,47 @@ #include -using namespace CppEditor::Internal; +#include + +#include + +#include + +using namespace Utils; + +namespace CppEditor::Internal { CppPreProcessorDialog::CppPreProcessorDialog(const QString &filePath, QWidget *parent) : QDialog(parent) - , m_ui(new Ui::CppPreProcessorDialog()) , m_filePath(filePath) { - m_ui->setupUi(this); - m_ui->editorLabel->setText(m_ui->editorLabel->text().arg(Utils::FilePath::fromString(m_filePath).fileName())); - m_ui->editWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); - - decorateCppEditor(m_ui->editWidget); + resize(400, 300); + setWindowTitle(tr("Additional C++ Preprocessor Directives")); const QString key = Constants::EXTRA_PREPROCESSOR_DIRECTIVES + m_filePath; const QString directives = ProjectExplorer::SessionManager::value(key).toString(); - m_ui->editWidget->setPlainText(directives); + + m_editWidget = new TextEditor::SnippetEditorWidget; + m_editWidget->setVerticalScrollBarPolicy(Qt::ScrollBarAsNeeded); + m_editWidget->setPlainText(directives); + decorateCppEditor(m_editWidget); + + auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); + + using namespace Layouting; + + Column { + tr("Additional C++ Preprocessor Directives for %1:") + .arg(Utils::FilePath::fromString(m_filePath).fileName()), + m_editWidget, + buttonBox, + }.attachTo(this); + + connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); } -CppPreProcessorDialog::~CppPreProcessorDialog() -{ - delete m_ui; -} +CppPreProcessorDialog::~CppPreProcessorDialog() = default; int CppPreProcessorDialog::exec() { @@ -46,5 +64,7 @@ int CppPreProcessorDialog::exec() QString CppPreProcessorDialog::extraPreprocessorDirectives() const { - return m_ui->editWidget->toPlainText(); + return m_editWidget->toPlainText(); } + +} // CppEditor::Internal diff --git a/src/plugins/cppeditor/cpppreprocessordialog.h b/src/plugins/cppeditor/cpppreprocessordialog.h index d57b4d56275..6dcd69f1821 100644 --- a/src/plugins/cppeditor/cpppreprocessordialog.h +++ b/src/plugins/cppeditor/cpppreprocessordialog.h @@ -6,9 +6,9 @@ #include #include -namespace CppEditor { -namespace Internal { -namespace Ui { class CppPreProcessorDialog; } +namespace TextEditor { class SnippetEditorWidget; } + +namespace CppEditor::Internal { class CppPreProcessorDialog : public QDialog { @@ -23,10 +23,10 @@ public: QString extraPreprocessorDirectives() const; private: - Ui::CppPreProcessorDialog *m_ui; const QString m_filePath; const QString m_projectPartId; + + TextEditor::SnippetEditorWidget *m_editWidget; }; -} // namespace Internal -} // namespace CppEditor +} // CppEditor::Internal diff --git a/src/plugins/cppeditor/cpppreprocessordialog.ui b/src/plugins/cppeditor/cpppreprocessordialog.ui deleted file mode 100644 index 4dbcd968b8c..00000000000 --- a/src/plugins/cppeditor/cpppreprocessordialog.ui +++ /dev/null @@ -1,81 +0,0 @@ - - - CppEditor::Internal::CppPreProcessorDialog - - - - 0 - 0 - 400 - 300 - - - - Additional C++ Preprocessor Directives - - - - - - Additional C++ Preprocessor Directives for %1: - - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - TextEditor::SnippetEditorWidget - QPlainTextEdit -
texteditor/snippets/snippeteditor.h
- - - - - - buttonBox - accepted() - CppEditor::Internal::CppPreProcessorDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - CppEditor::Internal::CppPreProcessorDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - -