projects cleanup

added version info

git-svn-id: http://svn.miranda-ng.org/main/trunk@3842 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

4 files changed, 108 insertions, 133 deletions

diff --git a/plugins/New_GPG/res/Version.rc b/plugins/New_GPG/res/Version.rc
new file mode 100644
index 0000000000..5bfbab4754
--- /dev/null
+++ b/plugins/New_GPG/res/Version.rc
@@ -0,0 +1,38 @@
+// Microsoft Visual C++ generated resource script.

+//

+#ifdef APSTUDIO_INVOKED

+#error this file is not editable by Microsoft Visual C++

+#endif //APSTUDIO_INVOKED

+

+#include "afxres.h"

+#include "..\src\version.h"

+

+VS_VERSION_INFO VERSIONINFO

+ FILEVERSION __FILEVERSION_STRING

+ PRODUCTVERSION __FILEVERSION_STRING

+ FILEFLAGSMASK 0x17L

+#ifdef _DEBUG

+ FILEFLAGS 0x1L

+#else

+ FILEFLAGS 0x0L

+#endif

+ FILEOS 0x4L

+ FILETYPE 0x0L

+ FILESUBTYPE 0x0L

+BEGIN

+    BLOCK "StringFileInfo"

+    BEGIN

+        BLOCK "000004b0"

+        BEGIN

+            VALUE "FileDescription", __DESCRIPTION

+            VALUE "InternalName", __PLUGIN_NAME

+            VALUE "LegalCopyright", __COPYRIGHT

+            VALUE "OriginalFilename", __FILENAME

+            VALUE "ProductName", __PLUGIN_NAME

+        END

+    END

+    BLOCK "VarFileInfo"

+    BEGIN

+        VALUE "Translation", 0x0, 1200

+    END

+END

diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc
index 872a7fd394..452c9aff7a 100755
--- a/plugins/New_GPG/res/new_gpg.rc
+++ b/plugins/New_GPG/res/new_gpg.rc
@@ -213,6 +213,68 @@ BEGIN
     PUSHBUTTON      "Ok",IDC_OK,7,55,50,14

 END

 

+IDD_OPT_GPG DIALOGEX 0, 0, 286, 214

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+FONT 8, "MS Shell Dlg", 400, 0, 0x0

+BEGIN

+    CONTROL         "",IDC_USERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,17,272,112

+    CTEXT           "Userlist:",IDC_STATIC,25,7,201,8

+    PUSHBUTTON      "Export PubKey",IDC_SAVE_KEY_BUTTON,8,135,75,14

+    PUSHBUTTON      "Delete key",IDC_DELETE_KEY_BUTTON,90,135,70,14

+    PUSHBUTTON      "Select own key",IDC_SELECT_KEY,205,193,74,14

+    CONTROL         "Turn on debug log",IDC_DEBUG_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,159,89,10

+    EDITTEXT        IDC_LOG_FILE_EDIT,11,157,98,14,ES_AUTOHSCROLL

+    PUSHBUTTON      "Browse",IDC_LOG_FILE_SET,119,156,50,14

+    CONTROL         "Use jabber api on Miranda NG (recomended)",IDC_JABBER_API,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,251,10

+    LTEXT           "Default key",IDC_CURRENT_KEY,12,196,110,8

+    CONTROL         "Encrypt file transfers",IDC_FILE_TRANSFERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,185,137,10

+    CONTROL         "Automatic key exchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,137,111,10

+    PUSHBUTTON      "Copy own key",IDC_COPY_KEY,127,193,74,14

+END

+

+IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 71

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+FONT 8, "MS Shell Dlg", 400, 0, 0x0

+BEGIN

+    PUSHBUTTON      "Browse",IDC_SET_BIN_PATH,216,17,60,14

+    PUSHBUTTON      "Browse",IDC_SET_HOME_DIR,217,44,57,14

+    EDITTEXT        IDC_BIN_PATH,7,17,195,14,ES_AUTOHSCROLL

+    EDITTEXT        IDC_HOME_DIR,7,44,195,14,ES_AUTOHSCROLL

+    LTEXT           "GnuPG binary:",IDC_STATIC,10,7,147,8

+    LTEXT           "Home directory:",IDC_STATIC,9,34,144,8

+END

+

