Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-07-20 21:29:01 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Ask Password in new window if wrong in StartDialog.

Browse source 
And Fix LineEditClear to show placeholder test even if it has focus
(Like Qt5).
This commit is contained in:
Phenom 2017-07-19 19:39:21 +02:00
parent b387f15226
commit 5dc25e37f7
7 changed files with 71 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

34
retroshare-gui/src/gui/StartDialog.cpp
View file

@ -19,15 +19,18 @@
* Boston, MA 02110-1301, USA.
****************************************************************/
#include <QMessageBox>
#include "rshare.h"
#include "retroshare/rsinit.h"
#include "StartDialog.h"
#include "LogoBar.h"
#include "retroshare/rsnotify.h"
#include "rshare.h"
#include "settings/rsharesettings.h"
#include "retroshare/rsinit.h"
#include "retroshare/rsnotify.h"
#include <QLineEdit>
#include <QMessageBox>
#include <iostream>
/** Default constructor */
@ -74,7 +77,7 @@ StartDialog::StartDialog(QWidget *parent)
}
QObject::connect(ui.loadName,SIGNAL(currentIndexChanged(int)),this,SLOT(updateSelectedProfile(int))) ;
QObject::connect(ui.password_input,SIGNAL(returnPressed()),this,SLOT(loadPerson())) ;
//QObject::connect(ui.password_input,SIGNAL(returnPressed()),this,SLOT(loadPerson())) ;//Already called by StartDialog.returnPressed->loadButton.clicked
QObject::connect(ui.loadButton, SIGNAL(clicked()), this, SLOT(loadPerson()));
if (pidx > 0)
@ -87,8 +90,9 @@ StartDialog::StartDialog(QWidget *parent)
void StartDialog::updateSelectedProfile(int)
{
ui.password_input->clear();
ui.password_input->setFocus();
ui.password_input->clear();
ui.password_input->setPlaceholderText(tr("Password"));
ui.password_input->setFocus();
}
void StartDialog::closeEvent (QCloseEvent * event)
@ -111,14 +115,22 @@ void StartDialog::loadPerson()
QVariant data = ui.loadName->itemData(pgpidx);
RsPeerId accountId = RsPeerId((data.toString()).toStdString());
// Cache the passphrase, so that it is not asked again.
// Cache the passphrase, so that it is not asked again.
rsNotify->cachePgpPassphrase(ui.password_input->text().toUtf8().constData()) ;
rsNotify->setDisableAskPassword(true);
bool res = Rshare::loadCertificate(accountId, ui.autologin_checkbox->isChecked()) ;
if(res)
rsNotify->setDisableAskPassword(false);
if(res)
accept();
else
{
ui.password_input->setPlaceholderText(tr("Wrong password"));
ui.password_input->setText("");
ui.password_input->setFocus();
}
}
void StartDialog::on_labelProfile_linkActivated(QString /*link*/)