From 6400d8423a11f19807e88784b057859e419cd879 Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Thu, 7 Jul 2011 12:58:26 +0200 Subject: [PATCH] RemoteLinux: Device configuration wizard improvements. - Fix factory list widget item heights. - Use more consistent wording. - Remove unused wizard page. Change-Id: I5d0b215e7de8da0c872077a7597453739131c0d4 Reviewed-on: http://codereview.qt.nokia.com/1304 Reviewed-by: Qt Sanity Bot Reviewed-by: Leena Miettinen --- ...nericlinuxdeviceconfigurationwizardsetuppage.ui | 12 +- .../linuxdevicefactoryselectiondialog.ui | 7 +- .../remotelinux/maemodeviceconfigwizard.cpp | 77 +--------- .../maemodeviceconfigwizardlogindatapage.ui | 156 --------------------- .../maemodeviceconfigwizardstartpage.ui | 2 +- src/plugins/remotelinux/remotelinux.pro | 1 - 6 files changed, 14 insertions(+), 241 deletions(-) delete mode 100644 src/plugins/remotelinux/maemodeviceconfigwizardlogindatapage.ui diff --git a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui index c2638dc9ce..59c98b15d2 100644 --- a/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui +++ b/src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardsetuppage.ui @@ -6,8 +6,8 @@ 0 0 - 542 - 201 + 564 + 207 @@ -71,7 +71,7 @@ - User name: + The user name to log into the device: @@ -98,7 +98,7 @@ - Authentication type: + The authentication type: @@ -136,7 +136,7 @@ - Password: + The user's password: @@ -167,7 +167,7 @@ - Private key: + The file containing the user's private key: diff --git a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.ui b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.ui index b3b2490cf1..bb394e4f67 100644 --- a/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.ui +++ b/src/plugins/remotelinux/linuxdevicefactoryselectiondialog.ui @@ -17,12 +17,15 @@ - Available wizards: + Available device types: + + QAbstractItemView::SelectRows + QListView::Adjust @@ -30,7 +33,7 @@ true - true + false diff --git a/src/plugins/remotelinux/maemodeviceconfigwizard.cpp b/src/plugins/remotelinux/maemodeviceconfigwizard.cpp index 969515a75c..4ee65e3ab2 100644 --- a/src/plugins/remotelinux/maemodeviceconfigwizard.cpp +++ b/src/plugins/remotelinux/maemodeviceconfigwizard.cpp @@ -32,7 +32,6 @@ #include "maemodeviceconfigwizard.h" #include "ui_maemodeviceconfigwizardkeycreationpage.h" #include "ui_maemodeviceconfigwizardkeydeploymentpage.h" -#include "ui_maemodeviceconfigwizardlogindatapage.h" #include "ui_maemodeviceconfigwizardpreviouskeysetupcheckpage.h" #include "ui_maemodeviceconfigwizardreusekeyscheckpage.h" #include "ui_maemodeviceconfigwizardstartpage.h" @@ -86,8 +85,8 @@ struct WizardData }; enum PageId { - StartPageId, LoginDataPageId, PreviousKeySetupCheckPageId, - ReuseKeysCheckPageId, KeyCreationPageId, KeyDeploymentPageId, FinalPageId + StartPageId, PreviousKeySetupCheckPageId, ReuseKeysCheckPageId, KeyCreationPageId, + KeyDeploymentPageId, FinalPageId }; class MaemoDeviceConfigWizardStartPage : public QWizardPage @@ -174,67 +173,6 @@ private: const QScopedPointer m_ui; }; -class MaemoDeviceConfigWizardLoginDataPage : public QWizardPage -{ - Q_OBJECT - -public: - MaemoDeviceConfigWizardLoginDataPage(WizardData &wizardData, QWidget *parent) - : QWizardPage(parent), - m_ui(new Ui::MaemoDeviceConfigWizardLoginDataPage), - m_wizardData(wizardData) - { - m_ui->setupUi(this); - setTitle(tr("Login Data")); - m_ui->privateKeyPathChooser->setExpectedKind(PathChooser::File); - setSubTitle(QLatin1String(" ")); // For Qt bug (background color) - connect(m_ui->userNameLineEdit, SIGNAL(textChanged(QString)), - SIGNAL(completeChanged())); - connect(m_ui->privateKeyPathChooser, SIGNAL(validChanged()), - SIGNAL(completeChanged())); - connect(m_ui->passwordButton, SIGNAL(toggled(bool)), - SLOT(handleAuthTypeChanged())); - } - - virtual bool isComplete() const - { - return !userName().isEmpty() - && (authType() == SshConnectionParameters::AuthenticationByPassword - || m_ui->privateKeyPathChooser->isValid()); - } - - virtual void initializePage() - { - m_ui->userNameLineEdit->setText(defaultUser(m_wizardData.osType)); - m_ui->passwordButton->setChecked(true); - m_ui->passwordLineEdit->clear(); - m_ui->privateKeyPathChooser->setPath(LinuxDeviceConfiguration::defaultPrivateKeyFilePath()); - handleAuthTypeChanged(); - } - - SshConnectionParameters::AuthenticationType authType() const - { - return m_ui->passwordButton->isChecked() - ? SshConnectionParameters::AuthenticationByPassword - : SshConnectionParameters::AuthenticationByKey; - } - - QString userName() const { return m_ui->userNameLineEdit->text().trimmed(); } - QString password() const { return m_ui->passwordLineEdit->text(); } - QString privateKeyFilePath() const { return m_ui->privateKeyPathChooser->path(); } - -private: - Q_SLOT void handleAuthTypeChanged() - { - m_ui->passwordLineEdit->setEnabled(authType() == SshConnectionParameters::AuthenticationByPassword); - m_ui->privateKeyPathChooser->setEnabled(authType() == SshConnectionParameters::AuthenticationByKey); - emit completeChanged(); - } - - const QScopedPointer m_ui; - const WizardData &m_wizardData; -}; - class MaemoDeviceConfigWizardPreviousKeySetupCheckPage : public QWizardPage { Q_OBJECT @@ -578,7 +516,6 @@ struct MaemoDeviceConfigWizardPrivate { MaemoDeviceConfigWizardPrivate(QWidget *parent) : startPage(parent), - loginDataPage(wizardData, parent), previousKeySetupPage(parent), reuseKeysCheckPage(parent), keyCreationPage(parent), @@ -589,7 +526,6 @@ struct MaemoDeviceConfigWizardPrivate WizardData wizardData; MaemoDeviceConfigWizardStartPage startPage; - MaemoDeviceConfigWizardLoginDataPage loginDataPage; MaemoDeviceConfigWizardPreviousKeySetupCheckPage previousKeySetupPage; MaemoDeviceConfigWizardReuseKeysCheckPage reuseKeysCheckPage; MaemoDeviceConfigWizardKeyCreationPage keyCreationPage; @@ -603,7 +539,6 @@ MaemoDeviceConfigWizard::MaemoDeviceConfigWizard(QWidget *parent) { setWindowTitle(tr("New Device Configuration Setup")); setPage(StartPageId, &d->startPage); - setPage(LoginDataPageId, &d->loginDataPage); setPage(PreviousKeySetupCheckPageId, &d->previousKeySetupPage); setPage(ReuseKeysCheckPageId, &d->reuseKeysCheckPage); setPage(KeyCreationPageId, &d->keyCreationPage); @@ -658,14 +593,6 @@ int MaemoDeviceConfigWizard::nextId() const if (d->wizardData.deviceType == LinuxDeviceConfiguration::Emulator) return FinalPageId; return PreviousKeySetupCheckPageId; - case LoginDataPageId: - d->wizardData.userName = d->loginDataPage.userName(); - d->wizardData.authType = d->loginDataPage.authType(); - if (d->wizardData.authType == SshConnectionParameters::AuthenticationByPassword) - d->wizardData.password = d->loginDataPage.password(); - else - d->wizardData.privateKeyFilePath = d->loginDataPage.privateKeyFilePath(); - return FinalPageId; case PreviousKeySetupCheckPageId: if (d->previousKeySetupPage.keyBasedLoginWasSetup()) { d->wizardData.privateKeyFilePath diff --git a/src/plugins/remotelinux/maemodeviceconfigwizardlogindatapage.ui b/src/plugins/remotelinux/maemodeviceconfigwizardlogindatapage.ui deleted file mode 100644 index c36cf115b4..0000000000 --- a/src/plugins/remotelinux/maemodeviceconfigwizardlogindatapage.ui +++ /dev/null @@ -1,156 +0,0 @@ - - - MaemoDeviceConfigWizardLoginDataPage - - - - 0 - 0 - 423 - 127 - - - - WizardPage - - - - - - User name: - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Authentication type: - - - - - - - - - Password - - - - - - - Key - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Password: - - - - - - - - - QLineEdit::Password - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Private key: - - - - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - Utils::PathChooser - QWidget -
utils/pathchooser.h
- 1 - - editingFinished() - browsingFinished() - - - - - - diff --git a/src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui b/src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui index 062a89c4d1..4df4e3f850 100644 --- a/src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui +++ b/src/plugins/remotelinux/maemodeviceconfigwizardstartpage.ui @@ -102,7 +102,7 @@ - The SSH port: + The SSH server port: diff --git a/src/plugins/remotelinux/remotelinux.pro b/src/plugins/remotelinux/remotelinux.pro index cc5a0a3429..5eb4a30119 100644 --- a/src/plugins/remotelinux/remotelinux.pro +++ b/src/plugins/remotelinux/remotelinux.pro @@ -180,7 +180,6 @@ FORMS += \ maemodeviceconfigwizardkeycreationpage.ui \ maemodeviceconfigwizardkeydeploymentpage.ui \ maemodeployconfigurationwidget.ui \ - maemodeviceconfigwizardlogindatapage.ui \ linuxdevicefactoryselectiondialog.ui \ genericlinuxdeviceconfigurationwizardsetuppage.ui -- 2.11.0