Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add Patch from Phenom:

Browse Source 
Fix return to GenCertDialog when RsAccounts::GenerateSSLCertificate failed (if you enter a false password).
Now, directly abort.
And order tab stop.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@7389 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2014-05-29 15:09:49 +00:00
parent e65f73a44d
commit 2ae9f2d50d
2 changed files with 29 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
retroshare-gui/src/gui/GenCertDialog.cpp
View File

@ -467,5 +467,6 @@ void GenCertDialog::genPerson()
tr("Generate ID Failure"), tr("Generate ID Failure"),
tr("Failed to Generate your new Certificate, maybe PGP password is wrong!"), tr("Failed to Generate your new Certificate, maybe PGP password is wrong!"),
QMessageBox::Ok); QMessageBox::Ok);
reject();
} }
} }

11
retroshare-gui/src/gui/GenCertDialog.ui
View File

@ -6,7 +6,7 @@
<rect> <rect>
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>677</width> <width>784</width>
<height>509</height> <height>509</height>
</rect> </rect>
</property> </property>
@ -465,7 +465,16 @@ anonymous, you can use a fake email.</string>
<tabstop>genPGPuser</tabstop> <tabstop>genPGPuser</tabstop>
<tabstop>name_input</tabstop> <tabstop>name_input</tabstop>
<tabstop>email_input</tabstop> <tabstop>email_input</tabstop>
<tabstop>password_input</tabstop>
<tabstop>password_input_2</tabstop>
<tabstop>location_input</tabstop> <tabstop>location_input</tabstop>
<tabstop>hiddenaddr_input</tabstop>
<tabstop>hiddenport_spinBox</tabstop>
<tabstop>genButton</tabstop>
<tabstop>new_gpg_key_checkbox</tabstop>
<tabstop>hidden_checkbox</tabstop>
<tabstop>importIdentity_PB</tabstop>
<tabstop>exportIdentity_PB</tabstop>
</tabstops> </tabstops>
<resources> <resources>
<include location="images.qrc"/> <include location="images.qrc"/>