r2930 - trunk/data/qcsrc/menu-div0test/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2007-11-09 17:02:58 -0500 (Fri, 09 Nov 2007)
New Revision: 2930

Modified:
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_join.c
   trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c
   trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c
Log:
make server list dialog larger


Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer.c	2007-11-09 16:38:17 UTC (rev 2929)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer.c	2007-11-09 22:02:58 UTC (rev 2930)
@@ -4,7 +4,7 @@
 	ATTRIB(NexuizMultiplayerDialog, title, string, "Multiplayer")
 	ATTRIB(NexuizMultiplayerDialog, color, vector, '0.5 0.5 1')
 	ATTRIB(NexuizMultiplayerDialog, intendedWidth, float, 0.96)
-	ATTRIB(NexuizMultiplayerDialog, rows, float, 17)
+	ATTRIB(NexuizMultiplayerDialog, rows, float, 24)
 	ATTRIB(NexuizMultiplayerDialog, columns, float, 6)
 ENDCLASS(NexuizMultiplayerDialog)
 #endif

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_join.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_join.c	2007-11-09 16:38:17 UTC (rev 2929)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_join.c	2007-11-09 22:02:58 UTC (rev 2930)
@@ -3,7 +3,7 @@
 	METHOD(NexuizServerListTab, fill, void(entity))
 	ATTRIB(NexuizServerListTab, title, string, "Settings")
 	ATTRIB(NexuizServerListTab, intendedWidth, float, 0.9)
-	ATTRIB(NexuizServerListTab, rows, float, 15)
+	ATTRIB(NexuizServerListTab, rows, float, 22)
 	ATTRIB(NexuizServerListTab, columns, float, 6.5)
 ENDCLASS(NexuizServerListTab)
 entity makeNexuizServerListTab();
@@ -43,10 +43,7 @@
 		me.TD(me, me.rows - 3, me.columns, slist);
 
 	me.gotoXY(me, me.rows - 1, 0);
-		me.TD(me, 1, 1, e = makeNexuizButton("Refresh!", '0 0 0'));
-			e.onClick = ServerList_Refresh_Click;
-			e.onClickEntity = slist;
-		me.TD(me, 1, me.columns - 1, e = makeNexuizButton("Join!", '0 0 0'));
+		me.TD(me, 1, me.columns, e = makeNexuizButton("Join!", '0 0 0'));
 			e.onClick = ServerList_Connect_Click;
 			e.onClickEntity = slist;
 			slist.connectButton = e;

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c	2007-11-09 16:38:17 UTC (rev 2929)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/dialog_multiplayer_playersetup.c	2007-11-09 22:02:58 UTC (rev 2930)
@@ -3,7 +3,7 @@
 	METHOD(NexuizPlayerSettingsTab, fill, void(entity))
 	ATTRIB(NexuizPlayerSettingsTab, title, string, "Settings")
 	ATTRIB(NexuizPlayerSettingsTab, intendedWidth, float, 0.9)
-	ATTRIB(NexuizPlayerSettingsTab, rows, float, 15)
+	ATTRIB(NexuizPlayerSettingsTab, rows, float, 22)
 	ATTRIB(NexuizPlayerSettingsTab, columns, float, 6.5)
 ENDCLASS(NexuizPlayerSettingsTab)
 entity makeNexuizPlayerSettingsTab();

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c	2007-11-09 16:38:17 UTC (rev 2929)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/serverlist.c	2007-11-09 22:02:58 UTC (rev 2930)
@@ -40,7 +40,6 @@
 ENDCLASS(NexuizServerList)
 entity makeNexuizServerList();
 void ServerList_Connect_Click(entity btn, entity me);
-void ServerList_Refresh_Click(entity btn, entity me);
 void ServerList_ShowEmpty_Click(entity box, entity me);
 void ServerList_ShowFull_Click(entity box, entity me);
 #endif
@@ -140,7 +139,7 @@
 		print("sorry, no refresh yet\n");
 		return;
 	}
-	me.nextRefreshTime = time + 60;
+	me.nextRefreshTime = time + 10;
 	me.refreshServerList(me, 1);
 }
 void drawNexuizServerList(entity me)
@@ -224,7 +223,6 @@
 		direction = -me.currentSortOrder;
 	me.currentSortOrder = direction;
 	me.currentSortField = field;
-	me.needsRefresh = 1;
 	me.sortButton1.forcePressed = (field == SLIST_FIELD_PING);
 	me.sortButton2.forcePressed = (field == SLIST_FIELD_NAME);
 	me.sortButton3.forcePressed = (field == SLIST_FIELD_MAP);
@@ -233,6 +231,7 @@
 	if(me.selectedServer)
 		strunzone(me.selectedServer);
 	me.selectedServer = string_null;
+	me.refreshServerList(me, 0);
 }
 void positionSortButtonNexuizServerList(entity me, entity btn, float theOrigin, float theSize, string theTitle, void(entity, entity) theFunc)
 {
@@ -283,10 +282,6 @@
 	if(me.nItems > 0)
 		localcmd("connect ", me.selectedServer, "\n");
 }
-void ServerList_Refresh_Click(entity btn, entity me)
-{
-	refreshhostcache();
-}
 void clickListBoxItemNexuizServerList(entity me, float i, vector where)
 {
 	if(i == me.lastClickedServer)