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

show info about node creation after import of pgp key (patch from Henry)

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@8264 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
electron128 2015-05-16 09:33:06 +00:00
parent 514dd91fe6
commit 3d3a163a75
2 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@
#include <rshare.h> #include <rshare.h>
#include <util/rsrandom.h> #include <util/rsrandom.h>
#include <retroshare/rsinit.h> #include <retroshare/rsinit.h>
#include <rsserver/rsaccounts.h>
#include "GenCertDialog.h" #include "GenCertDialog.h"
#include <QAbstractEventDispatcher> #include <QAbstractEventDispatcher>
#include <QFileDialog> #include <QFileDialog>
@ -255,6 +256,7 @@ void GenCertDialog::mouseMoveEvent(QMouseEvent *e)
void GenCertDialog::newGPGKeyGenUiSetup() { void GenCertDialog::newGPGKeyGenUiSetup() {
bool adv_state = ui.adv_checkbox->isChecked(); bool adv_state = ui.adv_checkbox->isChecked();
bool hidden_state = ui.hidden_checkbox->isChecked(); bool hidden_state = ui.hidden_checkbox->isChecked();
ui.no_node_label->setVisible(false);
if (ui.new_gpg_key_checkbox->isChecked()) { if (ui.new_gpg_key_checkbox->isChecked()) {
genNewGPGKey = true; genNewGPGKey = true;
@ -286,6 +288,13 @@ void GenCertDialog::newGPGKeyGenUiSetup() {
//ui.keylength_comboBox->show(); //ui.keylength_comboBox->show();
} else { } else {
bool havePGPkeys = (ui.genPGPuser->count() != 0)?true:false; bool havePGPkeys = (ui.genPGPuser->count() != 0)?true:false;
if (havePGPkeys) {
QVariant data = ui.genPGPuser->itemData(ui.genPGPuser->currentIndex());
if (!rsAccounts->selectAccountByString(data.toString().toStdString())) {
ui.no_node_label->setText(tr("No node is associated with the profile named") + " " + ui.genPGPuser->currentText() + ". " +tr("Please create a node for it by providing a node name."));
ui.no_node_label->setVisible(true);
}
}
genNewGPGKey = false; genNewGPGKey = false;
ui.name_label->hide(); ui.name_label->hide();
ui.name_input->hide(); ui.name_input->hide();

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

@ -79,6 +79,16 @@
</property> </property>
</widget> </widget>
</item> </item>
<item>
<widget class="QLabel" name="no_node_label">
<property name="text">
<string>No node exists for this profile.</string>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
</item>
<item> <item>
<layout class="QHBoxLayout" name="horizontalLayout_4"> <layout class="QHBoxLayout" name="horizontalLayout_4">
<item> <item>