Commit 62e33d0e authored by ck's avatar ck
Browse files

Maemo: Allow SSH password to be displayed to the user.

Task-number: QTCREATORBUG-1961
Reviewed-by: kh1
parent 16e9d050
......@@ -218,6 +218,7 @@ void MaemoSettingsWidget::fillInValues()
m_ui->userLineEdit->setText(currentConfig().server.uname);
m_ui->pwdLineEdit->setText(currentConfig().server.pwd);
m_ui->keyFileLineEdit->setPath(currentConfig().server.privateKeyFile);
m_ui->showPasswordCheckBox->setChecked(false);
const bool isSimulator
= currentConfig().type == MaemoDeviceConfig::Simulator;
......@@ -317,6 +318,12 @@ void MaemoSettingsWidget::keyFileEditingFinished()
currentConfig().server.privateKeyFile = m_ui->keyFileLineEdit->path();
}
void MaemoSettingsWidget::showPassword(bool showClearText)
{
m_ui->pwdLineEdit->setEchoMode(showClearText
? QLineEdit::Normal : QLineEdit::Password);
}
void MaemoSettingsWidget::testConfig()
{
QDialog *dialog = new MaemoConfigTestDialog(currentConfig(), this);
......
......@@ -83,6 +83,7 @@ private slots:
void userNameEditingFinished();
void passwordEditingFinished();
void keyFileEditingFinished();
void showPassword(bool showClearText);
// For configuration testing.
void testConfig();
......
......@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>596</width>
<height>352</height>
<height>354</height>
</rect>
</property>
<property name="windowTitle">
......@@ -266,11 +266,22 @@
</widget>
</item>
<item row="7" column="1">
<widget class="QLineEdit" name="pwdLineEdit">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
<layout class="QHBoxLayout" name="horizontalLayout_6">
<item>
<widget class="QLineEdit" name="pwdLineEdit">
<property name="echoMode">
<enum>QLineEdit::Password</enum>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showPasswordCheckBox">
<property name="text">
<string>Show password</string>
</property>
</widget>
</item>
</layout>
</item>
<item row="8" column="0">
<widget class="QLabel" name="keyLabel">
......@@ -410,7 +421,7 @@
<hints>
<hint type="sourcelabel">
<x>419</x>
<y>269</y>
<y>268</y>
</hint>
<hint type="destinationlabel">
<x>422</x>
......@@ -425,8 +436,8 @@
<slot>passwordEditingFinished()</slot>
<hints>
<hint type="sourcelabel">
<x>419</x>
<y>300</y>
<x>291</x>
<y>299</y>
</hint>
<hint type="destinationlabel">
<x>423</x>
......@@ -706,6 +717,22 @@
</hint>
</hints>
</connection>
<connection>
<sender>showPasswordCheckBox</sender>
<signal>toggled(bool)</signal>
<receiver>MaemoSettingsWidget</receiver>
<slot>showPassword(bool)</slot>
<hints>
<hint type="sourcelabel">
<x>316</x>
<y>290</y>
</hint>
<hint type="destinationlabel">
<x>3</x>
<y>262</y>
</hint>
</hints>
</connection>
</connections>
<slots>
<slot>configNameEditingFinished()</slot>
......@@ -725,5 +752,6 @@
<slot>gdbServerPortEditingFinished()</slot>
<slot>currentConfigChanged(int)</slot>
<slot>showGenerateSshKeyDialog()</slot>
<slot>showPassword(bool)</slot>
</slots>
</ui>
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment