Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-12-29 09:26:18 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

added checkbox for using old cert format in security page. Switch to old format by default, to avoid confusing newbees

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5478 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
csoler 2012-08-27 22:15:27 +00:00
parent 6675bfe35e
commit 1d72bd646b
4 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
retroshare-gui/src/gui/connect/ConfCertDialog.cpp
View File

@ -66,6 +66,8 @@ ConfCertDialog::ConfCertDialog(const std::string& id, QWidget *parent, Qt::WFlag
/* Invoke Qt Designer generated QObject setup routine */ /* Invoke Qt Designer generated QObject setup routine */
ui.setupUi(this); ui.setupUi(this);
ui._useOldFormat_CB->setChecked(true) ;
ui.headerFrame->setHeaderImage(QPixmap(":/images/user/identityinfo48.png")); ui.headerFrame->setHeaderImage(QPixmap(":/images/user/identityinfo48.png"));
ui.headerFrame->setHeaderText(tr("Friend Details")); ui.headerFrame->setHeaderText(tr("Friend Details"));

2
retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
View File

@ -160,6 +160,8 @@ void ConnectFriendWizard::initializePage(int id)
cleanfriendCertTimer->setInterval(1000); // 1 second cleanfriendCertTimer->setInterval(1000); // 1 second
connect(cleanfriendCertTimer, SIGNAL(timeout()), this, SLOT(cleanFriendCert())); connect(cleanfriendCertTimer, SIGNAL(timeout()), this, SLOT(cleanFriendCert()));
ui->userCertOldFormatButton->setChecked(true);
toggleFormatState(false); toggleFormatState(false);
toggleSignatureState(false); toggleSignatureState(false);
updateOwnCert(); updateOwnCert();

3
retroshare-gui/src/gui/settings/CryptoPage.cpp
View File

@ -42,6 +42,7 @@ CryptoPage::CryptoPage(QWidget * parent, Qt::WFlags flags)
connect(ui.saveButton, SIGNAL(clicked()), this, SLOT(fileSaveAs())); connect(ui.saveButton, SIGNAL(clicked()), this, SLOT(fileSaveAs()));
connect(ui._includeSignatures_CB, SIGNAL(toggled(bool)), this, SLOT(load())); connect(ui._includeSignatures_CB, SIGNAL(toggled(bool)), this, SLOT(load()));
connect(ui._copyLink_PB, SIGNAL(clicked()), this, SLOT(copyRSLink())); connect(ui._copyLink_PB, SIGNAL(clicked()), this, SLOT(copyRSLink()));
connect(ui._useOldFormat_CB, SIGNAL(toggled(bool)), this, SLOT(load()));
/* Hide platform specific features */ /* Hide platform specific features */
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
@ -68,7 +69,7 @@ CryptoPage::load()
QFont font("Courier New",9,50,false) ; QFont font("Courier New",9,50,false) ;
ui.certtextEdit->setFont(font) ; ui.certtextEdit->setFont(font) ;
ui.certtextEdit->setPlainText(QString::fromUtf8(rsPeers->GetRetroshareInvite(ui._includeSignatures_CB->isChecked()).c_str())); ui.certtextEdit->setPlainText(QString::fromUtf8(rsPeers->GetRetroshareInvite(ui._includeSignatures_CB->isChecked(),ui._useOldFormat_CB->isChecked()).c_str()));
ui.certtextEdit->setReadOnly(true); ui.certtextEdit->setReadOnly(true);
ui.certtextEdit->setMinimumHeight(200); ui.certtextEdit->setMinimumHeight(200);
} }

10
retroshare-gui/src/gui/settings/CryptoPage.ui
View File

@ -79,6 +79,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="1" column="3">
<widget class="QCheckBox" name="_useOldFormat_CB">
<property name="text">
<string>Use old key format</string>
</property>
<property name="checked">
<bool>true</bool>
</property>
</widget>
</item>
</layout> </layout>
</widget> </widget>
<resources/> <resources/>