Rename resource ids IDM_LANG_* to IDM_LEXER_* to prevent confusing wi…

…th localization language menus in the future, issue #172.
zufuliu · Apr 4, 2020 · 3601f88 · 3601f88
1 parent 9a94ac7
commit 3601f88
Show file tree

Hide file tree

Showing 4 changed files with 284 additions and 284 deletions.
diff --git a/src/Notepad2.rc b/src/Notepad2.rc
@@ -481,79 +481,79 @@ BEGIN
 		MENUITEM SEPARATOR
 		POPUP "&Text File"
 		BEGIN
-			MENUITEM "&Text File",					IDM_LANG_TEXTFILE
-			MENUITEM "&2nd Text File",				IDM_LANG_2NDTEXTFILE
+			MENUITEM "&Text File",					IDM_LEXER_TEXTFILE
+			MENUITEM "&2nd Text File",				IDM_LEXER_2NDTEXTFILE
 		END
 		POPUP "CSS Style S&heet"
 		BEGIN
-			MENUITEM "&CSS",						IDM_LANG_CSS
-			MENUITEM "&Sassy CSS",					IDM_LANG_SCSS
-			MENUITEM "&Less CSS",					IDM_LANG_LESS
-			MENUITEM "&HSS",						IDM_LANG_HSS
+			MENUITEM "&CSS",						IDM_LEXER_CSS
+			MENUITEM "&Sassy CSS",					IDM_LEXER_SCSS
+			MENUITEM "&Less CSS",					IDM_LEXER_LESS
+			MENUITEM "&HSS",						IDM_LEXER_HSS
 		END
 		POPUP "&Web Source Code"
 		BEGIN
-			MENUITEM "&Web Source Code",			IDM_LANG_WEB
-			MENUITEM "&PHP Page",					IDM_LANG_PHP
-			MENUITEM "&JSP Page",					IDM_LANG_JSP
-			MENUITEM "ASP.NET (&C#)",				IDM_LANG_ASPX_CS
-			MENUITEM "ASP.NET (&VB.NET)",			IDM_LANG_ASPX_VB
-			MENUITEM "ASP (V&BScript)",				IDM_LANG_ASP_VBS
-			MENUITEM "ASP (J&Script)",				IDM_LANG_ASP_JS
+			MENUITEM "&Web Source Code",			IDM_LEXER_WEB
+			MENUITEM "&PHP Page",					IDM_LEXER_PHP
+			MENUITEM "&JSP Page",					IDM_LEXER_JSP
+			MENUITEM "ASP.NET (&C#)",				IDM_LEXER_ASPX_CS
+			MENUITEM "ASP.NET (&VB.NET)",			IDM_LEXER_ASPX_VB
+			MENUITEM "ASP (V&BScript)",				IDM_LEXER_ASP_VBS
+			MENUITEM "ASP (J&Script)",				IDM_LEXER_ASP_JS
 		END
 		POPUP "&Math"
 		BEGIN
-			MENUITEM "&MATLAB",						IDM_LANG_MATLAB
-			MENUITEM "&Octave",						IDM_LANG_OCTAVE
-			MENUITEM "&Scilab",						IDM_LANG_SCILAB
+			MENUITEM "&MATLAB",						IDM_LEXER_MATLAB
+			MENUITEM "&Octave",						IDM_LEXER_OCTAVE
+			MENUITEM "&Scilab",						IDM_LEXER_SCILAB
 		END
 		POPUP "Shell Scri&pt"
 		BEGIN
-			MENUITEM "&Shell Script",				IDM_LANG_BASH
-			MENUITEM "&C Shell",					IDM_LANG_CSHELL
-			MENUITEM "&M4 Macro",					IDM_LANG_M4
+			MENUITEM "&Shell Script",				IDM_LEXER_BASH
+			MENUITEM "&C Shell",					IDM_LEXER_CSHELL
+			MENUITEM "&M4 Macro",					IDM_LEXER_M4
 		END
 		//POPUP "S&QL Dialect"
 		POPUP "&XML Document"
 		BEGIN
-			MENUITEM "&XML Document",				IDM_LANG_XML
-			MENUITEM "XML &Schema",					IDM_LANG_XSD
-			MENUITEM "XSL&T Stylesheet",			IDM_LANG_XSLT
-			MENUITEM "XML &DTD",					IDM_LANG_DTD
+			MENUITEM "&XML Document",				IDM_LEXER_XML
+			MENUITEM "XML &Schema",					IDM_LEXER_XSD
+			MENUITEM "XSL&T Stylesheet",			IDM_LEXER_XSLT
+			MENUITEM "XML &DTD",					IDM_LEXER_DTD
 		END
 		POPUP "XML (&Java)"
 		BEGIN