+IDD_OPT_GPG_MESSAGES DIALOGEX 0, 0, 302, 100

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+FONT 8, "MS Shell Dlg", 400, 0, 0x0

+BEGIN

+    CONTROL         "Add tags to encoded and decoded messages",IDC_APPEND_TAGS,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,65,243,10

+    EDITTEXT        IDC_IN_OPEN_TAG,39,20,88,14,ES_AUTOHSCROLL

+    EDITTEXT        IDC_IN_CLOSE_TAG,151,20,90,14,ES_AUTOHSCROLL

+    LTEXT           "Incomming message tags:",IDC_STATIC,15,10,84,8

+    LTEXT           "Outgoing message tags:",IDC_STATIC,13,36,79,8

+    RTEXT           "Open:",IDC_STATIC,13,23,26,8

+    RTEXT           "Close:",IDC_STATIC,127,23,23,8

+    EDITTEXT        IDC_OUT_OPEN_TAG,39,46,88,14,ES_AUTOHSCROLL

+    EDITTEXT        IDC_OUT_CLOSE_TAG,151,46,90,14,ES_AUTOHSCROLL

+    RTEXT           "Open:",IDC_STATIC,13,49,26,8

+    RTEXT           "Close:",IDC_STATIC,127,49,23,8

+    CONTROL         "Strip all tags in outgoing messages",IDC_STRIP_TAGS,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,76,233,10

+END

+

+IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 50

+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

+FONT 8, "MS Shell Dlg", 400, 0, 0x0

+BEGIN

+    CONTROL         "Turn on presence signing (Jabber) (required by xep 0-27)",IDC_PRESCENSE_SUBSCRIPTION,

+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,9,268,10

+    PUSHBUTTON      "Export keys",IDC_EXPORT,12,26,60,14

+    PUSHBUTTON      "Import keys",IDC_IMPORT,82,26,68,14

+END

+

 

 /////////////////////////////////////////////////////////////////////////////

 //

@@ -316,6 +378,12 @@ BEGIN
         TOPMARGIN, 7

         BOTTOMMARGIN, 69

     END

+

+    IDD_OPT_GPG_ADVANCED, DIALOG

+    BEGIN

+        VERTGUIDE, 12

+        BOTTOMMARGIN, 40

+    END

 END

 #endif    // APSTUDIO_INVOKED

 

@@ -327,145 +395,14 @@ END
 

 // Icon with lowest ID value placed first to ensure application icon

 // remains consistent on all systems.

-IDI_SECURED             ICON                    "icons\\secured.ico"

-IDI_UNSECURED           ICON                    "icons\\unsecured.ico"

+IDI_SECURED             ICON                    "secured.ico"

+IDI_UNSECURED           ICON                    "unsecured.ico"

 

-/////////////////////////////////////////////////////////////////////////////

-//

-// Version

-//

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION 0,0,0,11

- PRODUCTVERSION 0,9,0,0

- FILEFLAGSMASK 0x17L

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x4L

- FILETYPE 0x0L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "041904b0"

-        BEGIN

-            VALUE "FileDescription", "new_gpg"

-            VALUE "FileVersion", "0.0.0.11"

-            VALUE "InternalName", "new_gpg"

-            VALUE "LegalCopyright", "Copyright (C) 2010-2011 sss"

-            VALUE "OriginalFilename", "new_gpg"

-            VALUE "ProductName", "new_gpg"

-            VALUE "ProductVersion", "0.9.0.0"

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x419, 1200

-    END

-END

 

 #endif    // Русский (Россия) resources

 /////////////////////////////////////////////////////////////////////////////

 

 

-/////////////////////////////////////////////////////////////////////////////

-// Английский (США) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

-IDD_OPT_GPG DIALOGEX 0, 0, 286, 214

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-FONT 8, "MS Shell Dlg", 400, 0, 0x0

-BEGIN

-    CONTROL         "",IDC_USERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,17,272,112

-    CTEXT           "Userlist:",IDC_STATIC,25,7,201,8

-    PUSHBUTTON      "Export PubKey",IDC_SAVE_KEY_BUTTON,8,135,75,14

-    PUSHBUTTON      "Delete key",IDC_DELETE_KEY_BUTTON,90,135,70,14

-    PUSHBUTTON      "Select own key",IDC_SELECT_KEY,205,193,74,14

