summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGluzskiy Alexandr <sss123next@list.ru>2011-06-05 09:37:18 +0300
committerGluzskiy Alexandr <sss123next@list.ru>2011-06-05 09:37:18 +0300
commit93ab5d7b53a3b4d5336aee2f3995b44aaad51b69 (patch)
tree8697c70ff593cc1438b381aae17103de27c3c460
parentcbfa2b64cdcfe881dd60d308b776b3c1792b79b1 (diff)
modified: new_gpg.rc
modified: options.cpp
-rw-r--r--new_gpg.rc6
-rw-r--r--options.cpp17
2 files changed, 22 insertions, 1 deletions
diff --git a/new_gpg.rc b/new_gpg.rc
index 0d8f569..bd99e79 100644
--- a/new_gpg.rc
+++ b/new_gpg.rc
@@ -57,7 +57,7 @@ FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN
DEFPUSHBUTTON "خت",ID_OK,7,169,50,14
PUSHBUTTON "Load from file",ID_LOAD_FROM_FILE,273,169,58,14
- EDITTEXT IDC_PUBLIC_KEY_EDIT,7,7,324,134,ES_MULTILINE | WS_VSCROLL,WS_EX_STATICEDGE
+ 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
CONTROL "Turn on encryption",IDC_ENABLE_ENCRYPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,143,196,10
PUSHBUTTON "Import key from keyserver",IDC_IMPORT,140,152,188,14,WS_DISABLED
@@ -373,6 +373,10 @@ BEGIN
IDD_OPT_GPG_BIN, DIALOG
BEGIN
END
+
+ IDD_OPT_GPG_MESSAGES, DIALOG
+ BEGIN
+ END
END
#endif // APSTUDIO_INVOKED
diff --git a/options.cpp b/options.cpp
index 7eafe97..5bf050f 100644
--- a/options.cpp
+++ b/options.cpp
@@ -668,6 +668,8 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
SetDlgItemText(hwndDlg, IDC_ENABLE_ENCRYPTION, TranslateW(_T("Turn on encryption")));
CheckDlgButton(hwndDlg, IDC_ENABLE_ENCRYPTION, 1);
}
+ RegisterHotKey(hwndDlg, 1, MOD_CONTROL | MOD_NOREPEAT, 0x43);
+ RegisterHotKey(hwndDlg, 2, MOD_CONTROL | MOD_NOREPEAT, 0x41);
if(hcnt)
{
tmp = UniGetContactSettingUtf(hcnt, szGPGModuleName, "GPGPubKey", _T(""));
@@ -1240,6 +1242,21 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP
}
}
break;
+ case WM_HOTKEY:
+ {
+ if(lParam & MOD_CONTROL)
+ {
+ if(wParam == 1)
+ {
+ MessageBoxA(NULL, "ctrl+c", "", MB_OK);
+ }
+ else if(wParam == 2)
+ {
+ MessageBoxA(NULL, "ctrl+a", "", MB_OK);
+ }
+ }
+ }
+ break;
case WM_CLOSE:
DestroyWindow(hwndDlg);
break;