Language refactor (#1271)

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

1 files changed, 96 insertions, 96 deletions

diff --git a/far2l/src/options.cpp b/far2l/src/options.cpp
index fdde4f2f..d1b141f2 100644
--- a/far2l/src/options.cpp
+++ b/far2l/src/options.cpp
@@ -208,132 +208,132 @@ void ShellOptions(int LastCommand,MOUSE_EVENT_RECORD *MouseEvent)
 {
 	MenuDataEx LeftMenu[]=
 	{
-		{MSG(MMenuBriefView),LIF_SELECTED,KEY_CTRL1},
-		{MSG(MMenuMediumView),0,KEY_CTRL2},
-		{MSG(MMenuFullView),0,KEY_CTRL3},
-		{MSG(MMenuWideView),0,KEY_CTRL4},
-		{MSG(MMenuDetailedView),0,KEY_CTRL5},
-		{MSG(MMenuDizView),0,KEY_CTRL6},
-		{MSG(MMenuLongDizView),0,KEY_CTRL7},
-		{MSG(MMenuOwnersView),0,KEY_CTRL8},
-		{MSG(MMenuLinksView),0,KEY_CTRL9},
-		{MSG(MMenuAlternativeView),0,KEY_CTRL0},
+		{Msg::MenuBriefView,LIF_SELECTED,KEY_CTRL1},
+		{Msg::MenuMediumView,0,KEY_CTRL2},
+		{Msg::MenuFullView,0,KEY_CTRL3},
+		{Msg::MenuWideView,0,KEY_CTRL4},
+		{Msg::MenuDetailedView,0,KEY_CTRL5},
+		{Msg::MenuDizView,0,KEY_CTRL6},
+		{Msg::MenuLongDizView,0,KEY_CTRL7},
+		{Msg::MenuOwnersView,0,KEY_CTRL8},
+		{Msg::MenuLinksView,0,KEY_CTRL9},
+		{Msg::MenuAlternativeView,0,KEY_CTRL0},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuInfoPanel),0,KEY_CTRLL},
-		{MSG(MMenuTreePanel),0,KEY_CTRLT},
-		{MSG(MMenuQuickView),0,KEY_CTRLQ},
+		{Msg::MenuInfoPanel,0,KEY_CTRLL},
+		{Msg::MenuTreePanel,0,KEY_CTRLT},
+		{Msg::MenuQuickView,0,KEY_CTRLQ},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuSortModes),0,KEY_CTRLF12},
-		{MSG(MMenuTogglePanel),0,KEY_CTRLF1},
-		{MSG(MMenuReread),0,KEY_CTRLR},
-		{MSG(MMenuChangeDrive),0,KEY_ALTF1}
+		{Msg::MenuSortModes,0,KEY_CTRLF12},
+		{Msg::MenuTogglePanel,0,KEY_CTRLF1},
+		{Msg::MenuReread,0,KEY_CTRLR},
+		{Msg::MenuChangeDrive,0,KEY_ALTF1}
 	};
 	MenuDataEx FilesMenu[]=
 	{
-		{MSG(MMenuView),LIF_SELECTED,KEY_F3},
-		{MSG(MMenuEdit),0,KEY_F4},
-		{MSG(MMenuCopy),0,KEY_F5},
-		{MSG(MMenuMove),0,KEY_F6},
-		{MSG(MMenuCreateFolder),0,KEY_F7},
-		{MSG(MMenuDelete),0,KEY_F8},
-		{MSG(MMenuWipe),0,KEY_ALTDEL},
+		{Msg::MenuView,LIF_SELECTED,KEY_F3},
+		{Msg::MenuEdit,0,KEY_F4},
+		{Msg::MenuCopy,0,KEY_F5},
+		{Msg::MenuMove,0,KEY_F6},
+		{Msg::MenuCreateFolder,0,KEY_F7},
+		{Msg::MenuDelete,0,KEY_F8},
+		{Msg::MenuWipe,0,KEY_ALTDEL},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuAdd),0,KEY_SHIFTF1},
-		{MSG(MMenuExtract),0,KEY_SHIFTF2},
-		{MSG(MMenuArchiveCommands),0,KEY_SHIFTF3},
+		{Msg::MenuAdd,0,KEY_SHIFTF1},
+		{Msg::MenuExtract,0,KEY_SHIFTF2},
+		{Msg::MenuArchiveCommands,0,KEY_SHIFTF3},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuAttributes),0,KEY_CTRLA},
-		{MSG(MMenuApplyCommand),0,KEY_CTRLG},
-		{MSG(MMenuDescribe),0,KEY_CTRLZ},
+		{Msg::MenuAttributes,0,KEY_CTRLA},
+		{Msg::MenuApplyCommand,0,KEY_CTRLG},
+		{Msg::MenuDescribe,0,KEY_CTRLZ},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuSelectGroup),0,KEY_ADD},
-		{MSG(MMenuUnselectGroup),0,KEY_SUBTRACT},
-		{MSG(MMenuInvertSelection),0,KEY_MULTIPLY},
-		{MSG(MMenuRestoreSelection),0,KEY_CTRLM}
+		{Msg::MenuSelectGroup,0,KEY_ADD},
+		{Msg::MenuUnselectGroup,0,KEY_SUBTRACT},
+		{Msg::MenuInvertSelection,0,KEY_MULTIPLY},
+		{Msg::MenuRestoreSelection,0,KEY_CTRLM}
 	};
 	MenuDataEx CmdMenu[]=
 	{
-		{MSG(MMenuFindFile),LIF_SELECTED,KEY_ALTF7},
-		{MSG(MMenuHistory),0,KEY_ALTF8},
-		{MSG(MMenuVideoMode),0,KEY_ALTF9},
-		{MSG(MMenuFindFolder),0,KEY_ALTF10},
-		{MSG(MMenuViewHistory),0,KEY_ALTF11},
-		{MSG(MMenuFoldersHistory),0,KEY_ALTF12},
+		{Msg::MenuFindFile,LIF_SELECTED,KEY_ALTF7},
+		{Msg::MenuHistory,0,KEY_ALTF8},
+		{Msg::MenuVideoMode,0,KEY_ALTF9},
+		{Msg::MenuFindFolder,0,KEY_ALTF10},
+		{Msg::MenuViewHistory,0,KEY_ALTF11},
+		{Msg::MenuFoldersHistory,0,KEY_ALTF12},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuSwapPanels),0,KEY_CTRLU},
-		{MSG(MMenuTogglePanels),0,KEY_CTRLO},
-		{MSG(MMenuCompareFolders),0,0},
+		{Msg::MenuSwapPanels,0,KEY_CTRLU},
+		{Msg::MenuTogglePanels,0,KEY_CTRLO},
+		{Msg::MenuCompareFolders,0,0},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuUserMenu),0,0},
-		{MSG(MMenuFileAssociations),0,0},
-		{MSG(MMenuBookmarks),0,0},
-		{MSG(MMenuFilter),0,KEY_CTRLI},
+		{Msg::MenuUserMenu,0,0},
+		{Msg::MenuFileAssociations,0,0},
+		{Msg::MenuBookmarks,0,0},
+		{Msg::MenuFilter,0,KEY_CTRLI},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuPluginCommands),0,KEY_F11},
-		{MSG(MMenuWindowsList),0,KEY_F12},
-		{MSG(MMenuProcessList),0,KEY_CTRLW}
+		{Msg::MenuPluginCommands,0,KEY_F11},
+		{Msg::MenuWindowsList,0,KEY_F12},
+		{Msg::MenuProcessList,0,KEY_CTRLW}
 		//,
