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

RemoteLinux: Introduce default name to device wizard page.

Browse Source 
Also use better default config names for generic Linux and Madde.

Change-Id: I6755d9060b9bb9e2901363a42e6cd593238d4110
Reviewed-on: http://codereview.qt-project.org/5686
Reviewed-by: Christian Kandeler <christian.kandeler@nokia.com>
This commit is contained in:
Christian Kandeler
2011-09-28 10:14:16 +02:00
parent deaec493f5
commit a4b186cc4a
3 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/madde/maemodeviceconfigwizard.cpp
View File

@@ -118,7 +118,7 @@ public:
connect(buttonGroup, SIGNAL(buttonClicked(int)), connect(buttonGroup, SIGNAL(buttonClicked(int)),
SLOT(handleDeviceTypeChanged())); SLOT(handleDeviceTypeChanged()));
m_ui->nameLineEdit->setText(QLatin1String("(New Configuration)")); m_ui->nameLineEdit->setText(QLatin1String("MeeGo Device"));
m_ui->osTypeComboBox->setCurrentIndex(m_ui->osTypeComboBox->findData(QLatin1String(HarmattanOsType))); m_ui->osTypeComboBox->setCurrentIndex(m_ui->osTypeComboBox->findData(QLatin1String(HarmattanOsType)));
m_ui->hwButton->setChecked(true); m_ui->hwButton->setChecked(true);
handleDeviceTypeChanged(); handleDeviceTypeChanged();

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

@@ -73,7 +73,7 @@ GenericLinuxDeviceConfigurationWizardSetupPage::~GenericLinuxDeviceConfiguration
void GenericLinuxDeviceConfigurationWizardSetupPage::initializePage() void GenericLinuxDeviceConfigurationWizardSetupPage::initializePage()
{ {
d->ui.nameLineEdit->setText(QLatin1String("(New Configuration)")); d->ui.nameLineEdit->setText(defaultConfigurationName());
d->ui.hostNameLineEdit->setText(defaultHostName()); d->ui.hostNameLineEdit->setText(defaultHostName());
d->ui.userNameLineEdit->setText(defaultUserName()); d->ui.userNameLineEdit->setText(defaultUserName());
d->ui.passwordButton->setChecked(true); d->ui.passwordButton->setChecked(true);
@@ -121,6 +121,11 @@ QString GenericLinuxDeviceConfigurationWizardSetupPage::privateKeyFilePath() con
return d->ui.privateKeyPathChooser->path(); return d->ui.privateKeyPathChooser->path();
} }
QString GenericLinuxDeviceConfigurationWizardSetupPage::defaultConfigurationName() const
{
return QLatin1String("Generic Linux Device");
}
QString GenericLinuxDeviceConfigurationWizardSetupPage::defaultHostName() const QString GenericLinuxDeviceConfigurationWizardSetupPage::defaultHostName() const
{ {
return QString(); return QString();

1
src/plugins/remotelinux/genericlinuxdeviceconfigurationwizardpages.h
View File

@@ -61,6 +61,7 @@ public:
QString password() const; QString password() const;
QString privateKeyFilePath() const; QString privateKeyFilePath() const;
virtual QString defaultConfigurationName() const;
virtual QString defaultHostName() const; virtual QString defaultHostName() const;
virtual QString defaultUserName() const; virtual QString defaultUserName() const;
virtual QString defaultPassWord() const; virtual QString defaultPassWord() const;