diff options
| -rw-r--r-- | jabber_account.cpp | 2 | ||||
| -rw-r--r-- | new_gpg.rc | 17 | ||||
| -rw-r--r-- | options.cpp | 4 | ||||
| -rw-r--r-- | resource.h | 3 | ||||
| -rw-r--r-- | utilities.cpp | 8 |
5 files changed, 23 insertions, 11 deletions
diff --git a/jabber_account.cpp b/jabber_account.cpp index 44c2d0b..85c89d6 100644 --- a/jabber_account.cpp +++ b/jabber_account.cpp @@ -55,7 +55,7 @@ JabberAccount::JabberAccount() AccountName = NULL; hSendHandler = INVALID_HANDLE_VALUE; AccountNumber = -1; - JabberInterface = INVALID_HANDLE_VALUE; + JabberInterface = NULL; } JabberAccount::~JabberAccount() { @@ -59,8 +59,9 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN
DEFPUSHBUTTON "ОК",ID_OK,7,153,50,14
PUSHBUTTON "Load from file",ID_LOAD_FROM_FILE,277,153,54,14
- EDITTEXT IDC_PUBLIC_KEY_EDIT,7,7,324,139,ES_MULTILINE | WS_VSCROLL,WS_EX_STATICEDGE
+ EDITTEXT IDC_PUBLIC_KEY_EDIT,7,7,324,134,ES_MULTILINE | WS_VSCROLL,WS_EX_STATICEDGE
PUSHBUTTON "Select existing",IDC_SELECT_EXISTING,146,153,50,14
+ CONTROL "Turn on encryption",IDC_ENABLE_ENCRYPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,143,196,10
END
IDD_FIRST_RUN DIALOGEX 0, 0, 291, 196
@@ -97,8 +98,8 @@ CAPTION "New public key recieved" FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "Import key",ID_IMPORT,9,47,46,14
- PUSHBUTTON "Import key end turn on encryption",IDC_IMPORT_AND_USE,61,47,119,14
- PUSHBUTTON "Ignore key",IDC_IGNORE_KEY,183,47,52,14
+ PUSHBUTTON "Import key end turn on encryption",IDC_IMPORT_AND_USE,156,47,119,14
+ PUSHBUTTON "Ignore key",IDC_IGNORE_KEY,368,47,52,14
CTEXT "Статический",IDC_MESSAGE,19,25,392,8
END
@@ -258,10 +259,10 @@ IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 214 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
- PUSHBUTTON "Browse",IDC_SET_BIN_PATH,116,18,38,14
- PUSHBUTTON "Browse",IDC_SET_HOME_DIR,116,44,38,14
- EDITTEXT IDC_BIN_PATH,7,17,95,14,ES_AUTOHSCROLL
- EDITTEXT IDC_HOME_DIR,7,44,95,14,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse",IDC_SET_BIN_PATH,216,17,38,14
+ PUSHBUTTON "Browse",IDC_SET_HOME_DIR,217,44,38,14
+ EDITTEXT IDC_BIN_PATH,7,17,195,14,ES_AUTOHSCROLL
+ EDITTEXT IDC_HOME_DIR,7,44,195,14,ES_AUTOHSCROLL
LTEXT "GnuPG2 binary:",IDC_STATIC,10,7,147,8
LTEXT "Home directory:",IDC_STATIC,9,34,144,8
END
@@ -270,7 +271,7 @@ IDD_OPT_GPG_MESSAGES DIALOGEX 0, 0, 302, 241 STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
FONT 8, "MS Shell Dlg", 400, 0, 0x0
BEGIN
- CONTROL "Append tags to encodedecoded messages",IDC_APPEND_TAGS,
+ 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
diff --git a/options.cpp b/options.cpp index 8e01742..e1c9c9c 100644 --- a/options.cpp +++ b/options.cpp @@ -328,7 +328,7 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP case WM_INITDIALOG: { TranslateDialogDefault(hwndDlg); - tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T("gpg2.exe")); + tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szGpgBinPath", _T("gpg.exe")); SetDlgItemText(hwndDlg, IDC_BIN_PATH, tmp); mir_free(tmp); tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szHomePath", _T("gpg")); @@ -617,6 +617,8 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP } delete [] tmp; key_buf.clear(); + if(IsDlgButtonChecked(hwndDlg, IDC_ENABLE_ENCRYPTION)) + DBWriteContactSettingByte(user_data[item_num+1], szGPGModuleName, "GPGEncryption", 1); DestroyWindow(hwndDlg); break; case ID_LOAD_FROM_FILE: @@ -56,6 +56,7 @@ #define IDC_SAVE_PASSWORD 1047
#define IDC_DEBUG_LOG 1048
#define IDC_JABBER_API 1049
+#define IDC_ENABLE_ENCRYPTION 1050
// Next default values for new objects
//
@@ -63,7 +64,7 @@ #ifndef APSTUDIO_READONLY_SYMBOLS
#define _APS_NEXT_RESOURCE_VALUE 112
#define _APS_NEXT_COMMAND_VALUE 40001
-#define _APS_NEXT_CONTROL_VALUE 1050
+#define _APS_NEXT_CONTROL_VALUE 1051
#define _APS_NEXT_SYMED_VALUE 101
#endif
#endif
diff --git a/utilities.cpp b/utilities.cpp index 9886fc3..a98ff39 100644 --- a/utilities.cpp +++ b/utilities.cpp @@ -227,6 +227,14 @@ int OnPreBuildContactMenu(WPARAM w, LPARAM l) CLISTMENUITEM mi = {0};
mi.cbSize=sizeof(mi);
mi.flags = CMIM_NAME;
+ TCHAR *tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "GPGPubKey", _T(""));
+ if(_tcslen(tmp) < 1)
+ {
+ DBDeleteContactSetting(hContact, szGPGModuleName, "GPGEncryption");
+ mi.flags += CMIM_FLAGS | CMIF_GRAYED;
+ }
+ else
+ mi.flags = CMIM_NAME | CMIM_FLAGS;
mi.pszName = DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0)?"Turn off GPG encryption":"Turn on GPG encryption";
CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hToggleEncryption, (LPARAM)&mi);
return 0;
|