diff --git a/src/plugins/ios/CMakeLists.txt b/src/plugins/ios/CMakeLists.txt index 800a5abde46..3edd94a617c 100644 --- a/src/plugins/ios/CMakeLists.txt +++ b/src/plugins/ios/CMakeLists.txt @@ -22,7 +22,7 @@ add_qtc_plugin(Ios iostoolhandler.cpp iostoolhandler.h simulatorcontrol.cpp simulatorcontrol.h simulatorinfomodel.cpp simulatorinfomodel.h - simulatoroperationdialog.cpp simulatoroperationdialog.h simulatoroperationdialog.ui + simulatoroperationdialog.cpp simulatoroperationdialog.h ) extend_qtc_plugin(Ios diff --git a/src/plugins/ios/ios.qbs b/src/plugins/ios/ios.qbs index 2e830e66c79..ad558db90f0 100644 --- a/src/plugins/ios/ios.qbs +++ b/src/plugins/ios/ios.qbs @@ -57,6 +57,5 @@ QtcPlugin { "simulatorinfomodel.h", "simulatoroperationdialog.cpp", "simulatoroperationdialog.h", - "simulatoroperationdialog.ui" ] } diff --git a/src/plugins/ios/simulatoroperationdialog.cpp b/src/plugins/ios/simulatoroperationdialog.cpp index f69f8a67f9a..09d1a7cec4d 100644 --- a/src/plugins/ios/simulatoroperationdialog.cpp +++ b/src/plugins/ios/simulatoroperationdialog.cpp @@ -24,31 +24,55 @@ ****************************************************************************/ #include "simulatoroperationdialog.h" -#include "ui_simulatoroperationdialog.h" +#include #include #include +#include +#include #include #include +#include +#include #include namespace { Q_LOGGING_CATEGORY(iosCommon, "qtc.ios.common", QtWarningMsg) } -namespace Ios { -namespace Internal { +namespace Ios::Internal { SimulatorOperationDialog::SimulatorOperationDialog(QWidget *parent) : // TODO: Maximize buttong only because of QTBUG-41932 - QDialog(parent,Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMaximizeButtonHint), - m_ui(new Ui::SimulatorOperationDialog) + QDialog(parent,Qt::CustomizeWindowHint | Qt::WindowTitleHint | Qt::WindowMaximizeButtonHint) { - m_ui->setupUi(this); + resize(580, 320); + setModal(true); + setWindowTitle(tr("Simulator Operation Status")); + + auto messageEdit = new QPlainTextEdit; + messageEdit->setReadOnly(true); + + m_progressBar = new QProgressBar; + m_progressBar->setMaximum(0); + m_progressBar->setValue(-1); + + m_buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); m_formatter = new Utils::OutputFormatter; - m_formatter->setPlainTextEdit(m_ui->messageEdit); + m_formatter->setPlainTextEdit(messageEdit); + + using namespace Utils::Layouting; + + Column { + messageEdit, + m_progressBar, + m_buttonBox + }.attachTo(this); + + connect(m_buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(m_buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); } SimulatorOperationDialog::~SimulatorOperationDialog() @@ -68,7 +92,6 @@ SimulatorOperationDialog::~SimulatorOperationDialog() } delete m_formatter; - delete m_ui; } void SimulatorOperationDialog::addFutures(const QList > &futureList) @@ -114,13 +137,12 @@ void SimulatorOperationDialog::addMessage(const SimulatorInfo &siminfo, void SimulatorOperationDialog::updateInputs() { bool enableOk = m_futureWatchList.isEmpty(); - m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(!enableOk); - m_ui->buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enableOk); + m_buttonBox->button(QDialogButtonBox::Cancel)->setEnabled(!enableOk); + m_buttonBox->button(QDialogButtonBox::Ok)->setEnabled(enableOk); if (enableOk) { addMessage(tr("Done."), Utils::NormalMessageFormat); - m_ui->progressBar->setMaximum(1); // Stop progress bar. + m_progressBar->setMaximum(1); // Stop progress bar. } } -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/simulatoroperationdialog.h b/src/plugins/ios/simulatoroperationdialog.h index de689d04542..3c87b6b9702 100644 --- a/src/plugins/ios/simulatoroperationdialog.h +++ b/src/plugins/ios/simulatoroperationdialog.h @@ -33,12 +33,14 @@ #include #include +QT_BEGIN_NAMESPACE +class QDialogButtonBox; +class QProgressBar; +QT_END_NAMESPACE + namespace Utils { class OutputFormatter; } -namespace Ios { -namespace Internal { - -namespace Ui { class SimulatorOperationDialog; } +namespace Ios::Internal { class SimulatorOperationDialog : public QDialog { @@ -56,11 +58,11 @@ public: private: void updateInputs(); -private: - Ui::SimulatorOperationDialog *m_ui = nullptr; Utils::OutputFormatter *m_formatter = nullptr; + QList *> m_futureWatchList; + QProgressBar *m_progressBar; + QDialogButtonBox *m_buttonBox; }; -} // namespace Internal -} // namespace Ios +} // Ios::Internal diff --git a/src/plugins/ios/simulatoroperationdialog.ui b/src/plugins/ios/simulatoroperationdialog.ui deleted file mode 100644 index 863ed761450..00000000000 --- a/src/plugins/ios/simulatoroperationdialog.ui +++ /dev/null @@ -1,87 +0,0 @@ - - - Ios::Internal::SimulatorOperationDialog - - - - 0 - 0 - 580 - 320 - - - - Simulator Operation Status - - - true - - - - - - true - - - - - - - 0 - - - -1 - - - - - - - true - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - Ios::Internal::SimulatorOperationDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - Ios::Internal::SimulatorOperationDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - -