From cd08759fb67bc7b91e685e4948f31125c1f39a14 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 19 Aug 2022 09:54:05 +0200 Subject: [PATCH] ProjectExplorer: inline devicetestdialog.ui Change-Id: I55ff1c6bc5f870268b8fd092a2e4472da49894c7 Reviewed-by: Christian Kandeler Reviewed-by: --- src/plugins/projectexplorer/CMakeLists.txt | 2 +- .../devicesupport/devicetestdialog.cpp | 27 +++++-- .../devicesupport/devicetestdialog.ui | 71 ------------------- .../projectexplorer/projectexplorer.qbs | 2 +- 4 files changed, 22 insertions(+), 80 deletions(-) delete mode 100644 src/plugins/projectexplorer/devicesupport/devicetestdialog.ui diff --git a/src/plugins/projectexplorer/CMakeLists.txt b/src/plugins/projectexplorer/CMakeLists.txt index c271ac4f0f7..9643a33dada 100644 --- a/src/plugins/projectexplorer/CMakeLists.txt +++ b/src/plugins/projectexplorer/CMakeLists.txt @@ -58,7 +58,7 @@ add_qtc_plugin(ProjectExplorer devicesupport/deviceprocesslist.cpp devicesupport/deviceprocesslist.h devicesupport/devicesettingspage.cpp devicesupport/devicesettingspage.h devicesupport/devicesettingswidget.cpp devicesupport/devicesettingswidget.h devicesupport/devicesettingswidget.ui - devicesupport/devicetestdialog.cpp devicesupport/devicetestdialog.h devicesupport/devicetestdialog.ui + devicesupport/devicetestdialog.cpp devicesupport/devicetestdialog.h devicesupport/deviceusedportsgatherer.cpp devicesupport/deviceusedportsgatherer.h devicesupport/filetransfer.cpp devicesupport/filetransfer.h devicesupport/filetransferinterface.h diff --git a/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp b/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp index da6dbe234d9..1cf0fc8e08e 100644 --- a/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp +++ b/src/plugins/projectexplorer/devicesupport/devicetestdialog.cpp @@ -2,13 +2,15 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "devicetestdialog.h" -#include "ui_devicetestdialog.h" #include +#include #include #include +#include #include +#include #include #include @@ -23,9 +25,10 @@ public: { } - Ui::DeviceTestDialog ui; DeviceTester * const deviceTester; bool finished; + QPlainTextEdit *textEdit; + QDialogButtonBox *buttonBox; }; DeviceTestDialog::DeviceTestDialog(const IDevice::Ptr &deviceConfiguration, @@ -33,9 +36,19 @@ DeviceTestDialog::DeviceTestDialog(const IDevice::Ptr &deviceConfiguration, : QDialog(parent) , d(std::make_unique(deviceConfiguration->createDeviceTester())) { - d->ui.setupUi(this); + resize(620, 580); + d->textEdit = new QPlainTextEdit; + d->textEdit->setReadOnly(true); + d->buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel); + + using namespace Utils::Layouting; + Column { + d->textEdit, + d->buttonBox, + }.attachTo(this); d->deviceTester->setParent(this); + connect(d->buttonBox, &QDialogButtonBox::rejected, this, &DeviceTestDialog::reject); connect(d->deviceTester, &DeviceTester::progressMessage, this, &DeviceTestDialog::handleProgressMessage); connect(d->deviceTester, &DeviceTester::errorMessage, @@ -69,7 +82,7 @@ void DeviceTestDialog::handleErrorMessage(const QString &message) void DeviceTestDialog::handleTestFinished(DeviceTester::TestResult result) { d->finished = true; - d->ui.buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Close")); + d->buttonBox->button(QDialogButtonBox::Cancel)->setText(tr("Close")); if (result == DeviceTester::TestSuccess) addText(tr("Device test finished successfully."), @@ -82,13 +95,13 @@ void DeviceTestDialog::addText(const QString &text, Utils::Theme::Color color, b { Utils::Theme *theme = Utils::creatorTheme(); - QTextCharFormat format = d->ui.textEdit->currentCharFormat(); + QTextCharFormat format = d->textEdit->currentCharFormat(); format.setForeground(QBrush(theme->color(color))); QFont font = format.font(); font.setBold(bold); format.setFont(font); - d->ui.textEdit->setCurrentCharFormat(format); - d->ui.textEdit->appendPlainText(text); + d->textEdit->setCurrentCharFormat(format); + d->textEdit->appendPlainText(text); } } // namespace Internal diff --git a/src/plugins/projectexplorer/devicesupport/devicetestdialog.ui b/src/plugins/projectexplorer/devicesupport/devicetestdialog.ui deleted file mode 100644 index b640f722d47..00000000000 --- a/src/plugins/projectexplorer/devicesupport/devicetestdialog.ui +++ /dev/null @@ -1,71 +0,0 @@ - - - ProjectExplorer::Internal::DeviceTestDialog - - - - 0 - 0 - 607 - 580 - - - - Device Test - - - - - - true - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel - - - - - - - - - buttonBox - accepted() - ProjectExplorer::Internal::DeviceTestDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - ProjectExplorer::Internal::DeviceTestDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/src/plugins/projectexplorer/projectexplorer.qbs b/src/plugins/projectexplorer/projectexplorer.qbs index 0cbe00eefc5..22de85caa9f 100644 --- a/src/plugins/projectexplorer/projectexplorer.qbs +++ b/src/plugins/projectexplorer/projectexplorer.qbs @@ -218,7 +218,7 @@ Project { "deviceprocesslist.cpp", "deviceprocesslist.h", "devicesettingspage.cpp", "devicesettingspage.h", "devicesettingswidget.cpp", "devicesettingswidget.h", "devicesettingswidget.ui", - "devicetestdialog.cpp", "devicetestdialog.h", "devicetestdialog.ui", + "devicetestdialog.cpp", "devicetestdialog.h", "deviceusedportsgatherer.cpp", "deviceusedportsgatherer.h", "filetransfer.cpp", "filetransfer.h", "filetransferinterface.h",