improved call vote tab. Closes #573

19 files changed, 20 insertions, 199 deletions

diff --git a/data/languages/bosnian.txt b/data/languages/bosnian.txt
index 289004f7..b9bee265 100644
--- a/data/languages/bosnian.txt
+++ b/data/languages/bosnian.txt
@@ -579,18 +579,9 @@ Netversion:
 New name:
 == 
 
-Next
-== 
-
-Page %d of %d
-== 
-
 Player options
 == 
 
-Prev
-== 
-
 Quit anyway?
 == 
 
diff --git a/data/languages/czech.txt b/data/languages/czech.txt
index b6f4ad31..fd453c2c 100644
--- a/data/languages/czech.txt
+++ b/data/languages/czech.txt
@@ -346,9 +346,6 @@ New name:
 News
 == Novinky
 
-Next
-== Další
-
 Next weapon
 == Další zbraň
 
@@ -373,9 +370,6 @@ Ok
 Open
 == Otevřít
 
-Page %d of %d
-== Strana %d z %d
-
 Parent Folder
 == Nadřazená složka
 
@@ -406,9 +400,6 @@ Players
 Please balance teams!
 == Prosím vyrovnejte týmy!
 
-Prev
-== Předchozí
-
 Prev. weapon
 == Předchozí zbraň
 
diff --git a/data/languages/dutch.txt b/data/languages/dutch.txt
index 4eb36038..055a0495 100644
--- a/data/languages/dutch.txt
+++ b/data/languages/dutch.txt
@@ -346,9 +346,6 @@ New name:
 News
 == Nieuws
 
-Next
-== Volgende
-
 Next weapon
 == Volgend wapen
 
@@ -373,9 +370,6 @@ Ok
 Open
 == Open
 
-Page %d of %d
-== Pagina %d van %d
-
 Parent Folder
 == Bovenliggende map
 
@@ -406,9 +400,6 @@ Players
 Please balance teams!
 == Balanceer teams!
 
-Prev
-== Vorige
-
 Prev. weapon
 == Vorig wapen
 
diff --git a/data/languages/finnish.txt b/data/languages/finnish.txt
index fe729ed8..2749f2da 100644
--- a/data/languages/finnish.txt
+++ b/data/languages/finnish.txt
@@ -567,24 +567,15 @@ Netversion:
 New name:
 == 
 
-Next
-== 
-
 Open
 == 
 
-Page %d of %d
-== 
-
 Parent Folder
 == 
 
 Player options
 == 
 
-Prev
-== 
-
 Quit anyway?
 == 
 
diff --git a/data/languages/french.txt b/data/languages/french.txt
index 5f5143a4..2efb521b 100644
--- a/data/languages/french.txt
+++ b/data/languages/french.txt
@@ -370,9 +370,6 @@ Ok
 Open
 == Ouvrir
 
-Page %d of %d
-== Page %d sur %d
-
 Parent Folder
 == Dossier parent
 
@@ -660,11 +657,5 @@ no limit
 
 ##### needs translation #####
 
-Next
-== 
-
-Prev
-== 
-
 ##### old translations #####
 
diff --git a/data/languages/german.txt b/data/languages/german.txt
index efa88eec..6388ee96 100644
--- a/data/languages/german.txt
+++ b/data/languages/german.txt
@@ -346,9 +346,6 @@ New name:
 News
 == News
 
-Next
-== Weiter
-
 Next weapon
 == Nächste Waffe
 
@@ -373,9 +370,6 @@ Ok
 Open
 == Öffnen
 
-Page %d of %d
-== Seite %d von %d
-
 Parent Folder
 == Übergeordneter Ordner
 
@@ -406,9 +400,6 @@ Players
 Please balance teams!
 == Bitte Teams ausgleichen!
 
-Prev
-== Zurück
-
 Prev. weapon
 == Vorherige Waffe
 
diff --git a/data/languages/italian.txt b/data/languages/italian.txt
index abdd46e3..8798c0b7 100644
--- a/data/languages/italian.txt
+++ b/data/languages/italian.txt
@@ -588,18 +588,9 @@ Netversion:
 New name:
 == 
 
-Next
-== 
-
-Page %d of %d
-== 
-
 Player options
 == 
 
-Prev
-== 
-
 Quit anyway?
 == 
 
diff --git a/data/languages/polish.txt b/data/languages/polish.txt
index 215469bd..8b7434e0 100644
--- a/data/languages/polish.txt
+++ b/data/languages/polish.txt
@@ -570,21 +570,12 @@ Netversion:
 New name:
 == 
 
-Next
-== 
-
-Page %d of %d
-== 
-
 Parent Folder
 == 
 
 Player options
 == 
 
