aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-05-01 11:27:09 +0000
committerubbo <ubbo@34ebc366-c3a9-4b3c-9f84-69acf7962910>2012-05-01 11:27:09 +0000
commita06539af3448396f56a44d6859f2a54b787cdd8d (patch)
treed9f67bb91c095b8c10a18e397f9e8fade89ae100
parentpossibility for detached signing in gpgcontext (diff)
downloadgpg4usb-a06539af3448396f56a44d6859f2a54b787cdd8d.tar.gz
gpg4usb-a06539af3448396f56a44d6859f2a54b787cdd8d.zip
sign files integrated
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@908 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rwxr-xr-xfileencryptiondialog.cpp16
1 files changed, 12 insertions, 4 deletions
diff --git a/fileencryptiondialog.cpp b/fileencryptiondialog.cpp
index b4e2037..8735b9d 100755
--- a/fileencryptiondialog.cpp
+++ b/fileencryptiondialog.cpp
@@ -64,9 +64,12 @@ FileEncryptionDialog::FileEncryptionDialog(GpgME::GpgContext *ctx, QStringList k
gLayout->addWidget(fl1, 0, 0);
gLayout->addWidget(inputFileEdit, 0, 1);
gLayout->addWidget(fb1, 0, 2);
- gLayout->addWidget(fl2, 1, 0);
- gLayout->addWidget(outputFileEdit, 1, 1);
- gLayout->addWidget(fb2, 1, 2);
+ // verify does not need outfile
+ if(mAction != Verify) {
+ gLayout->addWidget(fl2, 1, 0);
+ gLayout->addWidget(outputFileEdit, 1, 1);
+ gLayout->addWidget(fb2, 1, 2);
+ }
groupBox1->setLayout(gLayout);
/*Setup KeyList*/
@@ -106,6 +109,8 @@ void FileEncryptionDialog::selectInputFile()
if (infileName > 0 && outputFileEdit->text().size() == 0) {
if (mAction == Encrypt) {
outputFileEdit->setText(infileName + ".asc");
+ } else if (mAction == Sign) {
+ outputFileEdit->setText(infileName + ".sig");
} else {
if (infileName.endsWith(".asc", Qt::CaseInsensitive)) {
QString ofn = infileName;
@@ -145,11 +150,14 @@ void FileEncryptionDialog::executeAction()
if ( mAction == Encrypt ) {
if (! mCtx->encrypt(mKeyList->getChecked(), inBuffer, outBuffer)) return;
}
-
if ( mAction == Decrypt ) {
if (! mCtx->decrypt(inBuffer, outBuffer)) return;
}
+ if( mAction == Sign ) {
+ mCtx->sign(mKeyList->getChecked(), inBuffer, outBuffer, true);
+ }
+
QFile outfile(outputFileEdit->text());
if (outfile.exists()){
QMessageBox::StandardButton ret;