-		//{MSG(MMenuHotPlugList),0,0}
+		//{Msg::MenuHotPlugList,0,0}
 	};
 	MenuDataEx OptionsMenu[]=
 	{
-		{MSG(MMenuSystemSettings),LIF_SELECTED,0},
-		{MSG(MMenuPanelSettings),0,0},
-		{MSG(MMenuInterface),0,0},
-		{MSG(MMenuLanguages),0,0},
-		{MSG(MMenuInput),0,0},
-		{MSG(MMenuPluginsConfig),0,0},
-		{MSG(MMenuPluginsManagerSettings),0,0},
-		{MSG(MMenuDialogSettings),0,0},
-		{MSG(MMenuVMenuSettings),0,0},
-		{MSG(MMenuCmdlineSettings),0,0},
-		{MSG(MMenuAutoCompleteSettings),0,0},
-//		{MSG(MMenuInfoPanelSettings),0,0},
+		{Msg::MenuSystemSettings,LIF_SELECTED,0},
+		{Msg::MenuPanelSettings,0,0},
+		{Msg::MenuInterface,0,0},
+		{Msg::MenuLanguages,0,0},
+		{Msg::MenuInput,0,0},
+		{Msg::MenuPluginsConfig,0,0},
+		{Msg::MenuPluginsManagerSettings,0,0},
+		{Msg::MenuDialogSettings,0,0},
+		{Msg::MenuVMenuSettings,0,0},
+		{Msg::MenuCmdlineSettings,0,0},
+		{Msg::MenuAutoCompleteSettings,0,0},
+//		{Msg::MenuInfoPanelSettings,0,0},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuConfirmation),0,0},
-		{MSG(MMenuFilePanelModes),0,0},
-		{MSG(MMenuFileDescriptions),0,0},
-		{MSG(MMenuFolderInfoFiles),0,0},
+		{Msg::MenuConfirmation,0,0},
+		{Msg::MenuFilePanelModes,0,0},
+		{Msg::MenuFileDescriptions,0,0},
+		{Msg::MenuFolderInfoFiles,0,0},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuViewer),0,0},
-		{MSG(MMenuEditor),0,0},
-		{MSG(MMenuCodePages),0,0},
+		{Msg::MenuViewer,0,0},
+		{Msg::MenuEditor,0,0},
+		{Msg::MenuCodePages,0,0},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuColors),0,0},
-		{MSG(MMenuFilesHighlighting),0,0},
-		{MSG(MMenuNotifications),0,0},
+		{Msg::MenuColors,0,0},
+		{Msg::MenuFilesHighlighting,0,0},
+		{Msg::MenuNotifications,0,0},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuSaveSetup),0,KEY_SHIFTF9}
+		{Msg::MenuSaveSetup,0,KEY_SHIFTF9}
 	};
 	MenuDataEx RightMenu[]=
 	{
-		{MSG(MMenuBriefView),LIF_SELECTED,KEY_CTRL1},
-		{MSG(MMenuMediumView),0,KEY_CTRL2},
-		{MSG(MMenuFullView),0,KEY_CTRL3},
-		{MSG(MMenuWideView),0,KEY_CTRL4},
-		{MSG(MMenuDetailedView),0,KEY_CTRL5},
-		{MSG(MMenuDizView),0,KEY_CTRL6},
-		{MSG(MMenuLongDizView),0,KEY_CTRL7},
-		{MSG(MMenuOwnersView),0,KEY_CTRL8},
-		{MSG(MMenuLinksView),0,KEY_CTRL9},
-		{MSG(MMenuAlternativeView),0,KEY_CTRL0},
+		{Msg::MenuBriefView,LIF_SELECTED,KEY_CTRL1},
+		{Msg::MenuMediumView,0,KEY_CTRL2},
+		{Msg::MenuFullView,0,KEY_CTRL3},
+		{Msg::MenuWideView,0,KEY_CTRL4},
+		{Msg::MenuDetailedView,0,KEY_CTRL5},
+		{Msg::MenuDizView,0,KEY_CTRL6},
+		{Msg::MenuLongDizView,0,KEY_CTRL7},
+		{Msg::MenuOwnersView,0,KEY_CTRL8},
+		{Msg::MenuLinksView,0,KEY_CTRL9},
+		{Msg::MenuAlternativeView,0,KEY_CTRL0},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuInfoPanel),0,KEY_CTRLL},
-		{MSG(MMenuTreePanel),0,KEY_CTRLT},
-		{MSG(MMenuQuickView),0,KEY_CTRLQ},
+		{Msg::MenuInfoPanel,0,KEY_CTRLL},
+		{Msg::MenuTreePanel,0,KEY_CTRLT},
+		{Msg::MenuQuickView,0,KEY_CTRLQ},
 		{L"",LIF_SEPARATOR,0},
