r3195 - in trunk/data: gfx/menu/default gfx/menu/xaw qcsrc/menu-div0test qcsrc/menu-div0test/nexuiz

[DONOTREPLY at icculus.org]

Author: div0
Date: 2008-01-19 16:57:35 -0500 (Sat, 19 Jan 2008)
New Revision: 3195

Modified:
   trunk/data/gfx/menu/default/skinvalues.txt
   trunk/data/gfx/menu/xaw/skinvalues.txt
   trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
   trunk/data/qcsrc/menu-div0test/skin-customizables.inc
Log:
make positions of Nexposee windows skinnable; swap credits and quit in tab order to be more logical


Modified: trunk/data/gfx/menu/default/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/default/skinvalues.txt	2008-01-19 21:04:11 UTC (rev 3194)
+++ trunk/data/gfx/menu/default/skinvalues.txt	2008-01-19 21:57:35 UTC (rev 3195)
@@ -15,6 +15,14 @@
 COLOR_DIALOG_SINGLEPLAYER       '1 1 0.7'
 COLOR_DIALOG_CREDITS            '0.7 0.7 1'
 
+// nexposee positions of windows (they are the scale transformation
+// centers, NOT the actual positions of the windows!)
+POSITION_DIALOG_MULTIPLAYER     '0.9 0.5 0'
+POSITION_DIALOG_SINGLEPLAYER    '0.1 0.1 0'
+POSITION_DIALOG_SETTINGS        '0.1 0.9 0'
+POSITION_DIALOG_CREDITS         '0.3 1.2 0'
+POSITION_DIALOG_QUIT            '0.9 1.2 0'
+
 // mouse
 //   uses "cursor" images
 SIZE_CURSOR                     '32 32 0'

Modified: trunk/data/gfx/menu/xaw/skinvalues.txt
===================================================================
--- trunk/data/gfx/menu/xaw/skinvalues.txt	2008-01-19 21:04:11 UTC (rev 3194)
+++ trunk/data/gfx/menu/xaw/skinvalues.txt	2008-01-19 21:57:35 UTC (rev 3195)
@@ -15,6 +15,14 @@
 COLOR_DIALOG_SINGLEPLAYER       '1 1 1'
 COLOR_DIALOG_CREDITS            '1 1 1'
 
+// nexposee positions of windows (they are the scale transformation
+// centers, NOT the actual positions of the windows!)
+POSITION_DIALOG_MULTIPLAYER     '0.9 0.5 0'
+POSITION_DIALOG_SINGLEPLAYER    '0.1 0.1 0'
+POSITION_DIALOG_SETTINGS        '0.1 0.9 0'
+POSITION_DIALOG_CREDITS         '0.3 1.2 0'
+POSITION_DIALOG_QUIT            '0.9 1.2 0'
+
 // mouse
 //   uses cursor.tga
 SIZE_CURSOR                     '32 32 0'

Modified: trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c
===================================================================
--- trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c	2008-01-19 21:04:11 UTC (rev 3194)
+++ trunk/data/qcsrc/menu-div0test/nexuiz/mainwindow.c	2008-01-19 21:57:35 UTC (rev 3195)
@@ -56,28 +56,28 @@
 		i = spawnNexuizSingleplayerDialog();
 		i.configureDialog(i);
 		n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-		n.setNexposee(n, i, '0.1 0.1 0', SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
+		n.setNexposee(n, i, SKINPOSITION_DIALOG_SINGLEPLAYER, SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
 		
 		i = spawnNexuizSettingsDialog();
 		i.configureDialog(i);
 		n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-		n.setNexposee(n, i, '0.1 0.9 0', SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
+		n.setNexposee(n, i, SKINPOSITION_DIALOG_SETTINGS, SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
 
 		i = spawnNexuizMultiplayerDialog();
 		i.configureDialog(i);
 		n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-		n.setNexposee(n, i, '0.9 0.5 0', SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
+		n.setNexposee(n, i, SKINPOSITION_DIALOG_MULTIPLAYER, SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
 
-		i = spawnNexuizQuitDialog();
+		i = spawnNexuizCreditsDialog();
 		i.configureDialog(i);
 		n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-		n.setNexposee(n, i, '0.9 1.2 0', SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
+		n.setNexposee(n, i, SKINPOSITION_DIALOG_CREDITS, SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
 		n.pullNexposee(n, i, eY * (SKINHEIGHT_TITLE * SKINFONTSIZE_TITLE / conheight));
 
-		i = spawnNexuizCreditsDialog();
+		i = spawnNexuizQuitDialog();
 		i.configureDialog(i);
 		n.addItemCentered(n, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
-		n.setNexposee(n, i, '0.3 1.2 0', SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
+		n.setNexposee(n, i, SKINPOSITION_DIALOG_QUIT, SKINALPHAS_MAINMENU_x, SKINALPHAS_MAINMENU_y);
 		n.pullNexposee(n, i, eY * (SKINHEIGHT_TITLE * SKINFONTSIZE_TITLE / conheight));
 	me.addItem(me, n, '0 0 0', '1 1 0', SKINALPHAS_MAINMENU_z);
 	me.moveItemAfter(me, n, NULL);

Modified: trunk/data/qcsrc/menu-div0test/skin-customizables.inc
===================================================================
--- trunk/data/qcsrc/menu-div0test/skin-customizables.inc	2008-01-19 21:04:11 UTC (rev 3194)
+++ trunk/data/qcsrc/menu-div0test/skin-customizables.inc	2008-01-19 21:57:35 UTC (rev 3195)
@@ -47,6 +47,14 @@
 	SKINVECTOR(COLOR_DIALOG_SINGLEPLAYER, '1 1 0.7');
 	SKINVECTOR(COLOR_DIALOG_CREDITS, '0.7 0.7 1');
 
+	// nexposee positions of windows (they are the scale transformation
+	// centers, NOT the actual positions of the windows!)
+	SKINVECTOR(POSITION_DIALOG_MULTIPLAYER, '0.9 0.5 0');
+	SKINVECTOR(POSITION_DIALOG_SINGLEPLAYER, '0.1 0.1 0');
+	SKINVECTOR(POSITION_DIALOG_SETTINGS, '0.1 0.9 0');
+	SKINVECTOR(POSITION_DIALOG_CREDITS, '0.3 1.2 0');
+	SKINVECTOR(POSITION_DIALOG_QUIT, '0.9 1.2 0');
+
 	// mouse
 	SKINSTRING(GFX_CURSOR, "cursor");
 	SKINVECTOR(SIZE_CURSOR, '32 32 0');