From 421cdd8021bed9dbedaacbe08d8c7556cb221b30 Mon Sep 17 00:00:00 2001 From: hjk Date: Fri, 15 Jul 2022 11:14:05 +0200 Subject: [PATCH] RemoteLinux: inline genericlinuxdeviceconfigurationwizardsetuppage.ui Change-Id: Id26472c20a60e95cc1b6348518168f8c64a61697 Reviewed-by: Eike Ziller Reviewed-by: Qt CI Bot --- src/plugins/remotelinux/CMakeLists.txt | 1 - ...riclinuxdeviceconfigurationwizardpages.cpp | 49 ++++++---- ...linuxdeviceconfigurationwizardsetuppage.ui | 89 ------------------- src/plugins/remotelinux/remotelinux.qbs | 1 - 4 files changed, 33 insertions(+), 107 deletions(-) delete mode 100644 src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui diff --git a/src/plugins/remotelinux/CMakeLists.txt b/src/plugins/remotelinux/CMakeLists.txt index a13af8cd47b..ebdb1627a0e 100644 --- a/src/plugins/remotelinux/CMakeLists.txt +++ b/src/plugins/remotelinux/CMakeLists.txt @@ -11,7 +11,6 @@ add_qtc_plugin(RemoteLinux genericlinuxdeviceconfigurationwidget.cpp genericlinuxdeviceconfigurationwidget.h genericlinuxdeviceconfigurationwidget.ui genericlinuxdeviceconfigurationwizard.cpp genericlinuxdeviceconfigurationwizard.h genericlinuxdeviceconfigurationwizardpages.cpp genericlinuxdeviceconfigurationwizardpages.h - genericlinuxdeviceconfigurationwizardsetuppage.ui killappstep.cpp killappstep.h linuxdevice.cpp linuxdevice.h linuxdevicetester.cpp linuxdevicetester.h diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp index d4e31442fee..7b990098dd8 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp @@ -24,7 +24,6 @@ ****************************************************************************/ #include "genericlinuxdeviceconfigurationwizardpages.h" -#include "ui_genericlinuxdeviceconfigurationwizardsetuppage.h" #include "publickeydeploymentdialog.h" #include "sshkeycreationdialog.h" @@ -32,14 +31,14 @@ #include #include +#include #include #include #include #include +#include #include -#include -#include using namespace ProjectExplorer; using namespace Utils; @@ -50,7 +49,10 @@ namespace Internal { class GenericLinuxDeviceConfigurationWizardSetupPagePrivate { public: - Ui::GenericLinuxDeviceConfigurationWizardSetupPage ui; + QLineEdit *nameLineEdit; + QLineEdit *hostNameLineEdit; + QLineEdit *userNameLineEdit; + LinuxDevice::Ptr device; }; @@ -66,12 +68,27 @@ GenericLinuxDeviceConfigurationWizardSetupPage::GenericLinuxDeviceConfigurationW QWidget *parent) : QWizardPage(parent), d(new Internal::GenericLinuxDeviceConfigurationWizardSetupPagePrivate) { - d->ui.setupUi(this); setTitle(tr("Connection")); + setWindowTitle(tr("WizardPage")); + + d->nameLineEdit = new QLineEdit(this); + d->hostNameLineEdit = new QLineEdit(this); + d->userNameLineEdit = new QLineEdit(this); + + using namespace Layouting; + const Break nl; + const Stretch st; + + Form { + tr("The name to identify this configuration:"), d->nameLineEdit, nl, + tr("The device's host name or IP address:"), d->hostNameLineEdit, st, nl, + tr("The username to log into the device:"), d->userNameLineEdit, st, nl + }.attachTo(this); + setSubTitle(QLatin1String(" ")); // For Qt bug (background color) - connect(d->ui.nameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged); - connect(d->ui.hostNameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged); - connect(d->ui.userNameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged); + connect(d->nameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged); + connect(d->hostNameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged); + connect(d->userNameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged); } GenericLinuxDeviceConfigurationWizardSetupPage::~GenericLinuxDeviceConfigurationWizardSetupPage() @@ -81,16 +98,16 @@ GenericLinuxDeviceConfigurationWizardSetupPage::~GenericLinuxDeviceConfiguration void GenericLinuxDeviceConfigurationWizardSetupPage::initializePage() { - d->ui.nameLineEdit->setText(d->device->displayName()); - d->ui.hostNameLineEdit->setText(d->device->sshParameters().host()); - d->ui.userNameLineEdit->setText(d->device->sshParameters().userName()); + d->nameLineEdit->setText(d->device->displayName()); + d->hostNameLineEdit->setText(d->device->sshParameters().host()); + d->userNameLineEdit->setText(d->device->sshParameters().userName()); } bool GenericLinuxDeviceConfigurationWizardSetupPage::isComplete() const { return !configurationName().isEmpty() - && !d->ui.hostNameLineEdit->text().trimmed().isEmpty() - && !d->ui.userNameLineEdit->text().trimmed().isEmpty(); + && !d->hostNameLineEdit->text().trimmed().isEmpty() + && !d->userNameLineEdit->text().trimmed().isEmpty(); } bool GenericLinuxDeviceConfigurationWizardSetupPage::validatePage() @@ -104,14 +121,14 @@ bool GenericLinuxDeviceConfigurationWizardSetupPage::validatePage() QString GenericLinuxDeviceConfigurationWizardSetupPage::configurationName() const { - return d->ui.nameLineEdit->text().trimmed(); + return d->nameLineEdit->text().trimmed(); } QUrl GenericLinuxDeviceConfigurationWizardSetupPage::url() const { QUrl url; - url.setHost(d->ui.hostNameLineEdit->text().trimmed()); - url.setUserName(d->ui.userNameLineEdit->text().trimmed()); + url.setHost(d->hostNameLineEdit->text().trimmed()); + url.setUserName(d->userNameLineEdit->text().trimmed()); url.setPort(22); return url; } diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui deleted file mode 100644 index d03e451f4a7..00000000000 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui +++ /dev/null @@ -1,89 +0,0 @@ - - - RemoteLinux::Internal::GenericLinuxDeviceConfigurationWizardSetupPage - - - - 0 - 0 - 564 - 119 - - - - WizardPage - - - - - - The name to identify this configuration: - - - - - - - - - - - - - - The device's host name or IP address: - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - The username to log into the device: - - - - - - - - - - - - Qt::Horizontal - - - - 153 - 21 - - - - - - - - - - - diff --git a/src/plugins/remotelinux/remotelinux.qbs b/src/plugins/remotelinux/remotelinux.qbs index 8aaf6fbcc2e..246aa445fcb 100644 --- a/src/plugins/remotelinux/remotelinux.qbs +++ b/src/plugins/remotelinux/remotelinux.qbs @@ -32,7 +32,6 @@ Project { "genericlinuxdeviceconfigurationwizard.h", "genericlinuxdeviceconfigurationwizardpages.cpp", "genericlinuxdeviceconfigurationwizardpages.h", - "genericlinuxdeviceconfigurationwizardsetuppage.ui", "killappstep.cpp", "killappstep.h", "linuxdevice.cpp",