r5046 - trunk/data/qcsrc/menu/nexuiz

[DONOTREPLY at icculus.org]

Author: esteel
Date: 2008-11-12 16:07:57 -0500 (Wed, 12 Nov 2008)
New Revision: 5046

Modified:
   trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c
   trunk/data/qcsrc/menu/nexuiz/serverlist.c
Log:
added info button to the join menu, removed some trailing whitespace too


Modified: trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c	2008-11-12 20:39:34 UTC (rev 5045)
+++ trunk/data/qcsrc/menu/nexuiz/dialog_multiplayer_join.c	2008-11-12 21:07:57 UTC (rev 5046)
@@ -62,11 +62,13 @@
 			e.onClick = ServerList_Favorite_Click;
 			e.onClickEntity = slist;
 			slist.favoriteButton = e;
-		me.TD(me, 1, me.columns - 0.6 - 1.5 - 1, e = makeNexuizButton("Join!", '0 0 0'));
+		me.TD(me, 1, 1, e = makeNexuizButton("Info", '0 0 0'));
+			e.onClick = ServerList_Info_Click;
+			e.onClickEntity = slist;
+			slist.infoButton = e;
+		me.TD(me, 1, me.columns - 0.6 - 1.5 - 1 - 1, e = makeNexuizButton("Join!", '0 0 0'));
 			e.onClick = ServerList_Connect_Click;
 			e.onClickEntity = slist;
 			slist.connectButton = e;
 }
 #endif
-
-

Modified: trunk/data/qcsrc/menu/nexuiz/serverlist.c
===================================================================
--- trunk/data/qcsrc/menu/nexuiz/serverlist.c	2008-11-12 20:39:34 UTC (rev 5045)
+++ trunk/data/qcsrc/menu/nexuiz/serverlist.c	2008-11-12 21:07:57 UTC (rev 5046)
@@ -41,6 +41,7 @@
 	ATTRIB(NexuizServerList, sortButton4, entity, NULL)
 	ATTRIB(NexuizServerList, sortButton5, entity, NULL)
 	ATTRIB(NexuizServerList, connectButton, entity, NULL)
+	ATTRIB(NexuizServerList, infoButton, entity, NULL)
 	ATTRIB(NexuizServerList, currentSortOrder, float, 0)
 	ATTRIB(NexuizServerList, currentSortField, float, -1)
 	ATTRIB(NexuizServerList, lastClickedServer, float, -1)
@@ -52,6 +53,7 @@
 void ServerList_ShowFull_Click(entity box, entity me);
 void ServerList_Filter_Change(entity box, entity me);
 void ServerList_Favorite_Click(entity btn, entity me);
+void ServerList_Info_Click(entity btn, entity me);
 #endif
 
 #ifdef IMPLEMENTATION
@@ -243,6 +245,7 @@
 	me.nItems = gethostcachevalue(SLIST_HOSTCACHEVIEWCOUNT);
 
 	me.connectButton.disabled = ((me.nItems == 0) && (me.ipAddressBox.text == ""));
+	me.infoButton.disabled = ((me.nItems == 0) || !owned);
 
 	found = 0;
 	if(me.selectedServer)
@@ -458,6 +461,11 @@
 		ToggleFavorite(ipstr);
 	}
 }
+void ServerList_Info_Click(entity btn, entity me)
+{
+	main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
+	DialogOpenButton_Click(me, main.serverInfoDialog);
+}
 void clickListBoxItemNexuizServerList(entity me, float i, vector where)
 {
 	if(i == me.lastClickedServer)
@@ -486,7 +494,7 @@
 		theAlpha = SKINALPHA_SERVERLIST_EMPTY;
 	else
 		theAlpha = 1;
-	
+
 	p = gethostcachenumber(SLIST_FIELD_PING, i);
 #define PING_LOW 75
 #define PING_MED 200
@@ -544,7 +552,7 @@
 		return 1;
 	}
 	else if(scan == K_MOUSE2 || scan == K_SPACE)
-	{	
+	{
 		main.serverInfoDialog.loadServerInfo(main.serverInfoDialog, me.selectedItem);
 		DialogOpenButton_Click_withCoords(me, main.serverInfoDialog, org, sz);
 	}