-		{MSG(MMenuSortModes),0,KEY_CTRLF12},
-		{MSG(MMenuTogglePanelRight),0,KEY_CTRLF2},
-		{MSG(MMenuReread),0,KEY_CTRLR},
-		{MSG(MMenuChangeDriveRight),0,KEY_ALTF2}
+		{Msg::MenuSortModes,0,KEY_CTRLF12},
+		{Msg::MenuTogglePanelRight,0,KEY_CTRLF2},
+		{Msg::MenuReread,0,KEY_CTRLR},
+		{Msg::MenuChangeDriveRight,0,KEY_ALTF2}
 	};
 	HMenuData MainMenu[]=
 	{
-		{MSG(MMenuLeftTitle),1,LeftMenu,ARRAYSIZE(LeftMenu),L"LeftRightMenu"},
-		{MSG(MMenuFilesTitle),0,FilesMenu,ARRAYSIZE(FilesMenu),L"FilesMenu"},
-		{MSG(MMenuCommandsTitle),0,CmdMenu,ARRAYSIZE(CmdMenu),L"CmdMenu"},
-		{MSG(MMenuOptionsTitle),0,OptionsMenu,ARRAYSIZE(OptionsMenu),L"OptMenu"},
-		{MSG(MMenuRightTitle),0,RightMenu,ARRAYSIZE(RightMenu),L"LeftRightMenu"}
+		{Msg::MenuLeftTitle,1,LeftMenu,ARRAYSIZE(LeftMenu),L"LeftRightMenu"},
+		{Msg::MenuFilesTitle,0,FilesMenu,ARRAYSIZE(FilesMenu),L"FilesMenu"},
+		{Msg::MenuCommandsTitle,0,CmdMenu,ARRAYSIZE(CmdMenu),L"CmdMenu"},
+		{Msg::MenuOptionsTitle,0,OptionsMenu,ARRAYSIZE(OptionsMenu),L"OptMenu"},
+		{Msg::MenuRightTitle,0,RightMenu,ARRAYSIZE(RightMenu),L"LeftRightMenu"}
 	};
 	static int LastHItem=-1,LastVItem=0;
 	int HItem,VItem;