Browse Source

simplify menu localization

MonkeyFirst 10 years ago
parent
commit
b42cb1ed2a

+ 8 - 0
bin/Data/EditorStrings.json

@@ -1135,5 +1135,13 @@
 	"Delete?":{
 	"Delete?":{
         "en":"Delete?",
         "en":"Delete?",
         "ru":"Удалить?"
         "ru":"Удалить?"
+	},
+	"Opacity":{
+        "en":"Opacity",
+        "ru":"Непрозрачность"
+	},
+	"Color":{
+        "en":"Color",
+        "ru":"Цвет"
 	}
 	}
 }
 }

+ 2 - 2
bin/Data/Scripts/Editor/EditorHierarchyWindow.as

@@ -1535,8 +1535,8 @@ bool BlenderModeDelete()
     // In this place maybe placed avoidance flags that not allow delete in some cases
     // In this place maybe placed avoidance flags that not allow delete in some cases
     
     
     Array<UIElement@> actions;
     Array<UIElement@> actions;
-    actions.Push(CreateContextMenuItem(localization.Get("Delete?"), "HandleBlenderModeDelete"));
-    actions.Push(CreateContextMenuItem(localization.Get("Cancel"), "HandleEmpty"));
+    actions.Push(CreateContextMenuItem("Delete?", "HandleBlenderModeDelete"));
+    actions.Push(CreateContextMenuItem("Cancel", "HandleEmpty"));
     
     
     if (actions.length > 0) {
     if (actions.length > 0) {
         ActivateContextMenu(actions);
         ActivateContextMenu(actions);

+ 15 - 14
bin/Data/Scripts/Editor/EditorUI.as

@@ -1718,17 +1718,18 @@ void ActivateContextMenu(Array<UIElement@> actions)
     OpenContextMenu();
     OpenContextMenu();
 }
 }
 
 
-Menu@ CreateContextMenuItem(String text, String handler, String name = "")
+Menu@ CreateContextMenuItem(String text, String handler, String menuName = "", bool autoLocalize = true)
 {
 {
     Menu@ menu = Menu();
     Menu@ menu = Menu();
     menu.defaultStyle = uiStyle;
     menu.defaultStyle = uiStyle;
     menu.style = AUTO_STYLE;
     menu.style = AUTO_STYLE;
-    menu.name = name;
+    menu.name = menuName;
     menu.SetLayout(LM_HORIZONTAL, 0, IntRect(8, 2, 8, 2));
     menu.SetLayout(LM_HORIZONTAL, 0, IntRect(8, 2, 8, 2));
     Text@ menuText = Text();
     Text@ menuText = Text();
     menuText.style = "EditorMenuText";
     menuText.style = "EditorMenuText";
     menu.AddChild(menuText);
     menu.AddChild(menuText);
     menuText.text = text;
     menuText.text = text;
+    menuText.autoLocalizable = autoLocalize;
     menu.vars[VAR_CONTEXT_MENU_HANDLER] = handler;
     menu.vars[VAR_CONTEXT_MENU_HANDLER] = handler;
     SubscribeToEvent(menu, "Released", "ContextMenuEventWrapper");
     SubscribeToEvent(menu, "Released", "ContextMenuEventWrapper");
     return menu;
     return menu;
@@ -1814,28 +1815,28 @@ bool ColorWheelBuildMenuSelectTypeColor()
            
            
     if (coloringComponent.typeName == "Light") 
     if (coloringComponent.typeName == "Light") 
     {
     {
-        actions.Push(CreateContextMenuItem(localization.Get("Light color"), "HandleColorWheelMenu", "menuLightColor" ));
-        actions.Push(CreateContextMenuItem(localization.Get("Specular intensity"), "HandleColorWheelMenu", "menuSpecularIntensity"));
-        actions.Push(CreateContextMenuItem(localization.Get("Brightness multiplier"), "HandleColorWheelMenu", "menuBrightnessMultiplier" ));
+        actions.Push(CreateContextMenuItem("Light color", "HandleColorWheelMenu", "menuLightColor" ));
+        actions.Push(CreateContextMenuItem("Specular intensity", "HandleColorWheelMenu", "menuSpecularIntensity"));
+        actions.Push(CreateContextMenuItem("Brightness multiplier", "HandleColorWheelMenu", "menuBrightnessMultiplier" ));
         
         
-        actions.Push(CreateContextMenuItem(localization.Get("Cancel"), "HandleColorWheelMenu", "menuCancel"));
+        actions.Push(CreateContextMenuItem("Cancel", "HandleColorWheelMenu", "menuCancel"));
         
         
     }
     }
     else if (coloringComponent.typeName == "StaticModel") 
     else if (coloringComponent.typeName == "StaticModel") 
     {
     {
-        actions.Push(CreateContextMenuItem(localization.Get("Diffuse color"), "HandleColorWheelMenu", "menuDiffuseColor"));
-        actions.Push(CreateContextMenuItem(localization.Get("Specular color"), "HandleColorWheelMenu", "menuSpecularColor"));
-        actions.Push(CreateContextMenuItem(localization.Get("Emissive color"), "HandleColorWheelMenu", "menuEmissiveColor"));
-        actions.Push(CreateContextMenuItem(localization.Get("Environment map color"), "HandleColorWheelMenu", "menuEnvironmentMapColor"));
+        actions.Push(CreateContextMenuItem("Diffuse color", "HandleColorWheelMenu", "menuDiffuseColor"));
+        actions.Push(CreateContextMenuItem("Specular color", "HandleColorWheelMenu", "menuSpecularColor"));
+        actions.Push(CreateContextMenuItem("Emissive color", "HandleColorWheelMenu", "menuEmissiveColor"));
+        actions.Push(CreateContextMenuItem("Environment map color", "HandleColorWheelMenu", "menuEnvironmentMapColor"));
         
         
-        actions.Push(CreateContextMenuItem(localization.Get("Cancel"), "HandleColorWheelMenu", "menuCancel"));
+        actions.Push(CreateContextMenuItem("Cancel", "HandleColorWheelMenu", "menuCancel"));
     }
     }
     else if (coloringComponent.typeName == "Zone")        
     else if (coloringComponent.typeName == "Zone")        
     {
     {
-        actions.Push(CreateContextMenuItem(localization.Get("Ambient color"), "HandleColorWheelMenu", "menuAmbientColor"));
-        actions.Push(CreateContextMenuItem(localization.Get("Fog color"), "HandleColorWheelMenu", "menuFogColor"));
+        actions.Push(CreateContextMenuItem("Ambient color", "HandleColorWheelMenu", "menuAmbientColor"));
+        actions.Push(CreateContextMenuItem("Fog color", "HandleColorWheelMenu", "menuFogColor"));
         
         
-        actions.Push(CreateContextMenuItem(localization.Get("Cancel"), "HandleColorWheelMenu", "menuCancel"));
+        actions.Push(CreateContextMenuItem("Cancel", "HandleColorWheelMenu", "menuCancel"));
     }
     }
     
     
     if (actions.length > 0) {
     if (actions.length > 0) {