changed ingame vote menu so it fits the other tabs and it's makes localisations easier

16 files changed, 78 insertions, 197 deletions

diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt
index 2d573d65..56d12eb6 100644
--- a/data/languages/bosnian.txt
+++ b/data/languages/bosnian.txt
@@ -226,9 +226,6 @@ Join red
 Jump
 == Skok
 
-Kick
-== Izbaci
-
 LAN
 == LAN
 
@@ -561,10 +558,10 @@ Kick player
 Length:
 == 
 
-Make player a spectator
+Map:
 == 
 
-Map:
+Move player to spectators
 == 
 
 Name plates size
@@ -659,9 +656,3 @@ no limit
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/data/languages/czech.txt b/data/languages/czech.txt
index 54da0687..93830c0e 100644
--- a/data/languages/czech.txt
+++ b/data/languages/czech.txt
@@ -178,9 +178,6 @@ Join red
 Jump
 == Výskok
 
-Kick
-== Vyhodit
-
 LAN
 == LAN
 
@@ -531,9 +528,6 @@ Kick player
 Length:
 == 
 
-Make player a spectator
-== 
-
 Map:
 == 
 
@@ -543,6 +537,9 @@ Max Screenshots
 Max demos
 == 
 
+Move player to spectators
+== 
+
 Name plates size
 == 
 
@@ -659,9 +656,3 @@ no limit
 
 ##### old translations #####
 
-Friend
-== 
-
-Ignore
-== 
-
diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt
index 689d18f5..e4a55da6 100644
--- a/data/languages/dutch.txt
+++ b/data/languages/dutch.txt
@@ -226,9 +226,6 @@ Join red
 Jump
 == Springen
 
-Kick
-== Kicken
-
 LAN
 == LAN
 
@@ -585,10 +582,10 @@ Kick player
 Length:
 == 
 
-Make player a spectator
+Map:
 == 
 
-Map:
+Move player to spectators
 == 
 
 Netversion:
@@ -659,9 +656,3 @@ Vote description:
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt
index 1580125c..8e38f515 100644
--- a/data/languages/finnish.txt
+++ b/data/languages/finnish.txt
@@ -193,9 +193,6 @@ Join red
 Jump
 == Hyppää
 
-Kick
-== Kick
-
 LAN
 == LAN
 
@@ -543,9 +540,6 @@ Kick player
 Length:
 == 
 
-Make player a spectator
-== 
-
 Map:
 == 
 
@@ -555,6 +549,9 @@ Max Screenshots
 Max demos
 == 
 
+Move player to spectators
+== 
+
 Name plates size
 == 
 
@@ -659,9 +656,3 @@ no limit
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/data/languages/french.txt b/data/languages/french.txt
index 88793508..49e3cdea 100644
--- a/data/languages/french.txt
+++ b/data/languages/french.txt
@@ -226,9 +226,6 @@ Join red
 Jump
 == Sauter
 
-Kick
-== Expulser
-
 LAN
 == LAN
 
@@ -573,10 +570,10 @@ Kick player
 Length:
 == 
 
-Make player a spectator
+Map:
 == 
 
-Map:
+Move player to spectators
 == 
 
 Name plates size
@@ -659,9 +656,3 @@ Vote description:
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/data/languages/german.txt b/data/languages/german.txt
index 5ddc1760..537557ff 100644
--- a/data/languages/german.txt
+++ b/data/languages/german.txt
@@ -226,9 +226,6 @@ Join red
 Jump
 == Springen
 
-Kick
-== Kicken
-
 LAN
 == LAN
 
@@ -585,10 +582,10 @@ Kick player
 Length:
 == 
 
-Make player a spectator
+Map:
 == 
 
-Map:
+Move player to spectators
 == 
 
 Netversion:
