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

RemoteLinux: inline genericlinuxdeviceconfigurationwizardsetuppage.ui

Browse Source 
Change-Id: Id26472c20a60e95cc1b6348518168f8c64a61697
Reviewed-by: Eike Ziller <eike.ziller@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
hjk
2022-07-15 11:14:05 +02:00
parent 8cb1775ba8
commit 421cdd8021
4 changed files with 33 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/plugins/remotelinux/CMakeLists.txt
View File

@@ -11,7 +11,6 @@ add_qtc_plugin(RemoteLinux
genericlinuxdeviceconfigurationwidget.cpp genericlinuxdeviceconfigurationwidget.h genericlinuxdeviceconfigurationwidget.ui genericlinuxdeviceconfigurationwidget.cpp genericlinuxdeviceconfigurationwidget.h genericlinuxdeviceconfigurationwidget.ui
genericlinuxdeviceconfigurationwizard.cpp genericlinuxdeviceconfigurationwizard.h genericlinuxdeviceconfigurationwizard.cpp genericlinuxdeviceconfigurationwizard.h
genericlinuxdeviceconfigurationwizardpages.cpp genericlinuxdeviceconfigurationwizardpages.h genericlinuxdeviceconfigurationwizardpages.cpp genericlinuxdeviceconfigurationwizardpages.h
genericlinuxdeviceconfigurationwizardsetuppage.ui
killappstep.cpp killappstep.h killappstep.cpp killappstep.h
linuxdevice.cpp linuxdevice.h linuxdevice.cpp linuxdevice.h
linuxdevicetester.cpp linuxdevicetester.h linuxdevicetester.cpp linuxdevicetester.h

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

@@ -24,7 +24,6 @@
****************************************************************************/ ****************************************************************************/
#include "genericlinuxdeviceconfigurationwizardpages.h" #include "genericlinuxdeviceconfigurationwizardpages.h"
#include "ui_genericlinuxdeviceconfigurationwizardsetuppage.h"
#include "publickeydeploymentdialog.h" #include "publickeydeploymentdialog.h"
#include "sshkeycreationdialog.h" #include "sshkeycreationdialog.h"
@@ -32,14 +31,14 @@
#include <projectexplorer/devicesupport/sshparameters.h> #include <projectexplorer/devicesupport/sshparameters.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/layoutbuilder.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QLabel> #include <QLabel>
#include <QLineEdit>
#include <QPushButton> #include <QPushButton>
#include <QStringList>
#include <QVBoxLayout>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
@@ -50,7 +49,10 @@ namespace Internal {
class GenericLinuxDeviceConfigurationWizardSetupPagePrivate class GenericLinuxDeviceConfigurationWizardSetupPagePrivate
{ {
public: public:
Ui::GenericLinuxDeviceConfigurationWizardSetupPage ui; QLineEdit *nameLineEdit;
QLineEdit *hostNameLineEdit;
QLineEdit *userNameLineEdit;
LinuxDevice::Ptr device; LinuxDevice::Ptr device;
}; };
@@ -66,12 +68,27 @@ GenericLinuxDeviceConfigurationWizardSetupPage::GenericLinuxDeviceConfigurationW
QWidget *parent) : QWidget *parent) :
QWizardPage(parent), d(new Internal::GenericLinuxDeviceConfigurationWizardSetupPagePrivate) QWizardPage(parent), d(new Internal::GenericLinuxDeviceConfigurationWizardSetupPagePrivate)
{ {
d->ui.setupUi(this);
setTitle(tr("Connection")); 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) setSubTitle(QLatin1String(" ")); // For Qt bug (background color)
connect(d->ui.nameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged); connect(d->nameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged);
connect(d->ui.hostNameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged); connect(d->hostNameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged);
connect(d->ui.userNameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged); connect(d->userNameLineEdit, &QLineEdit::textChanged, this, &QWizardPage::completeChanged);
} }
GenericLinuxDeviceConfigurationWizardSetupPage::~GenericLinuxDeviceConfigurationWizardSetupPage() GenericLinuxDeviceConfigurationWizardSetupPage::~GenericLinuxDeviceConfigurationWizardSetupPage()
@@ -81,16 +98,16 @@ GenericLinuxDeviceConfigurationWizardSetupPage::~GenericLinuxDeviceConfiguration
void GenericLinuxDeviceConfigurationWizardSetupPage::initializePage() void GenericLinuxDeviceConfigurationWizardSetupPage::initializePage()
{ {
d->ui.nameLineEdit->setText(d->device->displayName()); d->nameLineEdit->setText(d->device->displayName());
d->ui.hostNameLineEdit->setText(d->device->sshParameters().host()); d->hostNameLineEdit->setText(d->device->sshParameters().host());
d->ui.userNameLineEdit->setText(d->device->sshParameters().userName()); d->userNameLineEdit->setText(d->device->sshParameters().userName());
} }
bool GenericLinuxDeviceConfigurationWizardSetupPage::isComplete() const bool GenericLinuxDeviceConfigurationWizardSetupPage::isComplete() const
{ {
return !configurationName().isEmpty() return !configurationName().isEmpty()
&& !d->ui.hostNameLineEdit->text().trimmed().isEmpty() && !d->hostNameLineEdit->text().trimmed().isEmpty()
&& !d->ui.userNameLineEdit->text().trimmed().isEmpty(); && !d->userNameLineEdit->text().trimmed().isEmpty();
} }
bool GenericLinuxDeviceConfigurationWizardSetupPage::validatePage() bool GenericLinuxDeviceConfigurationWizardSetupPage::validatePage()
@@ -104,14 +121,14 @@ bool GenericLinuxDeviceConfigurationWizardSetupPage::validatePage()
QString GenericLinuxDeviceConfigurationWizardSetupPage::configurationName() const QString GenericLinuxDeviceConfigurationWizardSetupPage::configurationName() const
{ {
return d->ui.nameLineEdit->text().trimmed(); return d->nameLineEdit->text().trimmed();
} }
QUrl GenericLinuxDeviceConfigurationWizardSetupPage::url() const QUrl GenericLinuxDeviceConfigurationWizardSetupPage::url() const
{ {
QUrl url; QUrl url;
url.setHost(d->ui.hostNameLineEdit->text().trimmed()); url.setHost(d->hostNameLineEdit->text().trimmed());
url.setUserName(d->ui.userNameLineEdit->text().trimmed()); url.setUserName(d->userNameLineEdit->text().trimmed());
url.setPort(22); url.setPort(22);
return url; return url;
} }

