diff --git a/src/plugins/mercurial/CMakeLists.txt b/src/plugins/mercurial/CMakeLists.txt index 915b9a8cdf0..277dd230f0c 100644 --- a/src/plugins/mercurial/CMakeLists.txt +++ b/src/plugins/mercurial/CMakeLists.txt @@ -2,7 +2,7 @@ add_qtc_plugin(Mercurial PLUGIN_DEPENDS Core TextEditor VcsBase SOURCES annotationhighlighter.cpp annotationhighlighter.h - authenticationdialog.cpp authenticationdialog.h authenticationdialog.ui + authenticationdialog.cpp authenticationdialog.h commiteditor.cpp commiteditor.h constants.h mercurialclient.cpp mercurialclient.h diff --git a/src/plugins/mercurial/authenticationdialog.cpp b/src/plugins/mercurial/authenticationdialog.cpp index e79e3d1a84e..c04fb34d655 100644 --- a/src/plugins/mercurial/authenticationdialog.cpp +++ b/src/plugins/mercurial/authenticationdialog.cpp @@ -2,39 +2,55 @@ // SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0+ OR GPL-3.0 WITH Qt-GPL-exception-1.0 #include "authenticationdialog.h" -#include "ui_authenticationdialog.h" -namespace Mercurial { -namespace Internal { +#include -AuthenticationDialog::AuthenticationDialog(const QString &username, const QString &password, QWidget *parent) : - QDialog(parent), - ui(new Ui::AuthenticationDialog) +#include +#include + +namespace Mercurial::Internal { + +AuthenticationDialog::AuthenticationDialog(const QString &username, const QString &password, QWidget *parent) + : QDialog(parent) { - ui->setupUi(this); - ui->username->setText(username); - ui->password->setText(password); + resize(312, 116); + + m_username = new QLineEdit(username); + + m_password = new QLineEdit(password); + m_password->setEchoMode(QLineEdit::Password); + + auto buttonBox = new QDialogButtonBox(QDialogButtonBox::Cancel|QDialogButtonBox::Ok); + + using namespace Utils::Layouting; + + Column { + Form { + tr("Username:"), m_username, br, + tr("Password:"), m_password + }, + buttonBox + }.attachTo(this); + + connect(buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); + connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); } -AuthenticationDialog::~AuthenticationDialog() -{ - delete ui; -} +AuthenticationDialog::~AuthenticationDialog() = default; void AuthenticationDialog::setPasswordEnabled(bool enabled) { - ui->password->setEnabled(enabled); + m_password->setEnabled(enabled); } QString AuthenticationDialog::getUserName() { - return ui->username->text(); + return m_username->text(); } QString AuthenticationDialog::getPassword() { - return ui->password->text(); + return m_password->text(); } -} // namespace Internal -} // namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/authenticationdialog.h b/src/plugins/mercurial/authenticationdialog.h index 30537f141ac..2b6eb454401 100644 --- a/src/plugins/mercurial/authenticationdialog.h +++ b/src/plugins/mercurial/authenticationdialog.h @@ -5,10 +5,11 @@ #include -namespace Mercurial { -namespace Internal { +QT_BEGIN_NAMESPACE +class QLineEdit; +QT_END_NAMESPACE -namespace Ui { class AuthenticationDialog; } +namespace Mercurial::Internal { class AuthenticationDialog : public QDialog { @@ -18,13 +19,14 @@ public: explicit AuthenticationDialog(const QString &username, const QString &password, QWidget *parent = nullptr); ~AuthenticationDialog() override; + void setPasswordEnabled(bool enabled); QString getUserName(); QString getPassword(); private: - Ui::AuthenticationDialog *ui; + QLineEdit *m_username; + QLineEdit *m_password; }; -} // namespace Internal -} // namespace Mercurial +} // Mercurial::Internal diff --git a/src/plugins/mercurial/authenticationdialog.ui b/src/plugins/mercurial/authenticationdialog.ui deleted file mode 100644 index 3d12e2c1f7e..00000000000 --- a/src/plugins/mercurial/authenticationdialog.ui +++ /dev/null @@ -1,92 +0,0 @@ - - - Mercurial::Internal::AuthenticationDialog - - - - 0 - 0 - 312 - 116 - - - - Dialog - - - - - - - - Username: - - - - - - - - - - Password: - - - - - - - QLineEdit::Password - - - - - - - - - Qt::Horizontal - - - QDialogButtonBox::Cancel|QDialogButtonBox::Ok - - - - - - - - - buttonBox - accepted() - Mercurial::Internal::AuthenticationDialog - accept() - - - 248 - 254 - - - 157 - 274 - - - - - buttonBox - rejected() - Mercurial::Internal::AuthenticationDialog - reject() - - - 316 - 260 - - - 286 - 274 - - - - - diff --git a/src/plugins/mercurial/mercurial.qbs b/src/plugins/mercurial/mercurial.qbs index 0f8b5613bf1..f657f7bc5ed 100644 --- a/src/plugins/mercurial/mercurial.qbs +++ b/src/plugins/mercurial/mercurial.qbs @@ -16,7 +16,6 @@ QtcPlugin { "annotationhighlighter.h", "authenticationdialog.cpp", "authenticationdialog.h", - "authenticationdialog.ui", "commiteditor.cpp", "commiteditor.h", "constants.h",