diff --git a/src/libs/utils/CMakeLists.txt b/src/libs/utils/CMakeLists.txt index 9ad21c03bbf..d76b5339ed0 100644 --- a/src/libs/utils/CMakeLists.txt +++ b/src/libs/utils/CMakeLists.txt @@ -135,7 +135,7 @@ add_qtc_library(Utils qtcprocess.cpp qtcprocess.h qtcsettings.cpp qtcsettings.h reloadpromptutils.cpp reloadpromptutils.h - removefiledialog.cpp removefiledialog.h removefiledialog.ui + removefiledialog.cpp removefiledialog.h runextensions.cpp runextensions.h savefile.cpp savefile.h scopedswap.h diff --git a/src/libs/utils/removefiledialog.cpp b/src/libs/utils/removefiledialog.cpp index edc9f57dbf3..596029e75e6 100644 --- a/src/libs/utils/removefiledialog.cpp +++ b/src/libs/utils/removefiledialog.cpp @@ -24,36 +24,62 @@ ****************************************************************************/ #include "removefiledialog.h" -#include "ui_removefiledialog.h" #include "filepath.h" +#include "layoutbuilder.h" + +#include +#include +#include +#include namespace Utils { -RemoveFileDialog::RemoveFileDialog(const FilePath &filePath, QWidget *parent) : - QDialog(parent), - m_ui(new Ui::RemoveFileDialog) +RemoveFileDialog::RemoveFileDialog(const FilePath &filePath, QWidget *parent) + : QDialog(parent) { - m_ui->setupUi(this); - m_ui->fileNameLabel->setText(filePath.toUserOutput()); + setWindowTitle(tr("Remove File")); + resize(514, 159); - // TODO - m_ui->removeVCCheckBox->setVisible(false); + QFont font; + font.setFamilies({"Courier New"}); + + auto fileNameLabel = new QLabel(filePath.toUserOutput()); + fileNameLabel->setFont(font); + fileNameLabel->setWordWrap(true); + + m_deleteFileCheckBox = new QCheckBox(tr("&Delete file permanently")); + + auto removeVCCheckBox = new QCheckBox(tr("&Remove from version control")); + removeVCCheckBox->setVisible(false); // TODO + + auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); + + using namespace Layouting; + + Column { + tr("File to remove:"), + fileNameLabel, + Space(10), + m_deleteFileCheckBox, + removeVCCheckBox, + buttonBox + }.attachTo(this); + + connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); } -RemoveFileDialog::~RemoveFileDialog() -{ - delete m_ui; -} +RemoveFileDialog::~RemoveFileDialog() = default; void RemoveFileDialog::setDeleteFileVisible(bool visible) { - m_ui->deleteFileCheckBox->setVisible(visible); + m_deleteFileCheckBox->setVisible(visible); } bool RemoveFileDialog::isDeleteFileChecked() const { - return m_ui->deleteFileCheckBox->isChecked(); + return m_deleteFileCheckBox->isChecked(); } } // Utils diff --git a/src/libs/utils/removefiledialog.h b/src/libs/utils/removefiledialog.h index e361230d88b..4f68d37137a 100644 --- a/src/libs/utils/removefiledialog.h +++ b/src/libs/utils/removefiledialog.h @@ -29,10 +29,13 @@ #include +QT_BEGIN_NAMESPACE +class QCheckBox; +QT_END_NAMESPACE + namespace Utils { class FilePath; -namespace Ui { class RemoveFileDialog; } class QTCREATOR_UTILS_EXPORT RemoveFileDialog : public QDialog { @@ -46,7 +49,7 @@ public: bool isDeleteFileChecked() const; private: - Ui::RemoveFileDialog *m_ui; + QCheckBox *m_deleteFileCheckBox; }; } // namespace Utils diff --git a/src/libs/utils/removefiledialog.ui b/src/libs/utils/removefiledialog.ui deleted file mode 100644 index 7d0b7b9de03..00000000000 --- a/src/libs/utils/removefiledialog.ui +++ /dev/null @@ -1,140 +0,0 @@ - - - Utils::RemoveFileDialog - - - - 0 - 0 - 514 - 159 - - - - - 0 - 0 - - - - Remove File - - - - - - - 0 - 0 - - - - File to remove: - - - - - - - - 0 - 0 - - - - - Courier New - - - - placeholder - - - true - - - - - - - Qt::Vertical - - - QSizePolicy::Fixed - - - - 20 - 10 - - - - - - - - &Delete file permanently - - - - - - - &Remove from version control - - - - - - - - 0 - 0 - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - Utils::RemoveFileDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - Utils::RemoveFileDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/src/libs/utils/utils.qbs b/src/libs/utils/utils.qbs index 2e48e5205b4..bbbfc5d8bf0 100644 --- a/src/libs/utils/utils.qbs +++ b/src/libs/utils/utils.qbs @@ -261,7 +261,6 @@ Project { "reloadpromptutils.h", "removefiledialog.cpp", "removefiledialog.h", - "removefiledialog.ui", "runextensions.cpp", "runextensions.h", "savefile.cpp",