New_GPG: added advanced option to send error messages

3 files changed, 38 insertions, 22 deletions

diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc
index 83b52d5058..b825cbbf36 100644
--- a/plugins/New_GPG/res/new_gpg.rc
+++ b/plugins/New_GPG/res/new_gpg.rc
@@ -7,13 +7,13 @@
 //
 // Generated from the TEXTINCLUDE 2 resource.
 //
-#include <winres.h>
+#include "winres.h"
 
 /////////////////////////////////////////////////////////////////////////////
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// Русский (Россия) resources
+// Russian (Russia) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
 LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -27,7 +27,7 @@ LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
 
 1 TEXTINCLUDE 
 BEGIN
-    "..\src\resource.h\0"
+    "..\\src\\resource.h\0"
 END
 
 2 TEXTINCLUDE 
@@ -268,15 +268,16 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,76,233,10
 END
 
-IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 50
+IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 64
 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
 EXSTYLE WS_EX_CONTROLPARENT
 FONT 8, "MS Shell Dlg", 0, 0, 0x1
 BEGIN
     CONTROL         "Turn on presence signing (Jabber) (required by XEP-0027)",IDC_PRESCENSE_SUBSCRIPTION,
-                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,12,9,268,20
-    PUSHBUTTON      "Export keys",IDC_EXPORT,12,36,100,14
-    PUSHBUTTON      "Import keys",IDC_IMPORT,122,36,100,14
+                    "Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,12,9,268,10
+    PUSHBUTTON      "Export keys",IDC_EXPORT,12,44,100,14
+    PUSHBUTTON      "Import keys",IDC_IMPORT,122,44,100,14
+    CONTROL         "Send error messages",IDC_SEND_ERRORS,"Button",BS_AUTOCHECKBOX | BS_MULTILINE | WS_TABSTOP,12,23,268,10
 END
 
 
@@ -386,7 +387,7 @@ BEGIN
     IDD_OPT_GPG_ADVANCED, DIALOG
     BEGIN
         VERTGUIDE, 12
-        BOTTOMMARGIN, 40
+        BOTTOMMARGIN, 58
     END
 END
 #endif    // APSTUDIO_INVOKED
@@ -400,10 +401,21 @@ END
 // Icon with lowest ID value placed first to ensure application icon
 // remains consistent on all systems.
 IDI_SECURED             ICON                    "secured.ico"
+
 IDI_UNSECURED           ICON                    "unsecured.ico"
 
 
-#endif    // Русский (Россия) resources
+/////////////////////////////////////////////////////////////////////////////
+//
+// AFX_DIALOG_LAYOUT
+//
+
+IDD_OPT_GPG_ADVANCED AFX_DIALOG_LAYOUT
+BEGIN
+    0
+END
+
+#endif    // Russian (Russia) resources
 /////////////////////////////////////////////////////////////////////////////
 
 
diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index c658775a8d..85e3b82600 100755
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
@@ -665,22 +665,25 @@ public:
 class COptGpgAdvDlg : public CDlgBase
 {
 	CCtrlButton btn_EXPORT, btn_IMPORT;
-	CCtrlCheck check_PRESCENSE_SUBSCRIPTION;
+	CCtrlCheck chkPresenceSub, chkSendErrors;
 
 public:
 	COptGpgAdvDlg() : CDlgBase(g_plugin, IDD_OPT_GPG_ADVANCED),
-		btn_EXPORT(this, IDC_EXPORT), btn_IMPORT(this, IDC_IMPORT),
-		check_PRESCENSE_SUBSCRIPTION(this, IDC_PRESCENSE_SUBSCRIPTION)
+		btn_EXPORT(this, IDC_EXPORT),
+		btn_IMPORT(this, IDC_IMPORT),
+		chkSendErrors(this, IDC_SEND_ERRORS),
+		chkPresenceSub(this, IDC_PRESCENSE_SUBSCRIPTION)
 	{
 		btn_EXPORT.OnClick = Callback(this, &COptGpgAdvDlg::onClick_EXPORT);
 		btn_IMPORT.OnClick = Callback(this, &COptGpgAdvDlg::onClick_IMPORT);
 
-		CreateLink(check_PRESCENSE_SUBSCRIPTION, g_plugin.bPresenceSigning);
+		CreateLink(chkSendErrors, g_plugin.bSendErrorMessages);
+		CreateLink(chkPresenceSub, g_plugin.bPresenceSigning);
 	}
 
 	bool OnInitDialog() override
 	{
-		check_PRESCENSE_SUBSCRIPTION.Enable(g_plugin.bJabberAPI);
+		chkPresenceSub.Enable(g_plugin.bJabberAPI);
 		return true;
 	}
 
diff --git a/plugins/New_GPG/src/resource.h b/plugins/New_GPG/src/resource.h
index 8132179de6..bc199d9c37 100644
--- a/plugins/New_GPG/src/resource.h
+++ b/plugins/New_GPG/src/resource.h
@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by new_gpg.rc
+// Used by W:\miranda-ng\plugins\New_GPG\res\new_gpg.rc
 //
 #define IDD_LOAD_PUBLIC_KEY             102
 #define IDD_FIRST_RUN                   103
@@ -18,7 +18,7 @@
 #define IDD_OPT_GPG_ADVANCED            113
 #define IDD_ENCRYPTED_FILE_MSG_BOX      114
 #define IDD_EXPORT_TYPE                 115
-#define IDD_CHANGE_PASSWD                 116
+#define IDD_CHANGE_PASSWD               116
 #define IDC_SET_BIN_PATH                1016
 #define IDC_SET_HOME_DIR                1017
 #define IDC_BIN_PATH                    1018
@@ -88,6 +88,8 @@
 #define IDC_REMEMBRE                    1068
 #define IDC_REMEMBER                    1068
 #define IDC_GENERATING_KEY              1069
+#define IDC_PRESCENSE_SUBSCRIPTION2     1069
+#define IDC_SEND_ERRORS                 1069
 #define IDC_GENERATING_TEXT             1070
 #define IDC_KEY_ID                      1071
 #define IDC_COMBO1                      1072
@@ -96,17 +98,16 @@
 #define IDC_PRIVATE                     1074
 #define IDC_ALL                         1075
 #define IDC_EXPORT_PRIVATE              1076
-#define IDC_CHANGE_PASSWD				1077
-#define IDC_OLD_PASSWD					1078
-#define IDC_NEW_PASSWD1					1079
-#define	IDC_NEW_PASSWD2					1080
-
+#define IDC_CHANGE_PASSWD               1077
+#define IDC_OLD_PASSWD                  1078
+#define IDC_NEW_PASSWD1                 1079
+#define IDC_NEW_PASSWD2                 1080
 
 // Next default values for new objects
 // 
 #ifdef APSTUDIO_INVOKED
 #ifndef APSTUDIO_READONLY_SYMBOLS
-#define _APS_NEXT_RESOURCE_VALUE        117
+#define _APS_NEXT_RESOURCE_VALUE        118
 #define _APS_NEXT_COMMAND_VALUE         40001
 #define _APS_NEXT_CONTROL_VALUE         1081
 #define _APS_NEXT_SYMED_VALUE           101