From 93ab5d7b53a3b4d5336aee2f3995b44aaad51b69 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sun, 5 Jun 2011 09:37:18 +0300 Subject: modified: new_gpg.rc modified: options.cpp --- options.cpp | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) (limited to 'options.cpp') 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; -- cgit v1.2.3 From dfa458be4ac91bed6639d3fd0c3bf3902bdd8c0b Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sun, 5 Jun 2011 13:10:43 +0300 Subject: modified: commonheaders.h modified: options.cpp --- options.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 5bf050f..fe1c2c3 100644 --- a/options.cpp +++ b/options.cpp @@ -668,7 +668,7 @@ 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, 1, MOD_CONTROL | MOD_NOREPEAT, 0x43); //ctrl+c RegisterHotKey(hwndDlg, 2, MOD_CONTROL | MOD_NOREPEAT, 0x41); if(hcnt) { @@ -1248,11 +1248,13 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP { if(wParam == 1) { - MessageBoxA(NULL, "ctrl+c", "", MB_OK); +// TCHAR sel[2048] = {0}; +// int c = SendMessage(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), EM_GETSELTEXT, 0, (LPARAM)&sel); +// MessageBoxA(NULL, "ctrl+c", "", MB_OK); } else if(wParam == 2) { - MessageBoxA(NULL, "ctrl+a", "", MB_OK); + SendMessage(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), EM_SETSEL, 0, -1); } } } -- cgit v1.2.3 From 820307153b05c8ce93f5022c6772a748cca49909 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Wed, 19 Oct 2011 06:40:18 +0300 Subject: cipy to clipboard button, may not work yet --- options.cpp | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) mode change 100644 => 100755 options.cpp (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp old mode 100644 new mode 100755 index fe1c2c3..4b68d63 --- a/options.cpp +++ b/options.cpp @@ -353,6 +353,19 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA f.close(); } break; + case IDC_COPY_KEY: + { + if(OpenClipboard(hwndDlg)) + { + char *szKey = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", ""); + EmptyClipboard(); + SetClipboardData(CF_OEMTEXT, szKey); + CloseClipboard(); + mir_free(szKey); + } + else + MessageBoxA(0, "Error", "Failed to open clipboard", MB_OK); + } case IDC_LOG_FILE_SET: { tmp = GetFilePath(_T("Set log file"), _T("*"), _T("LOG files"), 1); @@ -366,7 +379,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); break; } - + case WM_NOTIFY: { EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && IsDlgButtonChecked(hwndDlg, IDC_JABBER_API))); -- cgit v1.2.3 From 3dad33945b29e49469d70d04b4ecc95a43c7b283 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Wed, 19 Oct 2011 07:53:24 +0300 Subject: modified: options.cpp --- options.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 4b68d63..8fcae69 100755 --- a/options.cpp +++ b/options.cpp @@ -366,6 +366,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA else MessageBoxA(0, "Error", "Failed to open clipboard", MB_OK); } + break; case IDC_LOG_FILE_SET: { tmp = GetFilePath(_T("Set log file"), _T("*"), _T("LOG files"), 1); -- cgit v1.2.3 From b12986a6163f7634a20e34761b9b32776b64c226 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Wed, 19 Oct 2011 08:39:19 +0300 Subject: modified: options.cpp --- options.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 8fcae69..b067cb3 100755 --- a/options.cpp +++ b/options.cpp @@ -359,9 +359,12 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA { char *szKey = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", ""); EmptyClipboard(); - SetClipboardData(CF_OEMTEXT, szKey); + if(!SetClipboardData(CF_OEMTEXT, szKey)) + { + mir_free(szKey); + MessageBoxA(0, "Error", "Failed to write to clipboard", MB_OK); + } CloseClipboard(); - mir_free(szKey); } else MessageBoxA(0, "Error", "Failed to open clipboard", MB_OK); -- cgit v1.2.3 From f9f50a5ce2120ca30100dcbc47b5b4cea6b44b77 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Wed, 19 Oct 2011 08:59:25 +0300 Subject: modified: options.cpp --- options.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index b067cb3..5f0c99f 100755 --- a/options.cpp +++ b/options.cpp @@ -358,6 +358,14 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if(OpenClipboard(hwndDlg)) { char *szKey = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", ""); + TCHAR *buf = mir_utf8decodeT(szKey); + mir_free(szKey); + std::wstring str = buf; + mir_free(buf); + for(std::wstring::size_type i = str.find(_T("\n")); i != std::wstring::npos; i = str.find(_T("\n"), i+2)) + str.replace(i, 1, _T("\r\n")); + szKey = mir_utf8encodeW(str.c_str()); + str.clear(); EmptyClipboard(); if(!SetClipboardData(CF_OEMTEXT, szKey)) { -- cgit v1.2.3 From cae60e6558eac18ed90f5e9b1793b9c940597f32 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Wed, 19 Oct 2011 09:15:20 +0300 Subject: modified: options.cpp --- options.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 5f0c99f..fe81e36 100755 --- a/options.cpp +++ b/options.cpp @@ -358,13 +358,11 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA if(OpenClipboard(hwndDlg)) { char *szKey = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", ""); - TCHAR *buf = mir_utf8decodeT(szKey); - mir_free(szKey); - std::wstring str = buf; - mir_free(buf); - for(std::wstring::size_type i = str.find(_T("\n")); i != std::wstring::npos; i = str.find(_T("\n"), i+2)) + std::string str = szKey;; + mir_free(szKey); + for(std::string::size_type i = str.find(_T("\n")); i != std::string::npos; i = str.find(_T("\n"), i+2)) str.replace(i, 1, _T("\r\n")); - szKey = mir_utf8encodeW(str.c_str()); + szKey = mir_strdup(str.c_str()); str.clear(); EmptyClipboard(); if(!SetClipboardData(CF_OEMTEXT, szKey)) -- cgit v1.2.3 From 30af6ed7fb8d41eada477241d47efc320d72ea79 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Fri, 21 Oct 2011 02:39:14 +0300 Subject: modified: ../options.cpp --- options.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index fe81e36..0371caf 100755 --- a/options.cpp +++ b/options.cpp @@ -359,11 +359,11 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA { char *szKey = UniGetContactSettingUtf(NULL, szGPGModuleName, "GPGPubKey", ""); std::string str = szKey;; - mir_free(szKey); - for(std::string::size_type i = str.find(_T("\n")); i != std::string::npos; i = str.find(_T("\n"), i+2)) - str.replace(i, 1, _T("\r\n")); - szKey = mir_strdup(str.c_str()); - str.clear(); + mir_free(szKey); + for(std::string::size_type i = str.find("\n"); i != std::string::npos; i = str.find("\n", i+2)) + str.replace(i, 1, "\r\n"); + szKey = mir_strdup(str.c_str()); + str.clear(); EmptyClipboard(); if(!SetClipboardData(CF_OEMTEXT, szKey)) { -- cgit v1.2.3 From 4951c262631885820d1bbde0ed1c3ceb8cb285b6 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Fri, 21 Oct 2011 03:28:37 +0300 Subject: modified: ../options.cpp --- options.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 0371caf..440e1be 100755 --- a/options.cpp +++ b/options.cpp @@ -365,7 +365,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA szKey = mir_strdup(str.c_str()); str.clear(); EmptyClipboard(); - if(!SetClipboardData(CF_OEMTEXT, szKey)) + if(!SetClipboardData(CF_TEXT, szKey)) { mir_free(szKey); MessageBoxA(0, "Error", "Failed to write to clipboard", MB_OK); -- cgit v1.2.3 From d94de204ce513b7be134ed7a1aa83295b89719ec Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 22 Oct 2011 23:07:11 +0300 Subject: copy key to clipboard button --- options.cpp | 32 +++++++++++++++++++++++++++----- 1 file changed, 27 insertions(+), 5 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 440e1be..825bd00 100755 --- a/options.cpp +++ b/options.cpp @@ -362,18 +362,40 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA mir_free(szKey); for(std::string::size_type i = str.find("\n"); i != std::string::npos; i = str.find("\n", i+2)) str.replace(i, 1, "\r\n"); - szKey = mir_strdup(str.c_str()); + HGLOBAL hMem = GlobalAlloc(GMEM_MOVEABLE, str.size() +1); + if(!hMem) + { + MessageBoxA(0, "Failed to alocate memory", "Error", MB_OK); + break; + } + szKey = (char*)GlobalLock(hMem); + if(!szKey) + { + char msg[64]; + mir_snprintf(msg, 127, "Failed to lock memory with error %d", GetLastError()); + MessageBoxA(0, msg, "Error", MB_OK); + GlobalFree(hMem); + } + memcpy(szKey, str.c_str(), str.size()); + szKey[str.size()] = '\0'; str.clear(); EmptyClipboard(); - if(!SetClipboardData(CF_TEXT, szKey)) + GlobalUnlock(hMem); + if(!SetClipboardData(CF_OEMTEXT, hMem)) { - mir_free(szKey); - MessageBoxA(0, "Error", "Failed to write to clipboard", MB_OK); + GlobalFree(hMem); + char msg[64]; + mir_snprintf(msg, 127, "Failed write to clipboard with error %d", GetLastError()); + MessageBoxA(0, msg, "Error", MB_OK); } CloseClipboard(); } else - MessageBoxA(0, "Error", "Failed to open clipboard", MB_OK); + { + char msg[64]; + mir_snprintf(msg, 127, "Failed to open clipboard with error %d", GetLastError()); + MessageBoxA(0, msg, "Error", MB_OK); + } } break; case IDC_LOG_FILE_SET: -- cgit v1.2.3 From 2fb715f5ca9dd2c51b05e4974b644942c79440f9 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 22 Oct 2011 23:30:30 +0300 Subject: modified: options.cpp --- options.cpp | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 825bd00..aab7884 100755 --- a/options.cpp +++ b/options.cpp @@ -1314,7 +1314,12 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP DBWriteContactSettingDword(NULL, szGPGModuleName, "LoadKeyWindowY", load_key_rect.top); } break; - + case WM_KEYDOWN: + { + if(wParam == 'A' && GetKeyState(VK_CONTROL)) + SendMessage(GetWindow(hwndDlg, IDC_PUBLIC_KEY_EDIT), EM_SETSEL, 0, -1); + } + break; } return FALSE; -- cgit v1.2.3 From ff1a66311d278da49fd5fe39597b3bfdbd668fbd Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 22 Oct 2011 23:45:23 +0300 Subject: modified: options.cpp --- options.cpp | 17 ----------------- 1 file changed, 17 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index aab7884..2535c83 100755 --- a/options.cpp +++ b/options.cpp @@ -1287,23 +1287,6 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP } } break; - case WM_HOTKEY: - { - if(lParam & MOD_CONTROL) - { - if(wParam == 1) - { -// TCHAR sel[2048] = {0}; -// int c = SendMessage(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), EM_GETSELTEXT, 0, (LPARAM)&sel); -// MessageBoxA(NULL, "ctrl+c", "", MB_OK); - } - else if(wParam == 2) - { - SendMessage(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), EM_SETSEL, 0, -1); - } - } - } - break; case WM_CLOSE: DestroyWindow(hwndDlg); break; -- cgit v1.2.3 From 5292cc0aea09b39be626f14e199d765cca896883 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sun, 23 Oct 2011 20:31:12 +0300 Subject: fixed ctrl+a --- options.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 2535c83..3fffe3a 100755 --- a/options.cpp +++ b/options.cpp @@ -713,7 +713,6 @@ 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); //ctrl+c RegisterHotKey(hwndDlg, 2, MOD_CONTROL | MOD_NOREPEAT, 0x41); if(hcnt) { @@ -1297,10 +1296,10 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP DBWriteContactSettingDword(NULL, szGPGModuleName, "LoadKeyWindowY", load_key_rect.top); } break; - case WM_KEYDOWN: + case WM_HOTKEY: { - if(wParam == 'A' && GetKeyState(VK_CONTROL)) - SendMessage(GetWindow(hwndDlg, IDC_PUBLIC_KEY_EDIT), EM_SETSEL, 0, -1); + if(wParam == 2) + PostMessage(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), EM_SETSEL, 0, -1); } break; } -- cgit v1.2.3 From d783b07eeb0776f3763e3ce8d725748b7290c257 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Mon, 7 Nov 2011 02:46:59 +0200 Subject: removed old warning about gpg version small ui corrections possible translation fixes --- options.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 3fffe3a..6079dae 100755 --- a/options.cpp +++ b/options.cpp @@ -526,10 +526,10 @@ static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP else { bad_version = false; - MessageBox(0, _T("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK); + MessageBox(0, TranslateT("This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK); } - if(bad_version) - MessageBox(0, _T("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK); +/* if(bad_version) //looks like working fine with gpg2 + MessageBox(0, TranslateT("Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn."), _T("Warning"), MB_OK); */ } } char mir_path[MAX_PATH]; -- cgit v1.2.3 From 8f104752a2373b6ef330f31e5aa4653ad5ba5622 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sun, 26 Feb 2012 22:31:11 +0200 Subject: modified: ../main.cpp modified: ../new_gpg.rc modified: ../new_gpg.sln modified: ../options.cpp --- options.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 6079dae..271a637 100755 --- a/options.cpp +++ b/options.cpp @@ -180,7 +180,8 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA EnableWindow(GetDlgItem(hwndDlg, IDC_JABBER_API), bIsMiranda09); EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && bJabberAPI)); { - string keyinfo = Translate("Current private key id: "); + string keyinfo = Translate("Current private key id"); + keyinfo += ": "; char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", ""); keyinfo += (strlen(keyid) > 0)?keyid:"not set"; mir_free(keyid); -- cgit v1.2.3 From bf88761455597a47f1074d01c4a29c41e0fe270c Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 10 Mar 2012 21:13:22 +0200 Subject: copyrights --- options.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 271a637..c3c2d95 100755 --- a/options.cpp +++ b/options.cpp @@ -1,4 +1,4 @@ -// Copyright © 2010 sss +// Copyright © 2010-2012 sss // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License -- cgit v1.2.3 From 570935ac486f2e1f5d36ecd07216e1474603c8ce Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Fri, 18 May 2012 18:26:13 +0300 Subject: =?UTF-8?q?fixed=20(#32=20=09=D0=9D=D0=B0=D1=80=D1=83=D1=88=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=B4=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- options.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index c3c2d95..71e7c0c 100755 --- a/options.cpp +++ b/options.cpp @@ -152,12 +152,12 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA ListView_SetItemText(hwndList, iRow, 1, (_tcslen(tmp) > 1)?tmp:_T("not set")); mir_free(tmp); tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainName", ""); - tmp = mir_a2t(tmp2); + tmp = mir_utf8decodeT(tmp2); mir_free(tmp2); ListView_SetItemText(hwndList, iRow, 2, (_tcslen(tmp) > 1)?tmp:_T("not set")); mir_free(tmp); tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainEmail", ""); - tmp = mir_a2t(tmp2); + tmp = mir_utf8decodeT(tmp2); mir_free(tmp2); ListView_SetItemText(hwndList, iRow, 3, (_tcslen(tmp) > 1)?tmp:_T("not set")); mir_free(tmp); -- cgit v1.2.3 From ec0c325b00df0576ecf6f159e6ea4b6f72a13e49 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 19 May 2012 00:49:42 +0300 Subject: =?UTF-8?q?fixed=20(#32=20=D0=9D=D0=B0=D1=80=D1=83=D1=88=D0=B5?= =?UTF-8?q?=D0=BD=D0=B0=20=D0=BA=D0=BE=D0=B4=D0=B8=D1=80=D0=BE=D0=B2=D0=BA?= =?UTF-8?q?=D0=B0)=20again=20...?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- options.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 71e7c0c..45f56d5 100755 --- a/options.cpp +++ b/options.cpp @@ -151,14 +151,10 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA mir_free(tmp2); ListView_SetItemText(hwndList, iRow, 1, (_tcslen(tmp) > 1)?tmp:_T("not set")); mir_free(tmp); - tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainName", ""); - tmp = mir_utf8decodeT(tmp2); - mir_free(tmp2); + tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainName", _T("")); ListView_SetItemText(hwndList, iRow, 2, (_tcslen(tmp) > 1)?tmp:_T("not set")); mir_free(tmp); - tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainEmail", ""); - tmp = mir_utf8decodeT(tmp2); - mir_free(tmp2); + tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainEmail", _T("")); ListView_SetItemText(hwndList, iRow, 3, (_tcslen(tmp) > 1)?tmp:_T("not set")); mir_free(tmp); if(DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0)) -- cgit v1.2.3 From 9026615fea720ca69d3a3480a69e32e5432db69b Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 19 May 2012 01:43:48 +0300 Subject: fixed one more metacontacts problem added option to remove own tags in outgoing messages (useful to quote) --- options.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 45f56d5..8efc0c2 100755 --- a/options.cpp +++ b/options.cpp @@ -599,6 +599,7 @@ static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP { TranslateDialogDefault(hwndDlg); CheckStateLoadDB(hwndDlg, IDC_APPEND_TAGS, "bAppendTags", 0); + CheckStateLoadDB(hwndDlg, IDC_STRIP_TAGS, "bStripTags", 0); { TCHAR *tmp = UniGetContactSettingUtf(NULL, szGPGModuleName, "szInOpenTag", _T("")); SetDlgItemText(hwndDlg, IDC_IN_OPEN_TAG, tmp); @@ -639,6 +640,7 @@ static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP case PSN_APPLY: { bAppendTags = CheckStateStoreDB(hwndDlg, IDC_APPEND_TAGS, "bAppendTags"); + bStripTags = CheckStateStoreDB(hwndDlg, IDC_STRIP_TAGS, "bStripTags"); { TCHAR tmp[128]; GetDlgItemText(hwndDlg, IDC_IN_OPEN_TAG, tmp, 128); -- cgit v1.2.3 From bad201c5132117e8b227021b12ff9e5377a98496 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sun, 20 May 2012 15:48:24 +0300 Subject: fixed utf8 encoding in key list (finally ...) --- options.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 8efc0c2..0e952b7 100755 --- a/options.cpp +++ b/options.cpp @@ -151,10 +151,20 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA mir_free(tmp2); ListView_SetItemText(hwndList, iRow, 1, (_tcslen(tmp) > 1)?tmp:_T("not set")); mir_free(tmp); - tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainName", _T("")); + char *tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainName", ""); + if(!toUTF16(tmp2).empty()) + tmp = mir_wstrdup(toUTF16(tmp2).c_str()); + else + tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainName", _T("")); + mir_free(tmp2); ListView_SetItemText(hwndList, iRow, 2, (_tcslen(tmp) > 1)?tmp:_T("not set")); mir_free(tmp); - tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainEmail", _T("")); + tmp2 = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainEmail", ""); + if(!toUTF16(tmp2).empty()) + tmp = mir_wstrdup(toUTF16(tmp2).c_str()); + else + tmp = UniGetContactSettingUtf(hContact, szGPGModuleName, "KeyMainEmail", _T("")); + mir_free(tmp2); ListView_SetItemText(hwndList, iRow, 3, (_tcslen(tmp) > 1)?tmp:_T("not set")); mir_free(tmp); if(DBGetContactSettingByte(hContact, szGPGModuleName, "GPGEncryption", 0)) -- cgit v1.2.3 From 7b7229fd6fa8df0fbe52f82aa7b08354ddda76ba Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 2 Jun 2012 06:54:03 +0300 Subject: option to disable prescense subscription metacontacts fix --- options.cpp | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 0e952b7..2b8fce1 100755 --- a/options.cpp +++ b/options.cpp @@ -21,6 +21,7 @@ extern HINSTANCE hInst; static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); static BOOL CALLBACK DlgProcGpgBinOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); +static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam); BOOL CheckStateLoadDB(HWND hwndDlg, int idCtrl, const char* szSetting, BYTE bDef) { @@ -74,6 +75,18 @@ int GpgOptInit(WPARAM wParam,LPARAM lParam) odp.pfnDlgProc = (DLGPROC)DlgProcGpgMsgOpts; CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + ZeroMemory(&odp, sizeof(odp)); + + odp.cbSize = sizeof(odp); + odp.hInstance = hInst; + odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_GPG_ADVANCED); + odp.pszTitle = szGPGModuleName; + odp.pszGroup = "Services"; + odp.pszTab = "Advanced"; + odp.flags=ODPF_BOLDGROUPS | ODPF_EXPERTONLY; + odp.pfnDlgProc = (DLGPROC)DlgProcGpgAdvOpts; + CallService(MS_OPT_ADDPAGE,wParam,(LPARAM)&odp); + return 0; } @@ -683,6 +696,44 @@ static BOOL CALLBACK DlgProcGpgMsgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP return FALSE; } +static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam) +{ + switch (msg) + { + case WM_INITDIALOG: + { + extern bool bJabberAPI; + TranslateDialogDefault(hwndDlg); + CheckStateLoadDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPrescenseSubscription", 1); + EnableWindow(GetDlgItem(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION), bJabberAPI); + + return TRUE; + } + + + case WM_COMMAND: + { + SendMessage(GetParent(hwndDlg), PSM_CHANGED, 0, 0); + break; + } + + case WM_NOTIFY: + { + switch (((LPNMHDR)lParam)->code) + { + + case PSN_APPLY: + { + bPrescenseSubscription = CheckStateStoreDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPrescenseSubscription"); + return TRUE; + } + } + } + break; + } + return FALSE; +} + HWND hPubKeyEdit = NULL; -- cgit v1.2.3 From dd580e5cae07351821fa52c24fe7ac254bc8004f Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Sat, 2 Jun 2012 08:58:30 +0300 Subject: typo fixes --- options.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index 2b8fce1..c91f30f 100755 --- a/options.cpp +++ b/options.cpp @@ -208,7 +208,7 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA } if(bIsMiranda09) CheckStateLoadDB(hwndDlg, IDC_JABBER_API, "bJabberAPI", 1); - CheckStateLoadDB(hwndDlg, IDC_FILE_TRANSFERS, "bFileTransfers", 1); + CheckStateLoadDB(hwndDlg, IDC_FILE_TRANSFERS, "bFileTransfers", 0); CheckStateLoadDB(hwndDlg, IDC_AUTO_EXCHANGE, "bAutoExchange", 0); return TRUE; } @@ -704,7 +704,7 @@ static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP { extern bool bJabberAPI; TranslateDialogDefault(hwndDlg); - CheckStateLoadDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPrescenseSubscription", 1); + CheckStateLoadDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPresenceSigning", 0); EnableWindow(GetDlgItem(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION), bJabberAPI); return TRUE; @@ -724,7 +724,7 @@ static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP case PSN_APPLY: { - bPrescenseSubscription = CheckStateStoreDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPrescenseSubscription"); + bPresenceSigning = CheckStateStoreDB(hwndDlg, IDC_PRESCENSE_SUBSCRIPTION, "bPresenceSigning"); return TRUE; } } -- cgit v1.2.3 From 166017ac72e412afef52e42ac5c31679211c8b55 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Wed, 13 Jun 2012 20:55:48 +0300 Subject: use WM_KEYDOWN instead ofr registering hotkey for ctrl+a handling on edit control --- options.cpp | 28 +++++++++++++++++++++++----- 1 file changed, 23 insertions(+), 5 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index c91f30f..fb2da74 100755 --- a/options.cpp +++ b/options.cpp @@ -736,10 +736,27 @@ static BOOL CALLBACK DlgProcGpgAdvOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LP HWND hPubKeyEdit = NULL; +LONG_PTR default_edit_proc = NULL; + +static BOOL CALLBACK editctrl_ctrl_a(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) +{ + LRESULT ret = 0; + switch(msg) + { + case WM_KEYDOWN: + if(wParam == 0x41 && GetKeyState(VK_CONTROL)< 0 ) + SendMessage(hwndDlg, EM_SETSEL, 0, -1); + break; + default: + ret = CallWindowProc((WNDPROC)default_edit_proc, hwndDlg, msg, wParam, lParam); + break; + } + return ret; +} static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LPARAM lParam) { - HANDLE hContact = user_data[item_num+1]; + static HANDLE hContact = user_data[item_num+1]; TCHAR *tmp = NULL; @@ -750,7 +767,9 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP { case WM_INITDIALOG: { + default_edit_proc = GetWindowLong(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), GWLP_WNDPROC); SetWindowPos(hwndDlg, 0, load_key_rect.left, load_key_rect.top, 0, 0, SWP_NOSIZE|SWP_SHOWWINDOW); + SetWindowLongPtr(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), GWLP_WNDPROC, (LONG_PTR)editctrl_ctrl_a); HANDLE hcnt = hContact; if(metaIsProtoMetaContacts(hcnt)) hcnt = metaGetMostOnline(hcnt); @@ -773,7 +792,7 @@ 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, 2, MOD_CONTROL | MOD_NOREPEAT, 0x41); +// RegisterHotKey(hwndDlg, 2, MOD_CONTROL | MOD_NOREPEAT, 0x41); if(hcnt) { tmp = UniGetContactSettingUtf(hcnt, szGPGModuleName, "GPGPubKey", _T("")); @@ -867,7 +886,6 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP return TRUE; } - case WM_COMMAND: { switch (LOWORD(wParam)) @@ -1356,11 +1374,11 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP DBWriteContactSettingDword(NULL, szGPGModuleName, "LoadKeyWindowY", load_key_rect.top); } break; - case WM_HOTKEY: +/* case WM_HOTKEY: { if(wParam == 2) PostMessage(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), EM_SETSEL, 0, -1); - } + } */ break; } -- cgit v1.2.3 From e0db8851abe880553f48a0b2454dde293ffb22b2 Mon Sep 17 00:00:00 2001 From: Gluzskiy Alexandr Date: Mon, 2 Jul 2012 23:26:17 +0300 Subject: =?UTF-8?q?added=20ability=20to=20set=20private=20key=20for=20each?= =?UTF-8?q?=20protocol=20(#50=20=09=D0=A1=D0=B2=D0=BE=D0=B9=20=D0=BA=D0=BB?= =?UTF-8?q?=D1=8E=D1=87=20=D0=B4=D0=BB=D1=8F=20=D0=BA=D0=B0=D0=B6=D0=B4?= =?UTF-8?q?=D0=BE=D0=B9=20=D1=83=D1=87=D0=B5=D1=82=D0=BD=D0=BE=D0=B9=20?= =?UTF-8?q?=D0=B7=D0=B0=D0=BF=D0=B8=D1=81=D0=B8)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- options.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'options.cpp') diff --git a/options.cpp b/options.cpp index fb2da74..109d54c 100755 --- a/options.cpp +++ b/options.cpp @@ -199,10 +199,10 @@ static BOOL CALLBACK DlgProcGpgOpts(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA EnableWindow(GetDlgItem(hwndDlg, IDC_JABBER_API), bIsMiranda09); EnableWindow(GetDlgItem(hwndDlg, IDC_AUTO_EXCHANGE), (bIsMiranda09 && bJabberAPI)); { - string keyinfo = Translate("Current private key id"); + string keyinfo = Translate("Default private key id"); keyinfo += ": "; char *keyid = UniGetContactSettingUtf(NULL, szGPGModuleName, "KeyID", ""); - keyinfo += (strlen(keyid) > 0)?keyid:"not set"; + keyinfo += (strlen(keyid) > 0)?keyid:Translate("not set"); mir_free(keyid); SetDlgItemTextA(hwndDlg, IDC_CURRENT_KEY, keyinfo.c_str()); } @@ -792,7 +792,6 @@ 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, 2, MOD_CONTROL | MOD_NOREPEAT, 0x41); if(hcnt) { tmp = UniGetContactSettingUtf(hcnt, szGPGModuleName, "GPGPubKey", _T("")); @@ -1374,12 +1373,6 @@ static BOOL CALLBACK DlgProcLoadPublicKey(HWND hwndDlg,UINT msg,WPARAM wParam,LP DBWriteContactSettingDword(NULL, szGPGModuleName, "LoadKeyWindowY", load_key_rect.top); } break; -/* case WM_HOTKEY: - { - if(wParam == 2) - PostMessage(GetDlgItem(hwndDlg, IDC_PUBLIC_KEY_EDIT), EM_SETSEL, 0, -1); - } */ - break; } return FALSE; -- cgit v1.2.3