-			MENUITEM "Ant &Build",					IDM_LANG_ANT_BUILD
-			MENUITEM "Maven &POM",					IDM_LANG_MAVEN_POM
-			MENUITEM "&Maven Settings",				IDM_LANG_MAVEN_SETTINGS
-			MENUITEM "I&vy Module",					IDM_LANG_IVY_MODULE
-			MENUITEM "&Ivy Settings",				IDM_LANG_IVY_SETTINGS
-			MENUITEM "PMD &Ruleset",				IDM_LANG_PMD_RULESET
-			MENUITEM "&Checkstyle",					IDM_LANG_CHECKSTYLE
+			MENUITEM "Ant &Build",					IDM_LEXER_ANT_BUILD
+			MENUITEM "Maven &POM",					IDM_LEXER_MAVEN_POM
+			MENUITEM "&Maven Settings",				IDM_LEXER_MAVEN_SETTINGS
+			MENUITEM "I&vy Module",					IDM_LEXER_IVY_MODULE
+			MENUITEM "&Ivy Settings",				IDM_LEXER_IVY_SETTINGS
+			MENUITEM "PMD &Ruleset",				IDM_LEXER_PMD_RULESET
+			MENUITEM "&Checkstyle",					IDM_LEXER_CHECKSTYLE
 		END
 		POPUP "Web Confi&g"
 		BEGIN
-			MENUITEM "&Apache Config",				IDM_LANG_APACHE
-			MENUITEM "&Tomcat Config",				IDM_LANG_TOMCAT
-			MENUITEM "&Web Config",					IDM_LANG_WEB_JAVA
-			MENUITEM "Str&uts Config",				IDM_LANG_STRUTS
-			MENUITEM "&Hibernate Config",			IDM_LANG_HIB_CFG
-			MENUITEM "Hibernate &Mapping",			IDM_LANG_HIB_MAP
-			MENUITEM "Spring &Beans",				IDM_LANG_SPRING_BEANS
-			MENUITEM "&JBoss Config",				IDM_LANG_JBOSS
+			MENUITEM "&Apache Config",				IDM_LEXER_APACHE
+			MENUITEM "&Tomcat Config",				IDM_LEXER_TOMCAT
+			MENUITEM "&Web Config",					IDM_LEXER_WEB_JAVA
+			MENUITEM "Str&uts Config",				IDM_LEXER_STRUTS
+			MENUITEM "&Hibernate Config",			IDM_LEXER_HIB_CFG
+			MENUITEM "Hibernate &Mapping",			IDM_LEXER_HIB_MAP
+			MENUITEM "Spring &Beans",				IDM_LEXER_SPRING_BEANS
+			MENUITEM "&JBoss Config",				IDM_LEXER_JBOSS
 		END
 		//POPUP "XML (.&NET)"
 		//BEGIN
-		//	MENUITEM "&Web Config",					IDM_LANG_WEB_NET
-		//	MENUITEM "&ResX Resource",				IDM_LANG_RESX
-		//	MENUITEM "WPF &XAML",					IDM_LANG_XAML
+		//	MENUITEM "&Web Config",					IDM_LEXER_WEB_NET
+		//	MENUITEM "&ResX Resource",				IDM_LEXER_RESX
+		//	MENUITEM "WPF &XAML",					IDM_LEXER_XAML
 		//END
 		POPUP "XML (&Others)"
 		BEGIN
-			MENUITEM "&Property List",				IDM_LANG_PROPERTY_LIST
-			MENUITEM "Android &Manifest",			IDM_LANG_ANDROID_MANIFEST
-			MENUITEM "Android &Layout",				IDM_LANG_ANDROID_LAYOUT
-			//MENUITEM "SV&G Document",				IDM_LANG_SVG
+			MENUITEM "&Property List",				IDM_LEXER_PROPERTY_LIST
+			MENUITEM "Android &Manifest",			IDM_LEXER_ANDROID_MANIFEST
+			MENUITEM "Android &Layout",				IDM_LEXER_ANDROID_LAYOUT
+			//MENUITEM "SV&G Document",				IDM_LEXER_SVG
 		END
 	END
 	POPUP "&Settings"