feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

SSH Device: Add SSH port to Device wizard

Browse Source 
Change-Id: Ia4cc3b7bb0074930f32d58393651f6c961c69b28
Reviewed-by: hjk <hjk@qt.io>
This commit is contained in:
Marcus Tillmanns
2022-08-23 11:06:27 +02:00
parent 42e1714ea1
commit 5fab54d95a
1 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.cpp
View File

@@ -40,6 +40,7 @@
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>
#include <QPushButton> #include <QPushButton>
#include <QSpinBox>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
@@ -52,6 +53,7 @@ class GenericLinuxDeviceConfigurationWizardSetupPagePrivate
public: public:
QLineEdit *nameLineEdit; QLineEdit *nameLineEdit;
QLineEdit *hostNameLineEdit; QLineEdit *hostNameLineEdit;
QSpinBox *sshPortSpinBox;
QLineEdit *userNameLineEdit; QLineEdit *userNameLineEdit;
LinuxDevice::Ptr device; LinuxDevice::Ptr device;
@@ -74,18 +76,21 @@ GenericLinuxDeviceConfigurationWizardSetupPage::GenericLinuxDeviceConfigurationW
d->nameLineEdit = new QLineEdit(this); d->nameLineEdit = new QLineEdit(this);
d->hostNameLineEdit = new QLineEdit(this); d->hostNameLineEdit = new QLineEdit(this);
d->sshPortSpinBox = new QSpinBox(this);
d->userNameLineEdit = new QLineEdit(this); d->userNameLineEdit = new QLineEdit(this);
using namespace Layouting; using namespace Layouting;
Form { Form {
Tr::tr("The name to identify this configuration:"), d->nameLineEdit, br, Tr::tr("The name to identify this configuration:"), d->nameLineEdit, br,
Tr::tr("The device's host name or IP address:"), d->hostNameLineEdit, st, br, Tr::tr("The device's host name or IP address:"), d->hostNameLineEdit, st, br,
Tr::tr("The device's SSH port number:"), d->sshPortSpinBox, st, br,
Tr::tr("The username to log into the device:"), d->userNameLineEdit, st, br Tr::tr("The username to log into the device:"), d->userNameLineEdit, st, br
}.attachTo(this); }.attachTo(this);
setSubTitle(QLatin1String(" ")); // For Qt bug (background color) setSubTitle(QLatin1String(" ")); // For Qt bug (background color)
connect(d->nameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged); connect(d->nameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged);
connect(d->hostNameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged); connect(d->hostNameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged);
connect(d->sshPortSpinBox, &QSpinBox::valueChanged, this, &QWizardPage::completeChanged);
connect(d->userNameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged); connect(d->userNameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged);
} }
@@ -98,6 +103,8 @@ void GenericLinuxDeviceConfigurationWizardSetupPage::initializePage()
{ {
d->nameLineEdit->setText(d->device->displayName()); d->nameLineEdit->setText(d->device->displayName());
d->hostNameLineEdit->setText(d->device->sshParameters().host()); d->hostNameLineEdit->setText(d->device->sshParameters().host());
d->sshPortSpinBox->setValue(22);
d->sshPortSpinBox->setRange(1, 65535);
d->userNameLineEdit->setText(d->device->sshParameters().userName()); d->userNameLineEdit->setText(d->device->sshParameters().userName());
} }
@@ -127,7 +134,7 @@ QUrl GenericLinuxDeviceConfigurationWizardSetupPage::url() const
QUrl url; QUrl url;
url.setHost(d->hostNameLineEdit->text().trimmed()); url.setHost(d->hostNameLineEdit->text().trimmed());
url.setUserName(d->userNameLineEdit->text().trimmed()); url.setUserName(d->userNameLineEdit->text().trimmed());
url.setPort(22); url.setPort(d->sshPortSpinBox->value());
return url; return url;
} }