merged with miranda_ng main reponew_gpg_miranda_ng

6 files changed, 112 insertions, 137 deletions

diff --git a/res/Version.rc b/res/Version.rc
new file mode 100644
index 0000000..5bfbab4
--- /dev/null
+++ b/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/res/icons/secured.ico b/res/icons/secured.ico
deleted file mode 100755
index 8d84167..0000000
--- a/res/icons/secured.ico
+++ /dev/null
diff --git a/res/icons/unsecured.ico b/res/icons/unsecured.ico
deleted file mode 100755
index 567367b..0000000
--- a/res/icons/unsecured.ico
+++ /dev/null
diff --git a/res/new_gpg.rc b/res/new_gpg.rc
index 2ad1f72..452c9af 100755
--- a/res/new_gpg.rc
+++ b/res/new_gpg.rc
@@ -55,7 +55,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPT
 CAPTION "Load Public GPG key"

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

-    DEFPUSHBUTTON   "ÎÊ",ID_OK,7,169,50,14

+    DEFPUSHBUTTON   "OK",ID_OK,7,169,50,14

     PUSHBUTTON      "Load from file",ID_LOAD_FROM_FILE,256,169,75,14

     EDITTEXT        IDC_PUBLIC_KEY_EDIT,7,7,324,134,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_VSCROLL,WS_EX_STATICEDGE

     PUSHBUTTON      "Select existing",IDC_SELECT_EXISTING,113,169,97,14

@@ -68,7 +68,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPT
 CAPTION "Set own key"

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

-    DEFPUSHBUTTON   "ÎÊ",ID_OK,12,220,50,14,WS_DISABLED

+    DEFPUSHBUTTON   "OK",ID_OK,12,220,50,14,WS_DISABLED

     CONTROL         "",IDC_KEY_LIST,"SysListView32",LVS_REPORT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,44,277,105

     PUSHBUTTON      "Generate key",IDC_GENERATE_KEY,7,152,74,14

     LTEXT           "Select key for use",IDC_STATIC,16,33,186,8

@@ -146,7 +146,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPT
 CAPTION "Select existing public key from list"

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

-    DEFPUSHBUTTON   "ÎÊ",IDOK,7,236,50,14,WS_DISABLED

+    DEFPUSHBUTTON   "OK",IDOK,7,236,50,14,WS_DISABLED

     PUSHBUTTON      "Cancel",IDCANCEL,313,236,50,14

     CONTROL         "",IDC_EXISTING_KEY_LIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,14,356,217

 END

@@ -156,7 +156,7 @@ STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPT
 CAPTION "Enter password for your secret key"

 FONT 8, "MS Shell Dlg", 400, 0, 0x1

 BEGIN

-    DEFPUSHBUTTON   "ÎÊ",IDOK,7,87,50,14

+    DEFPUSHBUTTON   "OK",IDOK,7,87,50,14

     PUSHBUTTON      "Cancel",IDCANCEL,150,87,50,14

     EDITTEXT        IDC_PASSWORD,13,38,179,14,ES_PASSWORD | ES_AUTOHSCROLL

     LTEXT           "Password:",IDC_STATIC,14,28,34,8

@@ -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/res/secured.ico b/res/secured.ico
new file mode 100644
index 0000000..2e1ac4a
--- /dev/null
+++ b/res/secured.ico
diff --git a/res/unsecured.ico b/res/unsecured.ico
new file mode 100644
index 0000000..081b360
--- /dev/null
+++ b/res/unsecured.ico