Perforce: ChangeNumberDialog: Use Layouting

Change-Id: Ib18c4b2533b87f7afcd5f61053b487a3c35427a2
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>

1 files changed, 28 insertions, 7 deletions

diff --git a/src/plugins/perforce/changenumberdialog.cpp b/src/plugins/perforce/changenumberdialog.cpp
index b8d86a0566..9b666067f1 100644
--- a/src/plugins/perforce/changenumberdialog.cpp
+++ b/src/plugins/perforce/changenumberdialog.cpp
@@ -3,20 +3,41 @@
 
 #include "changenumberdialog.h"
 
+#include <utils/layoutbuilder.h>
+
+#include <QDialogButtonBox>
 #include <QIntValidator>
+#include <QLineEdit>
 
 using namespace Perforce::Internal;
 
-ChangeNumberDialog::ChangeNumberDialog(QWidget *parent) : QDialog(parent)
+ChangeNumberDialog::ChangeNumberDialog(QWidget *parent)
+    : QDialog(parent)
+    , m_lineEdit(new QLineEdit(this))
 {
-    m_ui.setupUi(this);
-    m_ui.numberLineEdit->setValidator(new QIntValidator(0, 1000000, this));
+    setWindowTitle(tr("Change Number"));
+
+    m_lineEdit->setValidator(new QIntValidator(0, 1000000, this));
+
+    QDialogButtonBox *buttonBox = new QDialogButtonBox(this);
+    buttonBox->setOrientation(Qt::Horizontal);
+    buttonBox->setStandardButtons(QDialogButtonBox::Cancel | QDialogButtonBox::Ok);
+    connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept);
+    connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
+
+    using namespace Utils::Layouting;
+
+    Column {
+        Row { tr("Change number:"), m_lineEdit },
+        buttonBox
+    }.attachTo(this);
+
+    resize(320, 75);
 }
 
 int ChangeNumberDialog::number() const
 {
-    if (m_ui.numberLineEdit->text().isEmpty())
-        return -1;
-    bool ok;
-    return m_ui.numberLineEdit->text().toInt(&ok);
+    bool ok = false;
+    const int number = m_lineEdit->text().toInt(&ok);
+    return ok ? number : -1;
 }