added ability to set private key for each protocol (#50 Свой ключ для каждой учетной записи)

1 files changed, 2 insertions, 9 deletions

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;