Merge pull request #618 from jrodrigv/master

next release
PapaJoesSoup · Dec 30, 2018 · 12ce58b · 12ce58b
2 parents 8bbc297 + 62e5bfd
commit 12ce58b
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/BDArmory/Modules/ModuleWeapon.cs b/BDArmory/Modules/ModuleWeapon.cs
@@ -858,14 +858,14 @@ private void OnActionGroupEditorClosed()
 			Events["HideUI"].active = false;
 			Events["ShowUI"].active = true;
 		}
-		[KSPEvent(guiActiveEditor = true, guiName = "Hide Weapon Name UI", active = false)]
+		[KSPEvent(guiActiveEditor = true, guiName = "Hide Weapon Group UI", active = false)]
 		public void HideUI()
 		{
 			WeaponGroupWindow.HideGUI();
 			UpdateMenus(false);
 		}
 
-		[KSPEvent(guiActiveEditor = true, guiName = "Set Weapon Name UI", active = false)]
+		[KSPEvent(guiActiveEditor = true, guiName = "Set Weapon Group UI", active = false)]
 		public void ShowUI()
 		{
 			WeaponGroupWindow.ShowGUI(this);
@@ -2384,7 +2384,7 @@ public class WeaponGroupWindow : MonoBehaviour
 
 		private Vector2 scrollPos;
 
-		[KSPField(isPersistant = false, guiActiveEditor = true, guiActive = false, guiName = "Show Weapon Name Editor"), UI_Toggle(enabledText = "Weapon Name GUI", disabledText = "GUI")] [NonSerialized] public bool showRFGUI;
+		[KSPField(isPersistant = false, guiActiveEditor = true, guiActive = false, guiName = "Show Group Editor"), UI_Toggle(enabledText = "close Group GUI", disabledText = "open Group GUI")] [NonSerialized] public bool showRFGUI;
 
 		private bool styleSetup;
 
@@ -2515,7 +2515,7 @@ public void OnGUI()
 			{
 				editor.Unlock("BD_MN_GUILock");
 			}
-			guiWindowRect = GUILayout.Window(GetInstanceID(), guiWindowRect, GUIWindow, "Weapon Name GUI", Styles.styleEditorPanel);
+			guiWindowRect = GUILayout.Window(GetInstanceID(), guiWindowRect, GUIWindow, "Weapon Group GUI", Styles.styleEditorPanel);
 		}
 
 		public void GUIWindow(int windowID)