aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--gpgwin.cpp3
-rw-r--r--keyserverimportdialog.cpp4
2 files changed, 7 insertions, 0 deletions
diff --git a/gpgwin.cpp b/gpgwin.cpp
index ec2c509..5c66324 100644
--- a/gpgwin.cpp
+++ b/gpgwin.cpp
@@ -725,12 +725,14 @@ void GpgWin::importKeyDialog()
QRadioButton *radio1 = new QRadioButton(tr("&File"));
QRadioButton *radio2 = new QRadioButton(tr("&Editor"));
QRadioButton *radio3 = new QRadioButton(tr("&Clipboard"));
+ QRadioButton *radio4 = new QRadioButton(tr("&Keyserver"));
radio1->setChecked(true);
QVBoxLayout *vbox1 = new QVBoxLayout();
vbox1->addWidget(radio1);
vbox1->addWidget(radio2);
vbox1->addWidget(radio3);
+ vbox1->addWidget(radio4);
groupBox->setLayout(vbox1);
QVBoxLayout *vbox2 = new QVBoxLayout();
@@ -742,6 +744,7 @@ void GpgWin::importKeyDialog()
if (radio1->isChecked()) importKeyFromFile();
if (radio2->isChecked()) importKeyFromEdit();
if (radio3->isChecked()) importKeyFromClipboard();
+ if (radio4->isChecked()) importKeyFromKeyServer();
}
}
diff --git a/keyserverimportdialog.cpp b/keyserverimportdialog.cpp
index 0482889..80469e6 100644
--- a/keyserverimportdialog.cpp
+++ b/keyserverimportdialog.cpp
@@ -147,6 +147,7 @@ void KeyServerImportDialog::search()
void KeyServerImportDialog::searchFinished()
{
keysTable->clearContents();
+ keysTable->setRowCount(0);
QString firstLine = QString(searchreply->readLine(1024));
QVariant redirectionTarget = searchreply->attribute(QNetworkRequest::RedirectionTargetAttribute);
@@ -162,6 +163,9 @@ void KeyServerImportDialog::searchFinished()
if (text.contains("No keys found")) {
setMessage(tr("No keys found containing the search string!"),true);
}
+ if (text.contains("Insufficiently specific words")) {
+ setMessage(tr("Insufficiently specific search string!"),true);
+ }
} else {
int row = 0;
char buff[1024];