[git] GpgOL - branch, master, updated. gpgol-1.4.0-259-g3442972

[by Andre Heinecke]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG extension for MS Outlook".

The branch, master has been updated
       via  3442972cba2ddf88a88ff3d10421debf0fc07c06 (commit)
      from  6019c7a06701db965e25ddc78483157606679e3d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3442972cba2ddf88a88ff3d10421debf0fc07c06
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Fri Mar 3 15:41:18 2017 +0100

    Add locate-keys option again
    
    * src/addin-options.cpp: Uncomment autoresolve.
    * src/dialogs.rc: Update accordingly.
    
    --
    To properly work this still requires auto-key-locate to
    be configured in the gpg.conf

diff --git a/src/addin-options.cpp b/src/addin-options.cpp
index 20d2128..0fccd6f 100644
--- a/src/addin-options.cpp
+++ b/src/addin-options.cpp
@@ -46,7 +46,7 @@ set_labels (HWND dlg)
                                "attachments as PGP/Inline")},
     { IDC_REPLYCRYPT,       N_("S&elect crypto settings automatically "
                                "for reply and foward.")},
-//    { IDC_AUTORRESOLVE,     N_("&Search for OpenPGP keys automatically when encrypting")},
+    { IDC_AUTORRESOLVE,     N_("&Search for OpenPGP keys automatically when encrypting")},
 
 
     { IDC_GPG_OPTIONS,      N_("Debug...")},
@@ -98,8 +98,8 @@ options_window_proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                               !!opt.inline_pgp, 0L);
           SendDlgItemMessage (hDlg, IDC_REPLYCRYPT, BM_SETCHECK,
                               !!opt.reply_crypt, 0L);
-//          SendDlgItemMessage (hDlg, IDC_AUTORRESOLVE, BM_SETCHECK,
-//                              !!opt.autoresolve, 0L);
+          SendDlgItemMessage (hDlg, IDC_AUTORRESOLVE, BM_SETCHECK,
+                              !!opt.autoresolve, 0L);
           enable_disable_opts (hDlg);
           set_labels (hDlg);
           ShowWindow (GetDlgItem (hDlg, IDC_GPG_OPTIONS),
@@ -140,8 +140,8 @@ options_window_proc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
                 opt.reply_crypt = !!SendDlgItemMessage
                   (hDlg, IDC_REPLYCRYPT, BM_GETCHECK, 0, 0L);
 
-//                opt.autoresolve = !!SendDlgItemMessage
-////                  (hDlg, IDC_AUTORRESOLVE, BM_GETCHECK, 0, 0L);
+                opt.autoresolve = !!SendDlgItemMessage
+                  (hDlg, IDC_AUTORRESOLVE, BM_GETCHECK, 0, 0L);
 
                 write_options ();
                 EndDialog (hDlg, TRUE);
diff --git a/src/dialogs.rc b/src/dialogs.rc
index 3d27293..99a4f13 100644
--- a/src/dialogs.rc
+++ b/src/dialogs.rc
@@ -309,7 +309,7 @@ BEGIN
                     198, 96, 50, 14
 END
 
-IDD_ADDIN_OPTIONS DIALOGEX DISCARDABLE  300, 300, 266, 180
+IDD_ADDIN_OPTIONS DIALOGEX DISCARDABLE  300, 300, 266, 190
 STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | DS_SHELLFONT | DS_SETFONT
 CAPTION "GpgOL"
 FONT 8, "MS Shell Dlg"
@@ -333,7 +333,7 @@ BEGIN
 
     /* Send options box.  */
     GROUPBOX        "send-options", IDC_G_SEND,
-                    9, 50, 250, 57
+                    9, 50, 250, 67
 
     CONTROL         "encrypt-by-default", IDC_ENCRYPT_DEFAULT,
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
@@ -351,25 +351,25 @@ BEGIN
                     "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
                     24, 93, 215, 10
 
-//    CONTROL         "autoresolve", IDC_AUTORRESOLVE,
-//                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
-//                    24, 93, 215, 10
+    CONTROL         "autoresolve", IDC_AUTORRESOLVE,
+                    "Button", BS_AUTOCHECKBOX | WS_TABSTOP,
+                    24, 104, 215, 10
 
     /* Stuff at the lower left corner.  */
     CONTROL         IDB_LOGO, IDC_BITMAP,
                     "Static", SS_BITMAP | SS_REALSIZEIMAGE,
-                      10, 115, 128, 80
+                      10, 125, 128, 80
 
     LTEXT           "Version x ", IDC_VERSION_INFO,
-                      10, 165, 100, 9
+                      10, 175, 100, 9
 
     PUSHBUTTON      "advanced", IDC_GPG_OPTIONS,
-                    180, 130, 70, 14
+                    180, 140, 70, 14
 
     PUSHBUTTON      "gpgconf", IDC_GPG_CONF,
-                    180, 145, 70, 14
+                    180, 155, 70, 14
 
     DEFPUSHBUTTON   "&OK", IDOK,
-                    180, 160, 70, 14
+                    180, 170, 70, 14
 
 END

-----------------------------------------------------------------------

Summary of changes:
 src/addin-options.cpp | 10 +++++-----
 src/dialogs.rc        | 20 ++++++++++----------
 2 files changed, 15 insertions(+), 15 deletions(-)


hooks/post-receive
-- 
GnuPG extension for MS Outlook
http://git.gnupg.org