-Prev
-== 
-
 Quit anyway?
 == 
 
diff --git a/data/languages/portuguese.txt b/data/languages/portuguese.txt
index fa3d1bec..1e161bc6 100644
--- a/data/languages/portuguese.txt
+++ b/data/languages/portuguese.txt
@@ -567,24 +567,15 @@ Netversion:
 New name:
 == 
 
-Next
-== 
-
 Open
 == 
 
-Page %d of %d
-== 
-
 Parent Folder
 == 
 
 Player options
 == 
 
-Prev
-== 
-
 Quit anyway?
 == 
 
diff --git a/data/languages/romanian.txt b/data/languages/romanian.txt
index 78fb4b26..3f589dc4 100644
--- a/data/languages/romanian.txt
+++ b/data/languages/romanian.txt
@@ -346,9 +346,6 @@ New name:
 News
 == Știri
 
-Next
-== Următoarea
-
 Next weapon
 == Arma următoare
 
@@ -373,9 +370,6 @@ Ok
 Open
 == Deschide
 
-Page %d of %d
-== Pagina %d din %d
-
 Parent Folder
 == Dosarul părinte
 
@@ -406,9 +400,6 @@ Players
 Please balance teams!
 == Echilibrați echipele!
 
-Prev
-== Anterioara
-
 Prev. weapon
 == Arma precedentă
 
diff --git a/data/languages/russian.txt b/data/languages/russian.txt
index da12b996..dcdcd3a8 100644
--- a/data/languages/russian.txt
+++ b/data/languages/russian.txt
@@ -343,9 +343,6 @@ New name:
 News
 == Новости
 
-Next
-== Далее
-
 Next weapon
 == След. оружие
 
@@ -370,9 +367,6 @@ Ok
 Open
 == Открыть
 
-Page %d of %d
-== Страница %d из %d
-
 Parent Folder
 == Родительский каталог
 
@@ -403,9 +397,6 @@ Players
 Please balance teams!
 == Сбалансируйте команды!
 
-Prev
-== Пред.
-
 Prev. weapon
 == Пред. оружие
 
diff --git a/data/languages/serbian.txt b/data/languages/serbian.txt
index 7838c862..97a23f09 100644
--- a/data/languages/serbian.txt
+++ b/data/languages/serbian.txt
@@ -567,24 +567,15 @@ Netversion:
 New name:
 == 
 
-Next
-== 
-
 Open
 == 
 
-Page %d of %d
-== 
-
 Parent Folder
 == 
 
 Player options
 == 
 
-Prev
-== 
-
 Quit anyway?
 == 
 
diff --git a/data/languages/slovak.txt b/data/languages/slovak.txt
index e8604a42..f1fe2472 100644
--- a/data/languages/slovak.txt
+++ b/data/languages/slovak.txt
@@ -346,9 +346,6 @@ New name:
 News
 == Novinky
 
-Next
-== Ďalší
-
 Next weapon
 == Ďalšia zbraň
 
@@ -373,9 +370,6 @@ Ok
 Open
 == Otvoriť
 
-Page %d of %d
-== Strana %d z %d
-
 Parent Folder
 == Nadradený Priečinok
 
@@ -406,9 +400,6 @@ Players
 Please balance teams!
 == Prosím vyrovnajte týmy!
 
-Prev
-== Predošlé
-
 Prev. weapon
 == Predošlá zbraň
 
diff --git a/data/languages/spanish.txt b/data/languages/spanish.txt
index b4667900..94b804da 100644
--- a/data/languages/spanish.txt
+++ b/data/languages/spanish.txt
@@ -600,18 +600,9 @@ Netversion:
 New name:
 == 
 
-Next
-== 
-
-Page %d of %d
-== 
-
 Player options
 == 
 
-Prev
-== 
-
 Quit anyway?
 == 
 
diff --git a/data/languages/swedish.txt b/data/languages/swedish.txt
index 43471832..d7307164 100644
--- a/data/languages/swedish.txt
+++ b/data/languages/swedish.txt
@@ -343,9 +343,6 @@ New name:
 News
 == Nyheter
 
-Next
-== Nästa
-
 Next weapon
 == Nästa vapen
 
@@ -370,9 +367,6 @@ Ok
 Open
 == Öppna
 
-Page %d of %d
-== Sida %d av %d
-
 Parent Folder
 == Uppliggande mapp
 
@@ -403,9 +397,6 @@ Players
 Please balance teams!
 == Balansera lagen!
 
-Prev
-== Föregående
-
 Prev. weapon
 == Föregående vapen
 
diff --git a/data/languages/ukrainian.txt b/data/languages/ukrainian.txt
index 8f32416e..7f43c5f0 100644
--- a/data/languages/ukrainian.txt
+++ b/data/languages/ukrainian.txt
@@ -582,21 +582,12 @@ Netversion:
 New name:
 == 
 
