From 867f9444593f414e0d73b6e85f341f49b0b3aad5 Mon Sep 17 00:00:00 2001
From: oy <Tom_Adams@web.de>
Date: Mon, 28 Mar 2011 21:10:37 +0200
Subject: [PATCH] added graphic buttons for remove/add friend and chat
 ignore/notice

---
 data/gui_buttons.png                        | Bin 0 -> 13232 bytes
 datasrc/content.py                          |   9 ++++++
 src/game/client/components/menus.h          |   2 +-
 src/game/client/components/menus_demo.cpp   |  14 ++++-----
 src/game/client/components/menus_ingame.cpp |  33 +++++++++++++-------
 5 files changed, 39 insertions(+), 19 deletions(-)
 create mode 100644 data/gui_buttons.png

diff --git a/data/gui_buttons.png b/data/gui_buttons.png
new file mode 100644
index 0000000000000000000000000000000000000000..3593569f7dbb9ea14656350415791db1d4a2f485
GIT binary patch
literal 13232
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
CD^QC7

literal 0
HcmV?d00001

diff --git a/datasrc/content.py b/datasrc/content.py
index accc90107..712bba708 100644
--- a/datasrc/content.py
+++ b/datasrc/content.py
@@ -228,6 +228,7 @@ image_browseicons = Image("browseicons", "browse_icons.png")
 image_emoticons = Image("emoticons", "emoticons.png")
 image_demobuttons = Image("demobuttons", "demo_buttons.png")
 image_fileicons = Image("fileicons", "file_icons.png")
+image_guibuttons = Image("guibuttons", "gui_buttons.png")
 
 container.images.Add(image_null)
 container.images.Add(image_game)
@@ -240,6 +241,7 @@ container.images.Add(Image("console_bg", "console.png"))
 container.images.Add(Image("console_bar", "console_bar.png"))
 container.images.Add(image_demobuttons)
 container.images.Add(image_fileicons)
+container.images.Add(image_guibuttons)
 
 container.pickups.Add(Pickup("health"))
 container.pickups.Add(Pickup("armor"))
@@ -253,6 +255,7 @@ set_browseicons = SpriteSet("browseicons", image_browseicons, 4, 1)
 set_emoticons = SpriteSet("emoticons", image_emoticons, 4, 4)
 set_demobuttons = SpriteSet("demobuttons", image_demobuttons, 5, 1)
 set_fileicons = SpriteSet("fileicons", image_fileicons, 8, 1)
+set_guibuttons = SpriteSet("guibuttons", image_guibuttons, 16, 2)
 
 container.spritesets.Add(set_particles)
 container.spritesets.Add(set_game)
@@ -261,6 +264,7 @@ container.spritesets.Add(set_browseicons)
 container.spritesets.Add(set_emoticons)
 container.spritesets.Add(set_demobuttons)
 container.spritesets.Add(set_fileicons)
+container.spritesets.Add(set_guibuttons)
 
 container.sprites.Add(Sprite("part_slice", set_particles, 0,0,1,1))
 container.sprites.Add(Sprite("part_ball", set_particles, 1,0,1,1))
@@ -383,6 +387,11 @@ container.sprites.Add(Sprite("file_folder", set_fileicons, 2,0,1,1))
 container.sprites.Add(Sprite("file_map1", set_fileicons, 5,0,1,1))
 container.sprites.Add(Sprite("file_map2", set_fileicons, 6,0,1,1))
 
+container.sprites.Add(Sprite("guibutton_chatoff", set_guibuttons, 0,0,4,2))
+container.sprites.Add(Sprite("guibutton_chaton", set_guibuttons, 4,0,4,2))
+container.sprites.Add(Sprite("guibutton_friendadd", set_guibuttons, 8,0,4,2))
+container.sprites.Add(Sprite("guibutton_friendrem", set_guibuttons, 12,0,4,2))
+
 
 anim = Animation("base")
 anim.body.frames.Add(AnimKeyframe(0, 0, -4, 0))
diff --git a/src/game/client/components/menus.h b/src/game/client/components/menus.h
index f9a0fea18..6441573c2 100644
--- a/src/game/client/components/menus.h
+++ b/src/game/client/components/menus.h
@@ -38,7 +38,7 @@ class CMenus : public CComponent
 
 
 	int DoButton_DemoPlayer(const void *pID, const char *pText, int Checked, const CUIRect *pRect);
