new version number and smaller changes

git-svn-id: http://cpunk.de/svn/src/gpg4usb/trunk@216 34ebc366-c3a9-4b3c-9f84-69acf7962910

5 files changed, 14 insertions, 12 deletions

diff --git a/README.build b/README.build
index b6e86b5..746b690 100644
--- a/README.build
+++ b/README.build
@@ -36,3 +36,7 @@ Useful Links:
 http://sourceforge.net/apps/trac/unetbootin/wiki/compile
 http://www.trilithium.com/johan/2005/06/static-libstdc/
 
+Coding Style:
+-------------
+http://techbase.kde.org/Policies/Kdelibs_Coding_Style
+
diff --git a/TODO b/TODO
index 551505d..7ad0704 100644
--- a/TODO
+++ b/TODO
@@ -3,18 +3,18 @@ TODO:
 Release 0.2
 - move to Qt 4.5 (includes building static qt on win32 and linux, also write howto about static building) 
 - KeyManagement (create/export) [DONE] 
-- new thread for key creation, to keep gui responsive
-  - export private key
-  - progressbar on key creation 
+- new thread for key creation, to keep gui responsive [DONE]
+- progressbar on key creation [DONE]
 - File En-/Decryption [DONE]
 
 Release 0.3
 - adding signing and verifying
-  - nice for verify: inport key from keyserver
+- nice for verify: import key from keyserver
+- export private key 
 
 Later:
 - Add QSettings for persistent configuration
-   - Encrypt to self
+- Encrypt to self
 
 
 - Binary File Attachements, function for Decrypt & Help-Text (like safe eml, etc)
diff --git a/keymgmt.cpp b/keymgmt.cpp
index 942bd5f..2487a00 100755
--- a/keymgmt.cpp
+++ b/keymgmt.cpp
@@ -54,22 +54,22 @@ void KeyMgmt::createActions()
     closeAct->setToolTip(tr("Close Key Management"));
     connect(closeAct, SIGNAL(triggered()), this, SLOT(close()));
 
-    importKeyFromFileAct = new QAction(tr("Import Key From &File"), this);
+    importKeyFromFileAct = new QAction(tr("Import From &File"), this);
     importKeyFromFileAct->setIcon(QIcon(mIconPath + "import_key_from_file.png"));
     importKeyFromFileAct->setToolTip(tr("Import New Key From File"));
     connect(importKeyFromFileAct, SIGNAL(triggered()), this, SLOT(importKeyFromFile()));
 
-    importKeyFromClipboardAct = new QAction(tr("Import Key From &Clipboard"), this);
+    importKeyFromClipboardAct = new QAction(tr("Import From &Clipboard"), this);
     importKeyFromClipboardAct->setIcon(QIcon(mIconPath + "import_key_from_clipboard.png"));
     importKeyFromClipboardAct->setToolTip(tr("Import New Key From Clipboard"));
     connect(importKeyFromClipboardAct, SIGNAL(triggered()), this, SLOT(importKeyFromClipboard()));
 
-    exportKeyToClipboardAct = new QAction(tr("Export Key To &Clipboard"), this);
+    exportKeyToClipboardAct = new QAction(tr("Export To &Clipboard"), this);
     exportKeyToClipboardAct->setIcon(QIcon(mIconPath + "export_key_to_clipbaord.png"));
     exportKeyToClipboardAct->setToolTip(tr("Export Selected Key(s) To Clipboard"));
     connect(exportKeyToClipboardAct, SIGNAL(triggered()), this, SLOT(exportKeyToClipboard()));
 
-    exportKeyToFileAct = new QAction(tr("Export Key To &File"), this);
+    exportKeyToFileAct = new QAction(tr("Export To &File"), this);
     exportKeyToFileAct->setIcon(QIcon(mIconPath + "export_key_to_file.png"));
     exportKeyToFileAct->setToolTip(tr("Export Selected Key(s) To File"));
     connect(exportKeyToFileAct, SIGNAL(triggered()), this, SLOT(exportKeyToFile()));
@@ -112,8 +112,6 @@ void KeyMgmt::createToolBars()
     keyToolBar->addAction(importKeyFromFileAct);
     keyToolBar->addAction(importKeyFromClipboardAct);
     keyToolBar->addSeparator();
-    keyToolBar->addAction(generateKeyDialogAct);
-    keyToolBar->addSeparator();
     keyToolBar->addAction(deleteCheckedKeysAct);
     keyToolBar->addSeparator();
     keyToolBar->addAction(exportKeyToFileAct);
diff --git a/main.cpp b/main.cpp
index 17b2400..2ffd136 100644
--- a/main.cpp
+++ b/main.cpp
@@ -33,7 +33,7 @@ int main(int argc, char *argv[])
 
     QApplication app(argc, argv);
 
-    app.setApplicationVersion("0.1");
+    app.setApplicationVersion("0.2");
     app.setApplicationName("gpg4usb");
 
     //internationalize
diff --git a/release/keydb/pubring.gpg b/release/keydb/pubring.gpg
deleted file mode 100644
index bf07f2f..0000000
--- a/release/keydb/pubring.gpg
+++ /dev/null