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

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

@ -464,8 +464,9 @@ void GenCertDialog::genPerson()
{ {
/* Message Dialog */ /* Message Dialog */
QMessageBox::warning(this, QMessageBox::warning(this,
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();
} }
}

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

@ -3,13 +3,13 @@
<class>GenCertDialog</class> <class>GenCertDialog</class>
<widget class="QDialog" name="GenCertDialog"> <widget class="QDialog" name="GenCertDialog">
<property name="geometry"> <property name="geometry">
<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>
<property name="windowTitle"> <property name="windowTitle">
<string>Create new Profile</string> <string>Create new Profile</string>
</property> </property>
@ -462,13 +462,22 @@ anonymous, you can use a fake email.</string>
</customwidget> </customwidget>
</customwidgets> </customwidgets>
<tabstops> <tabstops>
<tabstop>genPGPuser</tabstop> <tabstop>genPGPuser</tabstop>
<tabstop>name_input</tabstop> <tabstop>name_input</tabstop>
<tabstop>email_input</tabstop> <tabstop>email_input</tabstop>
<tabstop>location_input</tabstop> <tabstop>password_input</tabstop>
</tabstops> <tabstop>password_input_2</tabstop>
<resources> <tabstop>location_input</tabstop>
<include location="images.qrc"/> <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>
<resources>
<include location="images.qrc"/>
</resources> </resources>
<connections/> <connections/>
</ui> </ui>