-    CONTROL         "Turn on debug log",IDC_DEBUG_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,159,89,10

-    EDITTEXT        IDC_LOG_FILE_EDIT,11,157,98,14,ES_AUTOHSCROLL

-    PUSHBUTTON      "Browse",IDC_LOG_FILE_SET,119,156,50,14

-    CONTROL         "Use jabber api on Miranda NG (recomended)",IDC_JABBER_API,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,251,10

-    LTEXT           "Default key",IDC_CURRENT_KEY,12,196,110,8

-    CONTROL         "Encrypt file transfers",IDC_FILE_TRANSFERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,185,137,10

-    CONTROL         "Automatic key exchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,137,111,10

-    PUSHBUTTON      "Copy own key",IDC_COPY_KEY,127,193,74,14

-END

-

-IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 71

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-FONT 8, "MS Shell Dlg", 400, 0, 0x0

-BEGIN

-    PUSHBUTTON      "Browse",IDC_SET_BIN_PATH,216,17,60,14

-    PUSHBUTTON      "Browse",IDC_SET_HOME_DIR,217,44,57,14

-    EDITTEXT        IDC_BIN_PATH,7,17,195,14,ES_AUTOHSCROLL

-    EDITTEXT        IDC_HOME_DIR,7,44,195,14,ES_AUTOHSCROLL

-    LTEXT           "GnuPG binary:",IDC_STATIC,10,7,147,8

-    LTEXT           "Home directory:",IDC_STATIC,9,34,144,8

-END

-

-IDD_OPT_GPG_MESSAGES DIALOGEX 0, 0, 302, 100

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-FONT 8, "MS Shell Dlg", 400, 0, 0x0

-BEGIN

-    CONTROL         "Add tags to encoded and decoded messages",IDC_APPEND_TAGS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,65,243,10

-    EDITTEXT        IDC_IN_OPEN_TAG,39,20,88,14,ES_AUTOHSCROLL

-    EDITTEXT        IDC_IN_CLOSE_TAG,151,20,90,14,ES_AUTOHSCROLL

-    LTEXT           "Incomming message tags:",IDC_STATIC,15,10,84,8

-    LTEXT           "Outgoing message tags:",IDC_STATIC,13,36,79,8

-    RTEXT           "Open:",IDC_STATIC,13,23,26,8

-    RTEXT           "Close:",IDC_STATIC,127,23,23,8

-    EDITTEXT        IDC_OUT_OPEN_TAG,39,46,88,14,ES_AUTOHSCROLL

-    EDITTEXT        IDC_OUT_CLOSE_TAG,151,46,90,14,ES_AUTOHSCROLL

-    RTEXT           "Open:",IDC_STATIC,13,49,26,8

-    RTEXT           "Close:",IDC_STATIC,127,49,23,8

-    CONTROL         "Strip all tags in outgoing messages",IDC_STRIP_TAGS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,76,233,10

-END

-

-IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 50

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-FONT 8, "MS Shell Dlg", 400, 0, 0x0

-BEGIN

-    CONTROL         "Turn on presence signing (Jabber) (required by xep 0-27)",IDC_PRESCENSE_SUBSCRIPTION,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,9,268,10

-    PUSHBUTTON      "Export keys",IDC_EXPORT,12,26,60,14

-    PUSHBUTTON      "Import keys",IDC_IMPORT,82,26,68,14

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO

-BEGIN

-    IDD_OPT_GPG_ADVANCED, DIALOG

-    BEGIN

-        VERTGUIDE, 12

-        BOTTOMMARGIN, 40

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-#endif    // Английский (США) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

 

 #ifndef APSTUDIO_INVOKED

 /////////////////////////////////////////////////////////////////////////////

diff --git a/plugins/New_GPG/res/icons/secured.ico b/plugins/New_GPG/res/secured.ico
index 2e1ac4aa9c..2e1ac4aa9c 100755..100644
--- a/plugins/New_GPG/res/icons/secured.ico
+++ b/plugins/New_GPG/res/secured.ico
diff --git a/plugins/New_GPG/res/icons/unsecured.ico b/plugins/New_GPG/res/unsecured.ico
index 081b3607db..081b3607db 100755..100644
--- a/plugins/New_GPG/res/icons/unsecured.ico
+++ b/plugins/New_GPG/res/unsecured.ico