89
src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui
View File

@@ -1,89 +0,0 @@
<?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0">
<class>RemoteLinux::Internal::GenericLinuxDeviceConfigurationWizardSetupPage</class>
<widget class="QWizardPage" name="RemoteLinux::Internal::GenericLinuxDeviceConfigurationWizardSetupPage">
<property name="geometry">
<rect>
<x>0</x>
<y>0</y>
<width>564</width>
<height>119</height>
</rect>
</property>
<property name="windowTitle">
<string>WizardPage</string>
</property>
<layout class="QFormLayout" name="formLayout">
<item row="0" column="0">
<widget class="QLabel" name="nameLabel">
<property name="text">
<string>The name to identify this configuration:</string>
</property>
</widget>
</item>
<item row="0" column="1">
<layout class="QHBoxLayout" name="horizontalLayout">
<item>
<widget class="QLineEdit" name="nameLineEdit"/>
</item>
</layout>
</item>
<item row="1" column="0">
<widget class="QLabel" name="hostNameLabel">
<property name="text">
<string>The device's host name or IP address:</string>
</property>
</widget>
</item>
<item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLineEdit" name="hostNameLineEdit"/>
</item>
<item>
<spacer name="horizontalSpacer_6">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="2" column="0">
<widget class="QLabel" name="userNameLabel">
<property name="text">
<string>The username to log into the device:</string>
</property>
</widget>
</item>
<item row="2" column="1">
<layout class="QHBoxLayout" name="horizontalLayout_3">
<item>
<widget class="QLineEdit" name="userNameLineEdit"/>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>153</width>
<height>21</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
</layout>
</widget>
<resources/>
<connections/>
</ui>

1
src/plugins/remotelinux/remotelinux.qbs
View File

@@ -32,7 +32,6 @@ Project {
"genericlinuxdeviceconfigurationwizard.h", "genericlinuxdeviceconfigurationwizard.h",
"genericlinuxdeviceconfigurationwizardpages.cpp", "genericlinuxdeviceconfigurationwizardpages.cpp",
"genericlinuxdeviceconfigurationwizardpages.h", "genericlinuxdeviceconfigurationwizardpages.h",
"genericlinuxdeviceconfigurationwizardsetuppage.ui",
"killappstep.cpp", "killappstep.cpp",
"killappstep.h", "killappstep.h",
"linuxdevice.cpp", "linuxdevice.cpp",