forked from qt-creator/qt-creator
Maemo: Hide password-related GUI elements.
This commit is contained in:
@@ -146,6 +146,7 @@ void MaemoDeviceConfigurations::save()
|
||||
{
|
||||
QSettings *settings = Core::ICore::instance()->settings();
|
||||
settings->beginGroup(SettingsGroup);
|
||||
qDebug("Writing next id: %llu", m_nextId);
|
||||
settings->setValue(IdCounterKey, m_nextId);
|
||||
settings->beginWriteArray(ConfigListKey, m_devConfigs.count());
|
||||
for (int i = 0; i < m_devConfigs.count(); ++i) {
|
||||
@@ -166,8 +167,9 @@ MaemoDeviceConfigurations::MaemoDeviceConfigurations(QObject *parent)
|
||||
void MaemoDeviceConfigurations::load()
|
||||
{
|
||||
QSettings *settings = Core::ICore::instance()->settings();
|
||||
m_nextId = settings->value(IdCounterKey, 1).toULongLong();
|
||||
settings->beginGroup(SettingsGroup);
|
||||
m_nextId = settings->value(IdCounterKey, 1).toULongLong();
|
||||
qDebug("Read next id: %llu", m_nextId);
|
||||
int count = settings->beginReadArray(ConfigListKey);
|
||||
for (int i = 0; i < count; ++i) {
|
||||
settings->setArrayIndex(i);
|
||||
|
||||
@@ -218,6 +218,14 @@ void MaemoSettingsWidget::initGui()
|
||||
m_ui->keyFileLineEdit->setExpectedKind(Utils::PathChooser::File);
|
||||
foreach(const MaemoDeviceConfigurations::DeviceConfig &devConf, m_devConfs)
|
||||
m_ui->configListWidget->addItem(devConf.name);
|
||||
|
||||
|
||||
#if 1 // Password authentication does not currently work due to ssh/scp issues.
|
||||
m_ui->authTypeLabel->hide();
|
||||
m_ui->authTypeButtonsWidget->hide();
|
||||
m_ui->passwordLabel->hide();
|
||||
m_ui->pwdLineEdit->hide();
|
||||
#endif
|
||||
}
|
||||
|
||||
void MaemoSettingsWidget::addConfig()
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
<x>0</x>
|
||||
<y>0</y>
|
||||
<width>515</width>
|
||||
<height>372</height>
|
||||
<height>387</height>
|
||||
</rect>
|
||||
</property>
|
||||
<property name="windowTitle">
|
||||
@@ -43,14 +43,14 @@
|
||||
<widget class="QLineEdit" name="nameLineEdit"/>
|
||||
</item>
|
||||
<item row="1" column="0">
|
||||
<widget class="QLabel" name="label_2">
|
||||
<widget class="QLabel" name="deviceTypeLabel">
|
||||
<property name="text">
|
||||
<string>Device type:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="1" column="1">
|
||||
<widget class="QWidget" name="widget_2" native="true">
|
||||
<widget class="QWidget" name="deviceTypeButtonsWidget" native="true">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_2">
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
@@ -76,14 +76,14 @@
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="0">
|
||||
<widget class="QLabel" name="label_8">
|
||||
<widget class="QLabel" name="authTypeLabel">
|
||||
<property name="text">
|
||||
<string>Authentication type:</string>
|
||||
</property>
|
||||
</widget>
|
||||
</item>
|
||||
<item row="2" column="1">
|
||||
<widget class="QWidget" name="widget_3" native="true">
|
||||
<widget class="QWidget" name="authTypeButtonsWidget" native="true">
|
||||
<layout class="QHBoxLayout" name="horizontalLayout_3">
|
||||
<property name="topMargin">
|
||||
<number>0</number>
|
||||
|
||||
Reference in New Issue
Block a user