aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2008-10-08 16:16:45 +0000
committernils <nils@34ebc366-c3a9-4b3c-9f84-69acf7962910>2008-10-08 16:16:45 +0000
commit1a7ee0101a14e40543802942a04f7413d10c8302 (patch)
tree5fe88e6213af7a6e31b4a5f5ae76a4eda199ef46
parentrenamed myCtx to mCtx in gpgwin* (diff)
downloadgpg4usb-1a7ee0101a14e40543802942a04f7413d10c8302.tar.gz
gpg4usb-1a7ee0101a14e40543802942a04f7413d10c8302.zip
now keylist is refreshed in all keylists (mainwindow and keymgmt ), when one of them changed
git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@186 34ebc366-c3a9-4b3c-9f84-69acf7962910
-rw-r--r--context.cpp3
-rw-r--r--context.h6
-rw-r--r--keylist.cpp2
-rw-r--r--keylist.h4
-rwxr-xr-xkeymgmt.cpp2
-rw-r--r--release/icons/import_key_from_clipbaord.pngbin4771 -> 0 bytes
-rw-r--r--release/icons/import_key_from_clipboard.pngbin0 -> 4169 bytes
-rwxr-xr-x[-rw-r--r--]release/icons/import_key_from_file.pngbin3985 -> 3985 bytes
-rw-r--r--release/icons/key_generate.pngbin0 -> 5140 bytes
-rw-r--r--release/icons/misc_doc.pngbin0 -> 1126 bytes
-rw-r--r--release/icons/txt.pngbin0 -> 2482 bytes
-rw-r--r--release/keydb/pubring.gpgbin1164 -> 1166 bytes
12 files changed, 13 insertions, 4 deletions
diff --git a/context.cpp b/context.cpp
index 94a4ea1..be7931e 100644
--- a/context.cpp
+++ b/context.cpp
@@ -105,6 +105,8 @@ void Context::importKey(QByteArray inBuffer)
err = gpgme_op_import(m_ctx, in);
checkErr(err);
gpgme_data_release(in);
+ emit keyDBChanged();
+
}
/** Export Key to QByteArray
@@ -200,6 +202,7 @@ void Context::deleteKeys(QList<QString> *uidList)
gpgme_op_keylist_end(m_ctx);
gpgme_op_delete(m_ctx, key, 1);
}
+ emit keyDBChanged();
}
/** Encrypt inBuffer for reciepients-uids, write
diff --git a/context.h b/context.h
index fd4277c..8f4cc99 100644
--- a/context.h
+++ b/context.h
@@ -51,8 +51,9 @@ typedef QLinkedList< GpgKey > GpgKeyList;
namespace GpgME
{
-class Context
+class Context : public QObject
{
+ Q_OBJECT
public:
Context(); // Consttructor
@@ -67,6 +68,9 @@ public:
bool decrypt(const QByteArray &inBuffer, QByteArray *outBuffer);
void clearCache();
+signals:
+ void keyDBChanged();
+
private:
gpgme_ctx_t m_ctx;
gpgme_data_t in, out;
diff --git a/keylist.cpp b/keylist.cpp
index 4ef8322..1aef56b 100644
--- a/keylist.cpp
+++ b/keylist.cpp
@@ -56,7 +56,7 @@ KeyList::KeyList(GpgME::Context* ctx, QString iconpath, QWidget *parent)
setLayout(layout);
popupMenu = new QMenu(this);
-
+ connect(mCtx, SIGNAL(keyDBChanged()), this, SLOT(refresh()));
refresh();
}
diff --git a/keylist.h b/keylist.h
index be30a73..63911cf 100644
--- a/keylist.h
+++ b/keylist.h
@@ -39,7 +39,6 @@ class KeyList : public QWidget
Q_OBJECT
public:
- void refresh();
void setColumnWidth(int row, int size);
void addMenuAction(QAction *act);
@@ -47,6 +46,9 @@ public:
QList<QString> *getChecked();
QList<QString> *getSelected();
+public slots:
+ void refresh();
+
private:
GpgME::Context *mCtx;
QTableWidget *mKeyList;
diff --git a/keymgmt.cpp b/keymgmt.cpp
index 4aee4a1..67e2c17 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -60,7 +60,7 @@ void KeyMgmt::createActions()
connect(importKeyFromFileAct, SIGNAL(triggered()), this, SLOT(importKeyFromFile()));
importKeyFromClipboardAct = new QAction(tr("Import Key From &Clipboard"), this);
- importKeyFromClipboardAct->setIcon(QIcon(mIconPath + "import_key_from_clipbaord.png"));
+ importKeyFromClipboardAct->setIcon(QIcon(mIconPath + "import_key_from_clipboard.png"));
importKeyFromClipboardAct->setStatusTip(tr("Import New Key From Clipboard"));
connect(importKeyFromClipboardAct, SIGNAL(triggered()), this, SLOT(importKeyFromClipboard()));
diff --git a/release/icons/import_key_from_clipbaord.png b/release/icons/import_key_from_clipbaord.png
deleted file mode 100644
index 337c024..0000000
--- a/release/icons/import_key_from_clipbaord.png
+++ /dev/null
Binary files differ
diff --git a/release/icons/import_key_from_clipboard.png b/release/icons/import_key_from_clipboard.png
new file mode 100644
index 0000000..d06fb26
--- /dev/null
+++ b/release/icons/import_key_from_clipboard.png
Binary files differ
diff --git a/release/icons/import_key_from_file.png b/release/icons/import_key_from_file.png
index 621c4e2..621c4e2 100644..100755
--- a/release/icons/import_key_from_file.png
+++ b/release/icons/import_key_from_file.png
Binary files differ
diff --git a/release/icons/key_generate.png b/release/icons/key_generate.png
new file mode 100644
index 0000000..78a644b
--- /dev/null
+++ b/release/icons/key_generate.png
Binary files differ
diff --git a/release/icons/misc_doc.png b/release/icons/misc_doc.png
new file mode 100644
index 0000000..78851f3
--- /dev/null
+++ b/release/icons/misc_doc.png
Binary files differ
diff --git a/release/icons/txt.png b/release/icons/txt.png
new file mode 100644
index 0000000..8db7ba4
--- /dev/null
+++ b/release/icons/txt.png
Binary files differ
diff --git a/release/keydb/pubring.gpg b/release/keydb/pubring.gpg
index c71d827..acb4872 100644
--- a/release/keydb/pubring.gpg
+++ b/release/keydb/pubring.gpg
Binary files differ