From: terencehill <piuntn@gmail.com>
Date: Wed, 2 Feb 2011 23:22:55 +0000 (+0100)
Subject: Merge branch 'master' into terencehill/screenshot_viewer
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~50
X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=commitdiff_plain;h=8d484c93801393279f8956b7d8806d78b50f6de9

Merge branch 'master' into terencehill/screenshot_viewer

Conflicts:
	qcsrc/menu/xonotic/dialog_multiplayer.c
	qcsrc/menu/xonotic/mainwindow.c
---

8d484c93801393279f8956b7d8806d78b50f6de9
diff --cc gfx/menu/default/skinvalues.txt
index de81ef878c,b2b0a97008..9226848bfc
--- a/gfx/menu/default/skinvalues.txt
+++ b/gfx/menu/default/skinvalues.txt
@@@ -174,10 -174,9 +174,10 @@@ COLOR_DIALOG_USERBIND           '1 1 1
  COLOR_DIALOG_SINGLEPLAYER       '1 1 1'
  COLOR_DIALOG_CREDITS            '1 1 1'
  COLOR_DIALOG_WEAPONS            '1 1 1'
- COLOR_DIALOG_RADAR              '1 1 1'
+ COLOR_DIALOG_WAYPOINTS          '1 1 1'
  COLOR_DIALOG_SERVERINFO         '1 1 1'
  COLOR_DIALOG_CVARS              '1 0 0'
 +COLOR_DIALOG_SCREENSHOTVIEWER   '1 1 1'
  
  // item: input box
  //   uses "inputbox" images
diff --cc gfx/menu/xaw/skinvalues.txt
index b34f88c8a0,eae123ce79..a15696a6d8
--- a/gfx/menu/xaw/skinvalues.txt
+++ b/gfx/menu/xaw/skinvalues.txt
@@@ -29,10 -29,9 +29,10 @@@ COLOR_DIALOG_USERBIND           '1 1 1
  COLOR_DIALOG_SINGLEPLAYER       '1 1 1'
  COLOR_DIALOG_CREDITS            '1 1 1'
  COLOR_DIALOG_WEAPONS            '1 1 1'
- COLOR_DIALOG_RADAR              '1 1 1'
+ COLOR_DIALOG_WAYPOINTS          '1 1 1'
  COLOR_DIALOG_SERVERINFO         '1 1 1'
  COLOR_DIALOG_CVARS              '1 0 0'
 +COLOR_DIALOG_SCREENSHOTVIEWER   '1 1 1'
  
  // nexposee positions of windows (they are the scale transformation
  // centers, NOT the actual positions of the windows!)
diff --cc qcsrc/menu/skin-customizables.inc
index 5270cb6722,ca8f4cf8e9..3997048157
--- a/qcsrc/menu/skin-customizables.inc
+++ b/qcsrc/menu/skin-customizables.inc
@@@ -62,10 -63,9 +63,10 @@@ SKINBEGI
  	SKINVECTOR(COLOR_DIALOG_SINGLEPLAYER, '1 1 0.7');
  	SKINVECTOR(COLOR_DIALOG_CREDITS, '0.7 0.7 1');
  	SKINVECTOR(COLOR_DIALOG_WEAPONS, '1 0.7 0.7');
- 	SKINVECTOR(COLOR_DIALOG_RADAR, '0.7 0.7 1');
+ 	SKINVECTOR(COLOR_DIALOG_WAYPOINTS, '0.7 0.7 1');
  	SKINVECTOR(COLOR_DIALOG_SERVERINFO, '0.7 0.7 1');
  	SKINVECTOR(COLOR_DIALOG_CVARS, '1 0 0');
 +	SKINVECTOR(COLOR_DIALOG_SCREENSHOTVIEWER, '0.7 0.7 1');
  
  	// nexposee positions of windows (they are the scale transformation
  	// centers, NOT the actual positions of the windows!)
diff --cc qcsrc/menu/xonotic/dialog_multiplayer.c
index a31683e39a,2492581d06..878c5e2a0f
--- a/qcsrc/menu/xonotic/dialog_multiplayer.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer.c
@@@ -15,15 -15,10 +15,11 @@@ void XonoticMultiplayerDialog_fill(enti
  	entity mc, e;
  	mc = makeXonoticTabController(me.rows - 2);
  	me.TR(me);
- 		me.TD(me, 1, 1, e = mc.makeTabButton(mc, "Servers",  makeXonoticServerListTab()));
- 			setDependentStringNotEqual(e, "_cl_name", "Player");
- 		me.TD(me, 1, 1, e = mc.makeTabButton(mc, "Create",  makeXonoticServerCreateTab()));
- 			setDependentStringNotEqual(e, "_cl_name", "Player");
- 		me.TD(me, 1, 1, mc.makeTabButton(mc, "Demos",   makeXonoticDemoBrowserTab()));
- 		me.TD(me, 1, 1, mc.makeTabButton(mc, "Screenshots",   makeXonoticScreenshotBrowserTab()));
- 		me.TD(me, 1, 1, e = mc.makeTabButton(mc, "Player Setup",  makeXonoticPlayerSettingsTab()));
- 			if(cvar_string("_cl_name") == "Player")
- 				e.onClick(e, e.onClickEntity); // lol animation
+ 		me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Servers"),  makeXonoticServerListTab()));
+ 		me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Create"),  makeXonoticServerCreateTab()));
+ 		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Demos"),   makeXonoticDemoBrowserTab()));
++		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Screenshots"),   makeXonoticScreenshotBrowserTab()));
+ 		me.TD(me, 1, 1, e = mc.makeTabButton(mc, _("Player Setup"),  makeXonoticPlayerSettingsTab()));
  
  	me.TR(me);
  	me.TR(me);
diff --cc qcsrc/menu/xonotic/mainwindow.c
index 55a5a07890,bd15150a8c..314d192bb9
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@@ -11,8 -12,9 +12,10 @@@ CLASS(MainWindow) EXTENDS(ModalControll
  	ATTRIB(MainWindow, waypointDialog, entity, NULL)
  	ATTRIB(MainWindow, serverInfoDialog, entity, NULL)
  	ATTRIB(MainWindow, cvarsDialog, entity, NULL)
++	ATTRIB(MainWindow, screenshotViewerDialog, entity, NULL)
  	ATTRIB(MainWindow, mainNexposee, entity, NULL)
  	ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND)
+ 	ATTRIB(MainWindow, dialogToShow, entity, NULL)
  ENDCLASS(MainWindow)
  #endif