-	int DoButton_DemoPlayer_Sprite(const void *pID, int SpriteId, int Checked, const CUIRect *pRect);
+	int DoButton_Sprite(const void *pID, int ImageID, int SpriteID, int Checked, const CUIRect *pRect);
 	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);
diff --git a/src/game/client/components/menus_demo.cpp b/src/game/client/components/menus_demo.cpp
index 94b315d7a..3970590d4 100644
--- a/src/game/client/components/menus_demo.cpp
+++ b/src/game/client/components/menus_demo.cpp
@@ -26,10 +26,10 @@ int CMenus::DoButton_DemoPlayer(const void *pID, const char *pText, int Checked,
 	return UI()->DoButtonLogic(pID, pText, Checked, pRect);
 }
 
-int CMenus::DoButton_DemoPlayer_Sprite(const void *pID, int SpriteID, int Checked, const CUIRect *pRect)
+int CMenus::DoButton_Sprite(const void *pID, int ImageID, int SpriteID, int Checked, const CUIRect *pRect)
 {
 	RenderTools()->DrawUIRect(pRect, vec4(1,1,1, Checked ? 0.10f : 0.5f)*ButtonColorMul(pID), CUI::CORNER_ALL, 5.0f);
-	Graphics()->TextureSet(g_pData->m_aImages[IMAGE_DEMOBUTTONS].m_Id);
+	Graphics()->TextureSet(g_pData->m_aImages[ImageID].m_Id);
 	Graphics()->QuadsBegin();
 	RenderTools()->SelectSprite(SpriteID);
 	IGraphics::CQuadItem QuadItem(pRect->x, pRect->y, pRect->w, pRect->h);
@@ -147,12 +147,12 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 		static int s_PlayPauseButton = 0;
 		if(!pInfo->m_Paused)
 		{
-			if(DoButton_DemoPlayer_Sprite(&s_PlayPauseButton, SPRITE_DEMOBUTTON_PAUSE, pInfo->m_Paused, &Button))
+			if(DoButton_Sprite(&s_PlayPauseButton, IMAGE_DEMOBUTTONS, SPRITE_DEMOBUTTON_PAUSE, pInfo->m_Paused, &Button))
 				DemoPlayer()->Pause();
 		}
 		else
 		{
-			if(DoButton_DemoPlayer_Sprite(&s_PlayPauseButton, SPRITE_DEMOBUTTON_PLAY, !pInfo->m_Paused, &Button))
+			if(DoButton_Sprite(&s_PlayPauseButton, IMAGE_DEMOBUTTONS, SPRITE_DEMOBUTTON_PLAY, !pInfo->m_Paused, &Button))
 				DemoPlayer()->Unpause();
 		}
 		
@@ -161,7 +161,7 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 		ButtonBar.VSplitLeft(Margins, 0, &ButtonBar);
 		ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
 		static int s_ResetButton = 0;
-		if(DoButton_DemoPlayer_Sprite(&s_ResetButton, SPRITE_DEMOBUTTON_STOP, false, &Button))
+		if(DoButton_Sprite(&s_ResetButton, IMAGE_DEMOBUTTONS, SPRITE_DEMOBUTTON_STOP, false, &Button))
 		{
 			m_pClient->OnReset();
 			DemoPlayer()->Pause(); 
@@ -172,14 +172,14 @@ void CMenus::RenderDemoPlayer(CUIRect MainView)
 		ButtonBar.VSplitLeft(Margins, 0, &ButtonBar);
 		ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
 		static int s_SlowDownButton = 0;
-		if(DoButton_DemoPlayer_Sprite(&s_SlowDownButton, SPRITE_DEMOBUTTON_SLOWER, 0, &Button) || Input()->KeyPresses(KEY_MOUSE_WHEEL_DOWN))
+		if(DoButton_Sprite(&s_SlowDownButton, IMAGE_DEMOBUTTONS, SPRITE_DEMOBUTTON_SLOWER, 0, &Button) || Input()->KeyPresses(KEY_MOUSE_WHEEL_DOWN))
 			DecreaseDemoSpeed = true;
 		
 		// fastforward
 		ButtonBar.VSplitLeft(Margins, 0, &ButtonBar);
 		ButtonBar.VSplitLeft(ButtonbarHeight, &Button, &ButtonBar);
 		static int s_FastForwardButton = 0;
-		if(DoButton_DemoPlayer_Sprite(&s_FastForwardButton, SPRITE_DEMOBUTTON_FASTER, 0, &Button))
+		if(DoButton_Sprite(&s_FastForwardButton, IMAGE_DEMOBUTTONS, SPRITE_DEMOBUTTON_FASTER, 0, &Button))
 			IncreaseDemoSpeed = true;
 
 		// speed meter
diff --git a/src/game/client/components/menus_ingame.cpp b/src/game/client/components/menus_ingame.cpp
index 27c2875b7..007842f8a 100644
--- a/src/game/client/components/menus_ingame.cpp
+++ b/src/game/client/components/menus_ingame.cpp
@@ -121,11 +121,11 @@ void CMenus::RenderGame(CUIRect MainView)
 		if(!m_pClient->m_Snap.m_paPlayerInfos[i] || i == m_pClient->m_Snap.m_LocalClientID)
 			continue;
 
-		Options.HSplitTop(25.0f, &ButtonBar, &Options);
+		Options.HSplitTop(28.0f, &ButtonBar, &Options);
 		ButtonBar.VSplitRight(200.0f, &Player, &ButtonBar);
 
 		// player info
-		Player.VSplitLeft(25.0f, &Button, &Player);
+		Player.VSplitLeft(28.0f, &Button, &Player);
 		CTeeRenderInfo Info = m_pClient->m_aClients[i].m_RenderInfo;
 		Info.m_Size = Button.h;
 		RenderTools()->RenderTee(CAnimState::GetIdle(), &Info, EMOTE_NORMAL, vec2(1.0f, 0.0f), vec2(Button.x+Button.h/2, Button.y+Button.h/2));
@@ -142,19 +142,30 @@ void CMenus::RenderGame(CUIRect MainView)
 		TextRender()->TextEx(&Cursor, m_pClient->m_aClients[i].m_aClan, -1);
 
 		// ignore button
-		ButtonBar.VSplitMid(&Button, &ButtonBar);
-		Button.VSplitRight(10.0f, &Button, 0);
-		if(DoButton_CheckBox(&s_aPlayerIDs[i][0], Localize("Ignore"), m_pClient->m_aClients[i].m_ChatIgnore, &Button))
-			m_pClient->m_aClients[i].m_ChatIgnore ^= 1;
+		ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
+		ButtonBar.VSplitLeft(ButtonBar.h*2.0f, &Button, &ButtonBar);
+		if(m_pClient->m_aClients[i].m_ChatIgnore)
+		{
+			if(DoButton_Sprite(&s_aPlayerIDs[i][0], IMAGE_GUIBUTTONS, SPRITE_GUIBUTTON_CHATON, m_pClient->m_aClients[i].m_ChatIgnore, &Button))
+				m_pClient->m_aClients[i].m_ChatIgnore = 0;
+		}
+		else
+		{
+			if(DoButton_Sprite(&s_aPlayerIDs[i][0], IMAGE_GUIBUTTONS, SPRITE_GUIBUTTON_CHATOFF, !m_pClient->m_aClients[i].m_ChatIgnore, &Button))
+				m_pClient->m_aClients[i].m_ChatIgnore = 1;
+		}
 
 		// friend button
-		ButtonBar.VSplitMid(&Button, &ButtonBar);
-		Button.VSplitLeft(10.0f, 0, &Button);
-		if(DoButton_CheckBox(&s_aPlayerIDs[i][1], Localize("Friend"), m_pClient->m_aClients[i].m_Friend, &Button))
+		ButtonBar.VSplitLeft(10.0f, 0, &ButtonBar);
+		ButtonBar.VSplitLeft(ButtonBar.h*2.0f, &Button, &ButtonBar);
+		if(m_pClient->m_aClients[i].m_Friend)
 		{
-			if(m_pClient->m_aClients[i].m_Friend)
+			if(DoButton_Sprite(&s_aPlayerIDs[i][1], IMAGE_GUIBUTTONS, SPRITE_GUIBUTTON_FRIENDREM, m_pClient->m_aClients[i].m_Friend, &Button))
 				m_pClient->Friends()->RemoveFriend(m_pClient->m_aClients[i].m_aName, m_pClient->m_aClients[i].m_aClan);
-			else
+		}
+		else
+		{
+			if(DoButton_Sprite(&s_aPlayerIDs[i][1], IMAGE_GUIBUTTONS, SPRITE_GUIBUTTON_FRIENDADD, !m_pClient->m_aClients[i].m_Friend, &Button))
 				m_pClient->Friends()->AddFriend(m_pClient->m_aClients[i].m_aName, m_pClient->m_aClients[i].m_aClan);
 		}
 	}