-Next
-== 
-
-Page %d of %d
-== 
-
 Parent Folder
 == 
 
 Player options
 == 
 
-Prev
-== 
-
 Quit anyway?
 == 
 
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp
index b33a5add..d8ddb276 100644
--- a/src/game/client/components/menus.cpp
+++ b/src/game/client/components/menus.cpp
@@ -123,17 +123,6 @@ int CMenus::DoButton_MenuTab(const void *pID, const char *pText, int Checked, co
 	return UI()->DoButtonLogic(pID, pText, Checked, pRect);
 }
 
-int CMenus::DoButton_PageMenu(const void *pID, const char *pText, int Checked, bool Active, const CUIRect *pRect, int Corners)
-{
-	if(Active)
-		RenderTools()->DrawUIRect(pRect, vec4(1,1,1,0.5f)*ButtonColorMul(pID), Corners, 10.0f);
-	else
-		RenderTools()->DrawUIRect(pRect, vec4(0.0f, 0.0f, 0.0f, 0.25f), Corners, 10.0f);
-	UI()->DoLabel(pRect, pText, pRect->h*ms_FontmodHeight, 0);
-	
-	return UI()->DoButtonLogic(pID, pText, Checked, pRect);
-}
-
 int CMenus::DoButton_GridHeader(const void *pID, const char *pText, int Checked, const CUIRect *pRect)
 //void CMenus::ui_draw_grid_header(const void *id, const char *text, int checked, const CUIRect *r, const void *extra)
 {
diff --git a/src/game/client/components/menus.h b/src/game/client/components/menus.h
index 3c712f5d..758bcd3d 100644
--- a/src/game/client/components/menus.h
+++ b/src/game/client/components/menus.h
@@ -41,7 +41,6 @@ class CMenus : public CComponent
 	int DoButton_Sprite(const void *pID, int ImageID, int SpriteID, int Checked, const CUIRect *pRect, int Corners);
 	int DoButton_Menu(const void *pID, const char *pText, int Checked, const CUIRect *pRect);
 	int DoButton_MenuTab(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Corners);
-	int DoButton_PageMenu(const void *pID, const char *pText, int Checked, bool Active, const CUIRect *pRect, int Corners);
 
 	int DoButton_CheckBox_Common(const void *pID, const char *pText, const char *pBoxText, const CUIRect *pRect);
 	int DoButton_CheckBox(const void *pID, const char *pText, int Checked, const CUIRect *pRect);
diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp
index fbde9a0b..d3e9933f 100644
--- a/src/game/client/components/menus_ingame.cpp
+++ b/src/game/client/components/menus_ingame.cpp
@@ -387,53 +387,30 @@ void CMenus::RenderServerControl(CUIRect MainView)
 	static int s_ControlPage = 0;
 	
 	// render background
-	RenderTools()->DrawUIRect(&MainView, ms_ColorTabbarActive, CUI::CORNER_B|CUI::CORNER_TL, 10.0f);
-	MainView.HSplitTop(10.0f, 0, &MainView);
-	
-	// 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;
-		}
-	}
-	
-	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))
+	CUIRect Bottom, Extended, TabBar, Button;
+	MainView.HSplitBottom(20.0f, &MainView, &TabBar);
+	RenderTools()->DrawUIRect(&MainView, ms_ColorTabbarActive, CUI::CORNER_T, 10.0f);
+	MainView.Margin(10.0f, &MainView);
+	MainView.HSplitBottom(90.0f, &MainView, &Extended);
+
+	// tab bar
 	{
-		if(s_ControlPage < 2)
-		{
-			m_CallvoteSelectedPlayer = -1;
-			m_CallvoteSelectedOption = -1;
-			++s_ControlPage;
-		}
+		TabBar.VSplitLeft(TabBar.w/3, &Button, &TabBar);
+		static int s_Button0 = 0;
+		if(DoButton_MenuTab(&s_Button0, Localize("Change settings"), s_ControlPage == 0, &Button, CUI::CORNER_BL))
+			s_ControlPage = 0;
+
+		TabBar.VSplitMid(&Button, &TabBar);
+		static int s_Button1 = 0;
+		if(DoButton_MenuTab(&s_Button1, Localize("Kick player"), s_ControlPage == 1, &Button, 0))
+			s_ControlPage = 1;
+
+		static int s_Button2 = 0;
+		if(DoButton_MenuTab(&s_Button2, Localize("Move player to spectators"), s_ControlPage == 2, &TabBar, CUI::CORNER_BR))
+			s_ControlPage = 2;
 	}
-	
-	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);