From e76c0ac5db4b82009a14835f444074fab0a5a571 Mon Sep 17 00:00:00 2001
From: GenZmeY <genzmey@gmail.com>
Date: Fri, 26 Jun 2020 07:17:32 +0300
Subject: [PATCH] main menu tab localization

---
 Localization/INT/ServerExt.int                | Bin 29138 -> 30258 bytes
 ServerExt/Classes/ExtGUI_PerkSelectionPage.uc |   4 +--
 ServerExt/Classes/KFGUI_Base.uc               |   3 ++
 ServerExt/Classes/KFGUI_SwitchMenuBar.uc      |   9 ++++--
 ServerExt/Classes/UI_MidGameMenu.uc           |  27 +++++++-----------
 5 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/Localization/INT/ServerExt.int b/Localization/INT/ServerExt.int
index f10d3efbd1885d01576c58fc79631788d0779c0a..f5a13d35a5c4e1a08360aa0a61815959028a9682 100644
GIT binary patch
delta 1046
zcmaJ=F;2rk5S&mU1PxT_taKE704YU;5Fim06j33B9E==`*g))HQuz(YA3^+pFQlTU
z<q^zYe6i2*MV8O<?d<IA+}`51_4U{KT)c*R*ugDsaDf5t`95NbCk*+W@O?mn0MCeU
z2SJ{|#mj21i_R*eqvGd8M~q9P%Hc3Cf|q|Ewez3ut{*cld}ejYNECYnAF;J&9oJNQ
zOx0<Aeb~+fJ;j?^Pw`HEhumhRCN%>(;9{=whU{A0*rX{TIw7K_W?xyM<gl<y(n<bt
ze2|F*ElUKM>83F~cnFoXeP%_NS*<CNH5pW4G?^7A-ouDa%~;-c!X;vzvWz)o7*k@*
zCPOlM{L0)^_p2>uhMGc5U-cN^j6Q|z)Fw&e`~tTwOdp;&E`nq%0}j=a*Fl;owKC%Z
zk(mg%Hi^0-Cf#uII=(KVI(ZHSEO{Kxl8emeZ&Nw@6}+UOBR+GhFFLnbioVe5GH#W(
Iaa+&qKSfltasU7T

delta 9
Qcmdn=hVjy4#toMW0UI_2NdN!<

diff --git a/ServerExt/Classes/ExtGUI_PerkSelectionPage.uc b/ServerExt/Classes/ExtGUI_PerkSelectionPage.uc
index ca7ab32..b789463 100644
--- a/ServerExt/Classes/ExtGUI_PerkSelectionPage.uc
+++ b/ServerExt/Classes/ExtGUI_PerkSelectionPage.uc
@@ -10,7 +10,7 @@ function InitMenu()
 	
 	for( i=0; i<Pages.Length; ++i )
 	{
-		PageSwitcher.AddPage(Pages[i].PageClass,Pages[i].Caption,Pages[i].Hint,B).InitMenu();
+		PageSwitcher.AddPage(Pages[i],B).InitMenu();
 	}
 }
 
@@ -54,5 +54,5 @@ defaultproperties
 	YSize=0.73
 	
 	Pages.Empty
-	Pages.Add((PageClass=Class'UIP_PerkSelectionLobby',Caption="Perk",Hint="Select and upgrade your perks"))
+	Pages.Add(Class'UIP_PerkSelectionLobby')
 }
\ No newline at end of file
diff --git a/ServerExt/Classes/KFGUI_Base.uc b/ServerExt/Classes/KFGUI_Base.uc
index 84be48e..e32a69b 100644
--- a/ServerExt/Classes/KFGUI_Base.uc
+++ b/ServerExt/Classes/KFGUI_Base.uc
@@ -23,6 +23,9 @@ var() int IDValue; // Integer ID value.
 var transient float CompPos[4],InputPos[4];
 var float TimerRate,TimerCounter;
 
+var localized string Caption;
+var localized string Hint;
+
 var transient KFGUI_Base MouseArea; // Next in recurse line of the mouse pointer focus area.
 
 var() bool bDisabled,bClickable,bCanFocus;
diff --git a/ServerExt/Classes/KFGUI_SwitchMenuBar.uc b/ServerExt/Classes/KFGUI_SwitchMenuBar.uc
index 22d3336..cfbb0aa 100644
--- a/ServerExt/Classes/KFGUI_SwitchMenuBar.uc
+++ b/ServerExt/Classes/KFGUI_SwitchMenuBar.uc
@@ -9,11 +9,14 @@ var int NumButtons,CurrentPageNum,PageComponentIndex;
 var array<KFGUI_Button> PageButtons;
 
 // Remember to call InitMenu() on the newly created page after.
-final function KFGUI_Base AddPage( class<KFGUI_Base> PageClass, string Caption, string Hint, optional out KFGUI_Button Button )
+final function KFGUI_Base AddPage( class<KFGUI_Base> PageClass, optional out KFGUI_Button Button )
 {
 	local KFGUI_Base P;
+	local KFGUI_Base C;
 	local KFGUI_Button B;
 	
+	C = new PageClass;
+	
 	// Add page.
 	P = new (Self) PageClass;
 	P.Owner = Owner;
@@ -22,8 +25,8 @@ final function KFGUI_Base AddPage( class<KFGUI_Base> PageClass, string Caption,
 
 	// Add page switch button.
 	B = new (Self) class'KFGUI_Button';
-	B.ButtonText = Caption;
-	B.ToolTip = Hint;
+	B.ButtonText = C.Caption;
+	B.ToolTip = C.Hint;
 	B.OnClickLeft = PageSwitched;
 	B.OnClickRight = PageSwitched;
 	B.IDValue = NumButtons;
diff --git a/ServerExt/Classes/UI_MidGameMenu.uc b/ServerExt/Classes/UI_MidGameMenu.uc
index 5fdbb45..574ead9 100644
--- a/ServerExt/Classes/UI_MidGameMenu.uc
+++ b/ServerExt/Classes/UI_MidGameMenu.uc
@@ -1,12 +1,7 @@
 Class UI_MidGameMenu extends KFGUI_FloatingWindow;
-
-struct FPageInfo
-{
-	var class<KFGUI_Base> PageClass;
-	var string Caption,Hint;
-};
+	
 var KFGUI_SwitchMenuBar PageSwitcher;
-var() array<FPageInfo> Pages;
+var array< class<KFGUI_Base> > Pages;
 
 var KFGUI_Button AdminButton,SpectateButton;
 
@@ -30,8 +25,8 @@ function InitMenu()
 	
 	for( i=0; i<Pages.Length; ++i )
 	{
-		PageSwitcher.AddPage(Pages[i].PageClass,Pages[i].Caption,Pages[i].Hint,B).InitMenu();
-		if( Pages[i].PageClass==Class'UIP_AdminMenu' )
+		PageSwitcher.AddPage(Pages[i],B).InitMenu();
+		if( Pages[i]==Class'UIP_AdminMenu' )
 			AdminButton = B;
 	}
 }
@@ -139,13 +134,13 @@ defaultproperties
 	XSize=0.8
 	YSize=0.8
 	
-	Pages.Add((PageClass=Class'UIP_News',Caption="News",Hint="Server news page"))
-	Pages.Add((PageClass=Class'UIP_PerkSelection',Caption="Perk",Hint="Select and upgrade your perks"))
-	Pages.Add((PageClass=Class'UIP_Settings',Caption="Settings",Hint="Show additional ServerExt settings"))
-	Pages.Add((PageClass=Class'UIP_PlayerSpecs',Caption="Stats",Hint="Show all players server stats"))
-	Pages.Add((PageClass=Class'UIP_AdminMenu',Caption="Admin",Hint=""))
-	Pages.Add((PageClass=Class'UIP_About',Caption="About",Hint="About this mod on this server"))
-	Pages.Add((PageClass=Class'UIP_MiniGame',Caption="Minigame",Hint="Play a minigame while at it"))
+	Pages.Add(Class'UIP_News')
+	Pages.Add(Class'UIP_PerkSelection')
+	Pages.Add(Class'UIP_Settings')
+	Pages.Add(Class'UIP_PlayerSpecs')
+	Pages.Add(Class'UIP_AdminMenu')
+	Pages.Add(Class'UIP_About')
+	Pages.Add(Class'UIP_MiniGame')
 
 	Begin Object Class=KFGUI_SwitchMenuBar Name=MultiPager
 		ID="Pager"