@@ -659,9 +656,3 @@ Vote description:
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/data/languages/italian.txt b/data/languages/italian.txt
index 5a549c66..63b32f24 100644
--- a/data/languages/italian.txt
+++ b/data/languages/italian.txt
@@ -226,9 +226,6 @@ Join red
 Jump
 == Salta
 
-Kick
-== Kick
-
 LAN
 == LAN
 
@@ -567,9 +564,6 @@ Kick player
 Length:
 == 
 
-Make player a spectator
-== 
-
 Map:
 == 
 
@@ -579,6 +573,9 @@ Max Screenshots
 Max demos
 == 
 
+Move player to spectators
+== 
+
 Netversion:
 == 
 
@@ -659,9 +656,3 @@ Warmup
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/data/languages/polish.txt b/data/languages/polish.txt
index 443762d8..beee462f 100644
--- a/data/languages/polish.txt
+++ b/data/languages/polish.txt
@@ -193,9 +193,6 @@ Join red
 Jump
 == Skok
 
-Kick
-== Kopnięcie
-
 LAN
 == LAN
 
@@ -546,9 +543,6 @@ Kick player
 Length:
 == 
 
-Make player a spectator
-== 
-
 Map:
 == 
 
@@ -558,6 +552,9 @@ Max Screenshots
 Max demos
 == 
 
+Move player to spectators
+== 
+
 Name plates size
 == 
 
@@ -659,9 +656,3 @@ no limit
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt
index 14926b19..dc39a23f 100644
--- a/data/languages/portuguese.txt
+++ b/data/languages/portuguese.txt
@@ -190,9 +190,6 @@ Join red
 Jump
 == Pular
 
-Kick
-== Kick
-
 LAN
 == LAN
 
@@ -543,9 +540,6 @@ Kick player
 Length:
 == 
 
-Make player a spectator
-== 
-
 Map:
 == 
 
@@ -555,6 +549,9 @@ Max Screenshots
 Max demos
 == 
 
+Move player to spectators
+== 
+
 Name plates size
 == 
 
@@ -659,9 +656,3 @@ no limit
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt
index 187ba72b..e2e09ba0 100644
--- a/data/languages/romanian.txt
+++ b/data/languages/romanian.txt
@@ -226,9 +226,6 @@ Join red
 Jump
 == Salt
 
-Kick
-== Dă afară
-
 LAN
 == LAN
 
@@ -585,10 +582,10 @@ Kick player
 Length:
 == 
 
-Make player a spectator
+Map:
 == 
 
-Map:
+Move player to spectators
 == 
 
 Netversion:
@@ -659,9 +656,3 @@ Vote description:
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/data/languages/russian.txt b/data/languages/russian.txt
index d5a0a4a9..0c1e8052 100644
--- a/data/languages/russian.txt
+++ b/data/languages/russian.txt
@@ -196,9 +196,6 @@ Join red
 Jump
 == Прыжок
 
-Kick
-== Выкинуть
-
 LAN
 == LAN
 
@@ -549,9 +546,6 @@ Kick player
 Length:
 == 
 
-Make player a spectator
-== 
-
 Map:
 == 
 
@@ -561,6 +555,9 @@ Max Screenshots
 Max demos
 == 
 
+Move player to spectators
+== 
+
 Name plates size
 == 
 
@@ -659,9 +656,3 @@ no limit
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt
index ebdbf52f..09c6fe4f 100644
--- a/data/languages/serbian.txt
+++ b/data/languages/serbian.txt
@@ -193,9 +193,6 @@ Join red
 Jump
 == Skok
 
-Kick
-== Izbaci
-
 LAN
 == LAN
 
@@ -543,9 +540,6 @@ Kick player
 Length:
 == 
 
-Make player a spectator
-== 
-
 Map:
 == 
 
@@ -555,6 +549,9 @@ Max Screenshots
 Max demos
 == 
 
+Move player to spectators
+== 
+
 Name plates size
 == 
 
