Language refactor (#1271)

optimized and refactored language files loader
got rid of MSG() macro and use Msg:: namespace instead

11 files changed, 41 insertions, 42 deletions

diff --git a/far2l/src/plug/PluginA.cpp b/far2l/src/plug/PluginA.cpp
index f6870ca7..e43b500f 100644
--- a/far2l/src/plug/PluginA.cpp
+++ b/far2l/src/plug/PluginA.cpp
@@ -489,9 +489,9 @@ bool PluginA::SetStartupInfo(bool &bUnloaded)
 static void ShowMessageAboutIllegalPluginVersion(const wchar_t* plg,int required)
 {
 	FARString strMsg1, strMsg2;
-	strMsg1.Format(MSG(MPlgRequired),(WORD)HIWORD(required),(WORD)LOWORD(required));
-	strMsg2.Format(MSG(MPlgRequired2),(WORD)HIWORD(FAR_VERSION),(WORD)LOWORD(FAR_VERSION));
-	Message(MSG_WARNING,1,MError,MPlgBadVers,plg,strMsg1,strMsg2,MOk);
+	strMsg1.Format(Msg::PlgRequired,(WORD)HIWORD(required),(WORD)LOWORD(required));
+	strMsg2.Format(Msg::PlgRequired2,(WORD)HIWORD(FAR_VERSION),(WORD)LOWORD(FAR_VERSION));
+	Message(MSG_WARNING,1,Msg::Error,Msg::PlgBadVers,plg,strMsg1,strMsg2,Msg::Ok);
 }
 
 
diff --git a/far2l/src/plug/PluginA.hpp b/far2l/src/plug/PluginA.hpp
index 460022de..302f2529 100644
--- a/far2l/src/plug/PluginA.hpp
+++ b/far2l/src/plug/PluginA.hpp
@@ -167,7 +167,7 @@ class PluginA: public Plugin
 
 		bool InitLang(const wchar_t *Path) { return Lang.Init(Path,false); }
 		void CloseLang() { Lang.Close(); }
-		const char *GetMsgA(int nID) { return Lang.GetMsgA(nID); }
+		const char *GetMsgA(int nID) { return Lang.GetMsgMB(nID); }
 
 	public:
 
diff --git a/far2l/src/plug/PluginW.cpp b/far2l/src/plug/PluginW.cpp
index 9417a9ed..cde065be 100644
--- a/far2l/src/plug/PluginW.cpp
+++ b/far2l/src/plug/PluginW.cpp
@@ -570,11 +570,11 @@ static void ShowMessageAboutIllegalPluginVersion(const wchar_t* plg,int required
 {
 	FARString strMsg1, strMsg2;
 	FARString strPlgName;
-	strMsg1.Format(MSG(MPlgRequired),
+	strMsg1.Format(Msg::PlgRequired,
 	               (WORD)(HIWORD(required)),(WORD)(LOWORD(required)));
-	strMsg2.Format(MSG(MPlgRequired2),
+	strMsg2.Format(Msg::PlgRequired2,
 	               (WORD)(HIWORD(FAR_VERSION)),(WORD)(LOWORD(FAR_VERSION)));
-	Message(MSG_WARNING,1,MError,MPlgBadVers,plg,strMsg1,strMsg2,MOk);
+	Message(MSG_WARNING,1,Msg::Error,Msg::PlgBadVers,plg,strMsg1,strMsg2,Msg::Ok);
 }
 
 
diff --git a/far2l/src/plug/PluginW.hpp b/far2l/src/plug/PluginW.hpp
index 291c1d9e..f67e7786 100644
--- a/far2l/src/plug/PluginW.hpp
+++ b/far2l/src/plug/PluginW.hpp
@@ -172,7 +172,7 @@ class PluginW: public Plugin
 
 		bool InitLang(const wchar_t *Path) { return Lang.Init(Path,true); }
 		void CloseLang() { Lang.Close(); }
-		const wchar_t *GetMsg(int nID) { return Lang.GetMsg(nID); }
+		const wchar_t *GetMsg(int nID) { return Lang.GetMsgWide(nID); }
 
 	public:
 
diff --git a/far2l/src/plug/plclass.cpp b/far2l/src/plug/plclass.cpp
index 9ed1e2f2..8a497a37 100644
--- a/far2l/src/plug/plclass.cpp
+++ b/far2l/src/plug/plclass.cpp
@@ -1,9 +1,9 @@
 #include "headers.hpp"
 #include "plclass.hpp"
+#include "lang.hpp"
 #include "config.hpp"
 #include "pathmix.hpp"
 #include "dirmix.hpp"
-#include "lang.hpp"
 #include "message.hpp"
 #include "plugins.hpp"
 
@@ -80,7 +80,7 @@ bool Plugin::OpenModule()
 		{
 			SetMessageHelp(L"ErrLoadPlugin module");
 			//|MSG_ERRORTYPE
-			Message(MSG_WARNING, 1, MError, strerr.c_str(), MPlgLoadPluginError, m_strModuleName, MOk);
+			Message(MSG_WARNING, 1, Msg::Error, strerr.c_str(), Msg::PlgLoadPluginError, m_strModuleName, Msg::Ok);
 		}
 	}
 
diff --git a/far2l/src/plug/plclass.hpp b/far2l/src/plug/plclass.hpp
index 08486cd8..a2386a25 100644
--- a/far2l/src/plug/plclass.hpp
+++ b/far2l/src/plug/plclass.hpp
@@ -72,7 +72,7 @@ class Plugin
 		*/
 		DWORD SysID = 0;
 
-		Language Lang; // implicitly used by MSG(..) macro
+		Language Lang;
 
 		bool OpenModule();
 		void CloseModule();
diff --git a/far2l/src/plug/plugapi.cpp b/far2l/src/plug/plugapi.cpp
index ef393f52..04a28705 100644
--- a/far2l/src/plug/plugapi.cpp
+++ b/far2l/src/plug/plugapi.cpp
@@ -1214,7 +1214,7 @@ void WINAPI FarDialogFree(HANDLE hDlg)
 
 
 static CriticalSection s_get_msg_cs;
-const wchar_t* FarGetMsgFn(INT_PTR PluginHandle,int MsgId)
+const wchar_t* FarGetMsgFn(INT_PTR PluginHandle,FarLangMsgID MsgId)
 {
 	//BUGBUG, надо проверять, что PluginHandle - плагин
 	PluginW *pPlugin = (PluginW*)PluginHandle;
@@ -1270,34 +1270,34 @@ static int FarMessageFnSynched(INT_PTR PluginNumber,DWORD Flags,const wchar_t *H
 	{
 		case FMSG_MB_OK:
 			ButtonsNumber=1;
-			m.Add(MOk);
+			m.Add(Msg::Ok);
 			break;
 		case FMSG_MB_OKCANCEL:
 			ButtonsNumber=2;
-			m.Add(MOk);
-			m.Add(MCancel);
+			m.Add(Msg::Ok);
+			m.Add(Msg::Cancel);
 			break;
 		case FMSG_MB_ABORTRETRYIGNORE:
 			ButtonsNumber=3;
-			m.Add(MAbort);
-			m.Add(MRetry);
-			m.Add(MIgnore);
+			m.Add(Msg::Abort);
+			m.Add(Msg::Retry);
+			m.Add(Msg::Ignore);
 			break;
 		case FMSG_MB_YESNO:
 			ButtonsNumber=2;
-			m.Add(MYes);
-			m.Add(MNo);
+			m.Add(Msg::Yes);
+			m.Add(Msg::No);
 			break;
 		case FMSG_MB_YESNOCANCEL:
 			ButtonsNumber=3;
-			m.Add(MYes);
-			m.Add(MNo);
-			m.Add(MCancel);
+			m.Add(Msg::Yes);
+			m.Add(Msg::No);
+			m.Add(Msg::Cancel);
 			break;
 		case FMSG_MB_RETRYCANCEL:
 			ButtonsNumber=2;
-			m.Add(MRetry);
-			m.Add(MCancel);
+			m.Add(Msg::Retry);
+			m.Add(Msg::Cancel);
 			break;
 	}
 
@@ -1580,7 +1580,7 @@ void WINAPI FarRestoreScreen(HANDLE hScreen)
 
 static void PR_FarGetDirListMsg()
 {
-	Message(0,0,L"",MPreparingList);
+	Message(0,0,L"",Msg::PreparingList);
 }
 
 static int FarGetDirListSynched(const wchar_t *Dir,FAR_FIND_DATA **pPanelItem,int *pItemsNumber)
@@ -1661,7 +1661,7 @@ static int PluginSearchMsgOut;
 
 static void FarGetPluginDirListMsg(const wchar_t *Name,DWORD Flags)
 {
-	Message(Flags,0,L"",MPreparingList,Name);
+	Message(Flags,0,L"",Msg::PreparingList,Name);
 	PreRedrawItem preRedrawItem=PreRedraw.Peek();
 	preRedrawItem.Param.Flags=Flags;
 	preRedrawItem.Param.Param1=(void*)Name;
diff --git a/far2l/src/plug/plugapi.hpp b/far2l/src/plug/plugapi.hpp
index 442f7403..1c2092d5 100644
--- a/far2l/src/plug/plugapi.hpp
+++ b/far2l/src/plug/plugapi.hpp
@@ -76,7 +76,7 @@ int WINAPI FarMenuFn(INT_PTR PluginNumber,int X,int Y,int MaxHeight,
                      DWORD Flags,const wchar_t *Title,const wchar_t *Bottom,
                      const wchar_t *HelpTopic,const int *BreakKeys,int *BreakCode,
                      const struct FarMenuItem *Item, int ItemsNumber);
-const wchar_t* WINAPI FarGetMsgFn(INT_PTR PluginHandle,int MsgId);
+const wchar_t* WINAPI FarGetMsgFn(INT_PTR PluginHandle,FarLangMsgID MsgId);
 int WINAPI FarMessageFn(INT_PTR PluginNumber,DWORD Flags,
                         const wchar_t *HelpTopic,const wchar_t * const *Items,int ItemsNumber,
                         int ButtonsNumber);
diff --git a/far2l/src/plug/plugins.cpp b/far2l/src/plug/plugins.cpp
index bac44164..48a8268f 100644
--- a/far2l/src/plug/plugins.cpp
+++ b/far2l/src/plug/plugins.cpp
@@ -494,7 +494,7 @@ HANDLE PluginManager::OpenFilePlugin(
 )
 {
 	ChangePriority ChPriority(ChangePriority::NORMAL);
-	ConsoleTitle ct(Opt.ShowCheckingFile?MSG(MCheckingFileInPlugin):nullptr);
+	ConsoleTitle ct(Opt.ShowCheckingFile ? Msg::CheckingFileInPlugin.CPtr() : nullptr);
 	HANDLE hResult = INVALID_HANDLE_VALUE;
 	PluginHandle *pResult = nullptr;
 	TPointerArray<PluginHandle> items;
@@ -535,7 +535,7 @@ HANDLE PluginManager::OpenFilePlugin(
 				if(!OpMode)
 				{
 					Message(MSG_WARNING|MSG_ERRORTYPE, 1, MB2Wide(e.what()).c_str(),
-						MOpenPluginCannotOpenFile, Name, MOk);
+						Msg::OpenPluginCannotOpenFile, Name, Msg::Ok);
 				}
 				break;
 			}
@@ -544,7 +544,7 @@ HANDLE PluginManager::OpenFilePlugin(
 		if (pPlugin->HasOpenFilePlugin())
 		{
 			if (Opt.ShowCheckingFile)
-				ct.Set(L"%ls - [%ls]...",MSG(MCheckingFileInPlugin),PointToName(pPlugin->GetModuleName()));
+				ct.Set(L"%ls - [%ls]...", Msg::CheckingFileInPlugin.CPtr(), PointToName(pPlugin->GetModuleName()));
 
 			HANDLE hPlugin = pPlugin->OpenFilePlugin(Name,
 				smm ? (const unsigned char *)smm->View() : nullptr,
@@ -589,7 +589,7 @@ HANDLE PluginManager::OpenFilePlugin(
 
 		if(!OnlyOne && ShowMenu)
 		{
-			VMenu menu(MSG(MPluginConfirmationTitle), nullptr, 0, ScrY-4);
+			VMenu menu(Msg::PluginConfirmationTitle, nullptr, 0, ScrY-4);
 			menu.SetPosition(-1, -1, 0, 0);
 			menu.SetHelp(L"ChoosePluginMenu");
 			menu.SetFlags(VMENU_SHOWAMPERSAND|VMENU_WRAPMODE);
@@ -611,7 +611,7 @@ HANDLE PluginManager::OpenFilePlugin(
 				mitem.Flags |= MIF_SEPARATOR;
 				menu.AddItem(&mitem);
 				mitem.Clear();
-				mitem.strName = MSG(MMenuPluginStdAssociation);
+				mitem.strName = Msg::MenuPluginStdAssociation;
 				menu.AddItem(&mitem);
 			}
 
@@ -697,7 +697,7 @@ HANDLE PluginManager::OpenFindListPlugin(const PluginPanelItem *PanelItem, int I
 	{
 		if (items.getCount()>1)
 		{
-			VMenu menu(MSG(MPluginConfirmationTitle), nullptr, 0, ScrY-4);
+			VMenu menu(Msg::PluginConfirmationTitle, nullptr, 0, ScrY-4);
 			menu.SetPosition(-1, -1, 0, 0);
 			menu.SetHelp(L"ChoosePluginMenu");
 			menu.SetFlags(VMENU_SHOWAMPERSAND|VMENU_WRAPMODE);
@@ -1219,7 +1219,7 @@ void PluginManager::Configure(int StartPos)
 		return;
 
 	{
-		VMenu PluginList(MSG(MPluginConfigTitle),nullptr,0,ScrY-4);
+		VMenu PluginList(Msg::PluginConfigTitle,nullptr,0,ScrY-4);
 		PluginList.SetFlags(VMENU_WRAPMODE);
 		PluginList.SetHelp(L"PluginsConfig");
 
@@ -1292,7 +1292,7 @@ void PluginManager::Configure(int StartPos)
 				}
 
 				PluginList.AssignHighlights(FALSE);
-				PluginList.SetBottomTitle(MSG(MPluginHotKeyBottom));
+				PluginList.SetBottomTitle(Msg::PluginHotKeyBottom);
 				PluginList.ClearDone();
 				PluginList.SortItems(0,HotKeysPresent?3:0);
 				PluginList.SetSelectPos(StartPos,1);
@@ -1380,7 +1380,7 @@ int PluginManager::CommandsMenu(int ModalType,int StartPos,const wchar_t *Histor
 	                      Dialog = ModalType==MODALTYPE_DIALOG;
 	PluginMenuItemData item;
 	{
-		VMenu PluginList(MSG(MPluginCommandsMenuTitle),nullptr,0,ScrY-4);
+		VMenu PluginList(Msg::PluginCommandsMenuTitle,nullptr,0,ScrY-4);
 		PluginList.SetFlags(VMENU_WRAPMODE);
 		PluginList.SetHelp(L"PluginCommands");
 		BOOL NeedUpdateItems=TRUE;
@@ -1465,7 +1465,7 @@ int PluginManager::CommandsMenu(int ModalType,int StartPos,const wchar_t *Histor
 				}
 
 				PluginList.AssignHighlights(FALSE);
-				PluginList.SetBottomTitle(MSG(MPluginHotKeyBottom));
+				PluginList.SetBottomTitle(Msg::PluginHotKeyBottom);
 				PluginList.SortItems(0,HotKeysPresent?3:0);
 				PluginList.SetSelectPos(StartPos,1);
 				NeedUpdateItems=FALSE;
@@ -1624,7 +1624,7 @@ bool PluginManager::SetHotKeyDialog(
 	KeyFileHelper kfh(PluginsIni());
 	const auto &Setting = kfh.GetString(SettingsSection, SettingName);
 	WCHAR Letter[2] = {Setting.empty() ? 0 : Setting[0], 0};
-	if (!HotkeyLetterDialog(MSG(MPluginHotKeyTitle), DlgPluginTitle, Letter[0]))
+	if (!HotkeyLetterDialog(Msg::PluginHotKeyTitle, DlgPluginTitle, Letter[0]))
 		return false;
 
 	if (Letter[0])
@@ -1846,7 +1846,7 @@ int PluginManager::ProcessCommandLine(const wchar_t *CommandParam,Panel *Target)
 
 	if (items.getCount()>1)
 	{
-		VMenu menu(MSG(MPluginConfirmationTitle), nullptr, 0, ScrY-4);
+		VMenu menu(Msg::PluginConfirmationTitle, nullptr, 0, ScrY-4);
 		menu.SetPosition(-1, -1, 0, 0);
 		menu.SetHelp(L"ChoosePluginMenu");
 		menu.SetFlags(VMENU_SHOWAMPERSAND|VMENU_WRAPMODE);
diff --git a/far2l/src/plug/plugins.hpp b/far2l/src/plug/plugins.hpp
index d4a8518e..e7ecf8e8 100644
--- a/far2l/src/plug/plugins.hpp
+++ b/far2l/src/plug/plugins.hpp
@@ -33,7 +33,6 @@ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
 THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include "language.hpp"
 #include "bitflags.hpp"
 #include <farplug-wide.h>
 #include "plclass.hpp"
diff --git a/far2l/src/plug/wrap.cpp b/far2l/src/plug/wrap.cpp
index 51698953..6491f101 100644
--- a/far2l/src/plug/wrap.cpp
+++ b/far2l/src/plug/wrap.cpp
@@ -1072,7 +1072,7 @@ int WINAPI FarMessageFnA(INT_PTR PluginNumber,DWORD Flags,const char *HelpTopic,
 }
 
 static CriticalSection s_get_msga_cs;
-const char * WINAPI FarGetMsgFnA(INT_PTR PluginHandle,int MsgId)
+const char * WINAPI FarGetMsgFnA(INT_PTR PluginHandle, FarLangMsgID MsgId)
 {
 	//BUGBUG, надо проверять, что PluginHandle - плагин
 	PluginA *pPlugin = (PluginA*)PluginHandle;