fixes #3850 (NewGPG: строки не попадают в ленгпак)

4 files changed, 9 insertions, 9 deletions

diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp
index 6f2ed6c799..437257a10b 100644
--- a/plugins/New_GPG/src/main.cpp
+++ b/plugins/New_GPG/src/main.cpp
@@ -135,7 +135,7 @@ public:
 

 	void onClick_SET_BIN_PATH(CCtrlButton *)

 	{

-		GetFilePath(L"Choose gpg.exe", "szGpgBinPath", L"*.exe", L"EXE Executables");

+		GetFilePath(LPGENW("Choose gpg.exe"), "szGpgBinPath", L"*.exe", LPGENW("EXE Executables"));

 		CMStringW tmp(g_plugin.getMStringW("szGpgBinPath", L"gpg.exe"));

 		edit_BIN_PATH.SetText(tmp);

 

diff --git a/plugins/New_GPG/src/options.cpp b/plugins/New_GPG/src/options.cpp
index cc214ac95a..5e00786056 100644
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.cpp
@@ -434,7 +434,7 @@ public:
 			return;

 

 		MCONTACT hContact = list_USERLIST.GetItemData(idx);

-		ptrW tmp(GetFilePath(TranslateT("Export public key"), L"*", TranslateT(".asc pubkey file"), true));

+		ptrW tmp(GetFilePath(LPGENW("Export public key"), L"*", LPGENW(".asc pubkey file"), true));

 		if (tmp) {

 			CMStringW str(g_plugin.getMStringW(hContact, "GPGPubKey"));

 			str.Replace(L"\r", L"");

@@ -454,7 +454,7 @@ public:
 

 	void onClick_LOG_FILE_SET(CCtrlButton*)

 	{

-		edit_LOG_FILE_EDIT.SetText(ptrW(GetFilePath(TranslateT("Set log file"), L"*", TranslateT("LOG files"), 1)));

+		edit_LOG_FILE_EDIT.SetText(ptrW(GetFilePath(LPGENW("Set log file"), L"*", LPGENW("LOG files"), 1)));

 	}

 

 	void onChange_JABBER_API(CCtrlCheck *chk)

@@ -534,7 +534,7 @@ public:
 

 	void onClick_SET_BIN_PATH(CCtrlButton*)

 	{

-		GetFilePath(TranslateT("Choose gpg.exe"), "szGpgBinPath", L"*.exe", TranslateT("EXE Executables"));

+		GetFilePath(LPGENW("Choose gpg.exe"), "szGpgBinPath", L"*.exe", LPGENW("EXE Executables"));

 		CMStringW tmp(g_plugin.getMStringW("szGpgBinPath", L"gpg.exe"));

 		edit_BIN_PATH.SetText(tmp);

 		bool gpg_exists = false;

@@ -1072,7 +1072,7 @@ public:
 

 	void onClick_LOAD_FROM_FILE(CCtrlButton *)

 	{

-		ptrW tmp(GetFilePath(TranslateT("Set file containing GPG public key"), L"*", TranslateT("GPG public key file")));

+		ptrW tmp(GetFilePath(LPGENW("Set file containing GPG public key"), L"*", LPGENW("GPG public key file")));

 		if (!tmp)

 			return;

 

diff --git a/plugins/New_GPG/src/ui.cpp b/plugins/New_GPG/src/ui.cpp
index 2118ce723a..0677b4eb5a 100644
--- a/plugins/New_GPG/src/ui.cpp
+++ b/plugins/New_GPG/src/ui.cpp
@@ -560,7 +560,7 @@ public:
 		if (i == -1)

 			return;

 

-		ptrW p(GetFilePath(L"Choose file to export key", L"*", L"Any file", true));

+		ptrW p(GetFilePath(LPGENW("Choose file to export key"), L"*", LPGENW("Any file"), true));

 		if (!p || !p[0])

 			return;

 

diff --git a/plugins/New_GPG/src/utilities.cpp b/plugins/New_GPG/src/utilities.cpp
index cefc7ade47..f33e7a65c5 100644
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.cpp
@@ -63,7 +63,7 @@ wchar_t* GetFilePath(wchar_t *WindowTittle, wchar_t *szExt, wchar_t *szExtDesc,
 	ofn.nMaxFile = _MAX_PATH;

 	ofn.nMaxFileTitle = MAX_PATH;

 	if (!save_file) {

-		if (!GetOpenFileName(&ofn))

+		if (!GetOpenFileNameW(&ofn))

 			return nullptr;

 	}

 	else {

@@ -953,7 +953,7 @@ void send_encrypted_msgs_thread(void *param)
 

 void ExportGpGKeysFunc(int type)

 {

-	ptrW p(GetFilePath(L"Choose file to export keys", L"*", L"Any file", true));

+	ptrW p(GetFilePath(LPGENW("Choose file to export keys"), L"*", LPGENW("Any file"), true));

 	if (!p || !p[0])

 		return;

 

@@ -1015,7 +1015,7 @@ void ExportGpGKeysFunc(int type)
 

 INT_PTR ImportGpGKeys(WPARAM, LPARAM)

 {

-	ptrW p(GetFilePath(L"Choose file to import keys from", L"*", L"Any file"));

+	ptrW p(GetFilePath(LPGENW("Choose file to import keys from"), L"*", LPGENW("Any file")));

 	if (!p || !p[0])

 		return 1;