@@ -659,9 +656,3 @@ no limit
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt
index ac3fdea8..287786df 100644
--- a/data/languages/spanish.txt
+++ b/data/languages/spanish.txt
@@ -226,9 +226,6 @@ Join red
 Jump
 == Saltar
 
-Kick
-== Golpeo
-
 LAN
 == LAN
 
@@ -585,10 +582,10 @@ Kick player
 Length:
 == 
 
-Make player a spectator
+Map:
 == 
 
-Map:
+Move player to spectators
 == 
 
 Netversion:
@@ -659,9 +656,3 @@ Vote description:
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt
index 376d6f79..04a870fb 100644
--- a/data/languages/swedish.txt
+++ b/data/languages/swedish.txt
@@ -175,9 +175,6 @@ Join red
 Jump
 == Hoppa
 
-Kick
-== Sparka
-
 LAN
 == LAN
 
@@ -528,9 +525,6 @@ Kick player
 Length:
 == 
 
-Make player a spectator
-== 
-
 Map:
 == 
 
@@ -540,6 +534,9 @@ Max Screenshots
 Max demos
 == 
 
+Move player to spectators
+== 
+
 Name plates size
 == 
 
@@ -659,9 +656,3 @@ no limit
 
 ##### old translations #####
 
-Friend
-== 
-
-Ignore
-== 
-
diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt
index 17af3e7e..3c5a0be0 100644
--- a/data/languages/ukrainian.txt
+++ b/data/languages/ukrainian.txt
@@ -205,9 +205,6 @@ Join red
 Jump
 == Стрибок
 
-Kick
-== Викинути
-
 LAN
 == LAN
 
@@ -558,9 +555,6 @@ Kick player
 Length:
 == 
 
-Make player a spectator
-== 
-
 Map:
 == 
 
@@ -570,6 +564,9 @@ Max Screenshots
 Max demos
 == 
 
+Move player to spectators
+== 
+
 Name plates size
 == 
 
@@ -659,9 +656,3 @@ no limit
 
 ##### old translations #####
 
-Ignore
-== 
-
-Friend
-== 
-
diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp
index 490f40d1..cdeae9a8 100644
--- a/src/game/client/components/menus_ingame.cpp
+++ b/src/game/client/components/menus_ingame.cpp
@@ -361,7 +361,7 @@ void CMenus::RenderServerControlKick(CUIRect MainView, bool FilterSpectators)
 	static int s_VoteList = 0;
 	static float s_ScrollValue = 0;
 	CUIRect List = MainView;
