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

Maemo: Hide password-related GUI elements.

Browse Source
This commit is contained in:
ck
2009-12-10 17:34:22 +01:00
parent 57634ab2d1
commit 0e3ee9c7b2
3 changed files with 16 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/qt4projectmanager/qt-maemo/maemodeviceconfigurations.cpp
View File

@@ -146,6 +146,7 @@ void MaemoDeviceConfigurations::save()
{ {
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
settings->beginGroup(SettingsGroup); settings->beginGroup(SettingsGroup);
qDebug("Writing next id: %llu", m_nextId);
settings->setValue(IdCounterKey, m_nextId); settings->setValue(IdCounterKey, m_nextId);
settings->beginWriteArray(ConfigListKey, m_devConfigs.count()); settings->beginWriteArray(ConfigListKey, m_devConfigs.count());
for (int i = 0; i < m_devConfigs.count(); ++i) { for (int i = 0; i < m_devConfigs.count(); ++i) {
@@ -166,8 +167,9 @@ MaemoDeviceConfigurations::MaemoDeviceConfigurations(QObject *parent)
void MaemoDeviceConfigurations::load() void MaemoDeviceConfigurations::load()
{ {
QSettings *settings = Core::ICore::instance()->settings(); QSettings *settings = Core::ICore::instance()->settings();
m_nextId = settings->value(IdCounterKey, 1).toULongLong();
settings->beginGroup(SettingsGroup); settings->beginGroup(SettingsGroup);
m_nextId = settings->value(IdCounterKey, 1).toULongLong();
qDebug("Read next id: %llu", m_nextId);
int count = settings->beginReadArray(ConfigListKey); int count = settings->beginReadArray(ConfigListKey);
for (int i = 0; i < count; ++i) { for (int i = 0; i < count; ++i) {
settings->setArrayIndex(i); settings->setArrayIndex(i);

8
src/plugins/qt4projectmanager/qt-maemo/maemosettingspage.cpp
View File

@@ -218,6 +218,14 @@ void MaemoSettingsWidget::initGui()
m_ui->keyFileLineEdit->setExpectedKind(Utils::PathChooser::File); m_ui->keyFileLineEdit->setExpectedKind(Utils::PathChooser::File);
foreach(const MaemoDeviceConfigurations::DeviceConfig &devConf, m_devConfs) foreach(const MaemoDeviceConfigurations::DeviceConfig &devConf, m_devConfs)
m_ui->configListWidget->addItem(devConf.name); 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() void MaemoSettingsWidget::addConfig()

10
src/plugins/qt4projectmanager/qt-maemo/maemosettingswidget.ui
View File

@@ -7,7 +7,7 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>515</width> <width>515</width>
<height>372</height> <height>387</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
@@ -43,14 +43,14 @@
<widget class="QLineEdit" name="nameLineEdit"/> <widget class="QLineEdit" name="nameLineEdit"/>
</item> </item>
<item row="1" column="0"> <item row="1" column="0">
<widget class="QLabel" name="label_2"> <widget class="QLabel" name="deviceTypeLabel">
<property name="text"> <property name="text">
<string>Device type:</string> <string>Device type:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="1"> <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"> <layout class="QHBoxLayout" name="horizontalLayout_2">
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>
@@ -76,14 +76,14 @@
</widget> </widget>
</item> </item>
<item row="2" column="0"> <item row="2" column="0">
<widget class="QLabel" name="label_8"> <widget class="QLabel" name="authTypeLabel">
<property name="text"> <property name="text">
<string>Authentication type:</string> <string>Authentication type:</string>
</property> </property>
</widget> </widget>
</item> </item>
<item row="2" column="1"> <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"> <layout class="QHBoxLayout" name="horizontalLayout_3">
<property name="topMargin"> <property name="topMargin">
<number>0</number> <number>0</number>