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

RemoteLinux: Make generic wizard similar to QnxDeviceWizard

Browse Source 
Change-Id: Ia8feb1b5d18d7a1cebd14f37775a6097b1dc380c
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>
This commit is contained in:
Jarek Kobus
2023-07-20 23:24:49 +02:00
parent 81f8a3fd7d
commit 396c6c92f2
3 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.cpp
View File

@@ -8,6 +8,8 @@
#include "remotelinux_constants.h"
#include "remotelinuxtr.h"
#include <coreplugin/icore.h>
#include <projectexplorer/devicesupport/idevice.h>
#include <projectexplorer/devicesupport/sshparameters.h>
@@ -17,33 +19,30 @@ using namespace ProjectExplorer;
namespace RemoteLinux {
namespace Internal {
enum PageId { SetupPageId, KeyDeploymentPageId, FinalPageId };
class GenericLinuxDeviceConfigurationWizardPrivate
{
public:
GenericLinuxDeviceConfigurationWizardPrivate(QWidget *parent)
: setupPage(parent), keyDeploymentPage(parent), finalPage(parent)
{
}
GenericLinuxDeviceConfigurationWizardSetupPage setupPage;
GenericLinuxDeviceConfigurationWizardKeyDeploymentPage keyDeploymentPage;
GenericLinuxDeviceConfigurationWizardFinalPage finalPage;
LinuxDevice::Ptr device;
};
} // namespace Internal
GenericLinuxDeviceConfigurationWizard::GenericLinuxDeviceConfigurationWizard(QWidget *parent)
: Utils::Wizard(parent),
d(new Internal::GenericLinuxDeviceConfigurationWizardPrivate(this))
GenericLinuxDeviceConfigurationWizard::GenericLinuxDeviceConfigurationWizard()
: Utils::Wizard(Core::ICore::dialogParent())
, d(new Internal::GenericLinuxDeviceConfigurationWizardPrivate)
{
setWindowTitle(Tr::tr("New Remote Linux Device Configuration Setup"));
setPage(Internal::SetupPageId, &d->setupPage);
setPage(Internal::KeyDeploymentPageId, &d->keyDeploymentPage);
setPage(Internal::FinalPageId, &d->finalPage);
addPage(&d->setupPage);
addPage(&d->keyDeploymentPage);
addPage(&d->finalPage);
d->finalPage.setCommitPage(true);
d->device = LinuxDevice::create();
d->setupPage.setDevice(d->device);
d->keyDeploymentPage.setDevice(d->device);
}

2
src/plugins/remotelinux/genericlinuxdeviceconfigurationwizard.h
View File

@@ -16,7 +16,7 @@ class REMOTELINUX_EXPORT GenericLinuxDeviceConfigurationWizard : public Utils::W
Q_OBJECT
public:
GenericLinuxDeviceConfigurationWizard(QWidget *parent = nullptr);
GenericLinuxDeviceConfigurationWizard();
~GenericLinuxDeviceConfigurationWizard() override;
ProjectExplorer::IDevicePtr device();

2
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -1485,7 +1485,7 @@ LinuxDeviceFactory::LinuxDeviceFactory()
setConstructionFunction(&LinuxDevice::create);
setQuickCreationAllowed(true);
setCreator([] {
GenericLinuxDeviceConfigurationWizard wizard(Core::ICore::dialogParent());
GenericLinuxDeviceConfigurationWizard wizard;
if (wizard.exec() != QDialog::Accepted)
return IDevice::Ptr();
return wizard.device();