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

moved passphrase box into start dialog, and removed blank logo, replaced it by RS splash logo

Browse source
This commit is contained in:
csoler 2017-05-08 10:51:15 +02:00
parent 84c81588bb
commit de0f8b9595
3 changed files with 48 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -19,11 +19,13 @@
* Boston, MA 02110-1301, USA.
****************************************************************/
#include <rshare.h>
#include <retroshare/rsinit.h>
#include <QMessageBox>
#include "rshare.h"
#include "retroshare/rsinit.h"
#include "StartDialog.h"
#include "LogoBar.h"
#include <QMessageBox>
#include "retroshare/rsnotify.h"
#include "settings/rsharesettings.h"
#include <iostream>
@ -43,10 +45,6 @@ StartDialog::StartDialog(QWidget *parent)
Settings->loadWidgetInformation(this);
ui.loadButton->setFocus();
connect(ui.loadButton, SIGNAL(clicked()), this, SLOT(loadPerson()));
/* get all available pgp private certificates....
* mark last one as default.
*/
@ -75,12 +73,21 @@ 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())) ;
if (pidx > 0)
{
ui.loadName->setCurrentIndex(pidx);
}
}
void StartDialog::updateSelectedProfile(int)
{
ui.password_input->clear();
ui.password_input->setFocus();
}
void StartDialog::closeEvent (QCloseEvent * event)
{
Settings->saveWidgetInformation(this);
@ -101,18 +108,22 @@ void StartDialog::loadPerson()
QVariant data = ui.loadName->itemData(pgpidx);
RsPeerId accountId = RsPeerId((data.toString()).toStdString());
if (Rshare::loadCertificate(accountId, ui.autologin_checkbox->isChecked())) {
// Cache the passphrase, so that it is not asked again.
rsNotify->cachePgpPassphrase(ui.password_input->text().toUtf8().constData()) ;
bool res = Rshare::loadCertificate(accountId, ui.autologin_checkbox->isChecked()) ;
rsNotify->clearPgpPassphrase();
if(res)
accept();
}
}
void StartDialog::on_labelProfile_linkActivated(QString /*link*/)
{
// if ((QMessageBox::question(this, tr("Create a New Profile"),tr("This will generate a new Profile\n Are you sure you want to continue?"),QMessageBox::Yes|QMessageBox::No, QMessageBox::Yes))== QMessageBox::Yes)
// {
reqNewCert = true;
accept();
// }
}
bool StartDialog::requestedNewCert()