-	UiDoListboxStart(&s_VoteList, &List, 24.0f, FilterSpectators?Localize("Make player a spectator"):Localize("Kick player"), "", NumOptions, 1, Selected, s_ScrollValue);
+	UiDoListboxStart(&s_VoteList, &List, 24.0f, FilterSpectators?Localize("Move player to spectators"):Localize("Kick player"), "", NumOptions, 1, Selected, s_ScrollValue);
 	
 	for(int i = 0; i < NumOptions; i++)
 	{
@@ -387,48 +387,64 @@ void CMenus::RenderServerControl(CUIRect MainView)
 	static int s_ControlPage = 0;
 	
 	// render background
-	CUIRect Temp, TabBar;
-	MainView.VSplitRight(120.0f, &MainView, &TabBar);
 	RenderTools()->DrawUIRect(&MainView, ms_ColorTabbarActive, CUI::CORNER_B|CUI::CORNER_TL, 10.0f);
-	TabBar.HSplitTop(50.0f, &Temp, &TabBar);
-	RenderTools()->DrawUIRect(&Temp, ms_ColorTabbarActive, CUI::CORNER_R, 10.0f);
-	
 	MainView.HSplitTop(10.0f, 0, &MainView);
 	
-	CUIRect Button;
-	
-	const char *paTabs[] = {
-		Localize("Settings"),
-		Localize("Kick"),
-		Localize("Spectate")};
-	int aNumTabs = (int)(sizeof(paTabs)/sizeof(*paTabs));
+	// page menu
+	CUIRect PageMenu, Button;
+	MainView.HSplitBottom(60.0f, &MainView, &PageMenu);
+	PageMenu.Margin(10.0f, &PageMenu);
+	RenderTools()->DrawUIRect(&PageMenu, vec4(1.0f, 1.0f, 1.0f,0.25f), CUI::CORNER_ALL, 10.0f);
+	PageMenu.Margin(10.0f, &PageMenu);
+
+	PageMenu.VSplitLeft(50.0f, 0, &PageMenu);
+	PageMenu.VSplitLeft(120.0f, &Button, &PageMenu);
+	static int s_PrevButton = 0;
+	if(DoButton_PageMenu(&s_PrevButton, Localize("Prev"), 0, s_ControlPage>0, &Button, CUI::CORNER_L))
+	{
+		if(s_ControlPage > 0)
+		{
+			m_CallvoteSelectedPlayer = -1;
+			m_CallvoteSelectedOption = -1;
+			--s_ControlPage;
+		}
+	}
 	
-	for(int i = 0; i < aNumTabs; i++)
+	PageMenu.VSplitRight(50.0f, &PageMenu, 0);
+	PageMenu.VSplitRight(120.0f, &PageMenu, &Button);
+	static int s_NextButton = 0;
+	if(DoButton_PageMenu(&s_NextButton, Localize("Next"), 0, s_ControlPage<2, &Button, CUI::CORNER_R))
 	{
-		TabBar.HSplitTop(10, &Button, &TabBar);
-		TabBar.HSplitTop(26, &Button, &TabBar);
-		if(DoButton_MenuTab(paTabs[i], paTabs[i], s_ControlPage == i, &Button, CUI::CORNER_R))
+		if(s_ControlPage < 2)
 		{
-			s_ControlPage = i;
 			m_CallvoteSelectedPlayer = -1;
 			m_CallvoteSelectedOption = -1;
+			++s_ControlPage;
 		}
 	}
-		
+	
+	RenderTools()->DrawUIRect(&PageMenu, vec4(1.0f, 1.0f, 1.0f, 0.5f), 0, 10.0f);
+	char aBuf[64];
+	str_format(aBuf, sizeof(aBuf), Localize("Page %d of %d"), s_ControlPage+1, 3);
+	UI()->DoLabelScaled(&PageMenu, aBuf, PageMenu.h*ms_FontmodHeight, 0);
+
+	// render page
 	CUIRect Bottom, Extended;
+	MainView.VMargin(10.0f, &MainView);
+	RenderTools()->DrawUIRect(&MainView, vec4(1.0f, 1.0f, 1.0f, 0.25f), CUI::CORNER_ALL, 10.0f);
 	MainView.HSplitBottom(90.0f, &MainView, &Extended);
 	MainView.Margin(10.0f, &MainView);
 	MainView.HSplitBottom(ms_ButtonHeight + 5*2, &MainView, &Bottom);
 	Bottom.HMargin(5.0f, &Bottom);
-	
-	// render page		
+
 	if(s_ControlPage == 0)
 		RenderServerControlServer(MainView);
 	else if(s_ControlPage == 1)
 		RenderServerControlKick(MainView, false);
 	else if(s_ControlPage == 2)
-		RenderServerControlKick(MainView, true);		
+		RenderServerControlKick(MainView, true);
 
+	// vote menu
 	{
 		CUIRect Button;
 		Bottom.VSplitRight(120.0f, &Bottom, &Button);
@@ -546,6 +562,6 @@ void CMenus::RenderServerControl(CUIRect MainView)
 				DoEditBox(&s_aVoteCommand, &Button, s_aVoteCommand, sizeof(s_aVoteCommand), 14.0f, &s_OffsetCmd, false, CUI::CORNER_ALL);
 			}
 		}
-	}		
+	}
 }