X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_game.c;h=2f48c2a500a34cc218c450df3cfd11b699c227f6;hp=c026fb08ba02c51cdd95dcbac1a8589d84fd9023;hb=121eb6e110924d6b9d95e1b353050d92c70bd0d6;hpb=2c78d2ff9590bbf5031ccc75a61619f033573868

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.c b/qcsrc/menu/xonotic/dialog_settings_game.c
index c026fb08b..2f48c2a50 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game.c
+++ b/qcsrc/menu/xonotic/dialog_settings_game.c
@@ -3,8 +3,8 @@ CLASS(XonoticGameSettingsTab) EXTENDS(XonoticTab)
 	METHOD(XonoticGameSettingsTab, fill, void(entity))
 	ATTRIB(XonoticGameSettingsTab, title, string, _("Game"))
 	ATTRIB(XonoticGameSettingsTab, intendedWidth, float, 0.9)
-	ATTRIB(XonoticGameSettingsTab, rows, float, 17)
-	ATTRIB(XonoticGameSettingsTab, columns, float, 6)
+	ATTRIB(XonoticGameSettingsTab, rows, float, 15.5)
+	ATTRIB(XonoticGameSettingsTab, columns, float, 6.5)
 ENDCLASS(XonoticGameSettingsTab)
 entity makeXonoticGameSettingsTab();
 #endif
@@ -20,60 +20,35 @@ entity makeXonoticGameSettingsTab()
 
 void XonoticGameSettingsTab_fill(entity me)
 {
-	entity e;
-
-
+	entity mc;
+	mc = makeXonoticTabController(me.rows - 2.5);
+	
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_gentle", _("Disable gore effects and harsh language"))); // also set sv_gentle
+		me.TDempty(me, 0.25);
+		me.TD(me, 1, 1, mc.makeTabButton(mc, _("View"),           makeXonoticGameViewSettingsTab()));
+		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Crosshair"),      makeXonoticGameCrosshairSettingsTab()));
+		me.TD(me, 1, 1, mc.makeTabButton(mc, _("HUD"),            makeXonoticGameHUDSettingsTab()));
+		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Messages"),       makeXonoticGameMessageSettingsTab()));
+		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Weapons"),        makeXonoticGameWeaponsSettingsTab()));
+		me.TD(me, 1, 1, mc.makeTabButton(mc, _("Models"),         makeXonoticGameModelSettingsTab()));
+
+	me.gotoRC(me, 1.5, 0);
+		me.TD(me, me.rows - 1.5, me.columns, mc);
 		
-	me.gotoRC(me, 2, 3); me.setFirstColumn(me, me.currentColumn);
-		me.TDempty(me, 0.5);
-		me.TD(me, 1, 2, e = makeXonoticButton(_("Crosshair"), '0 0 0'));
-			e.onClick = DialogOpenButton_Click;
-			e.onClickEntity = main.crosshairDialog;
-		setDependent(e, "crosshair_enabled", 1, 2);
-		// TODO: show status of crosshair dot and hittest and pickups and such here with text
-	me.TR(me);
-		me.TDempty(me, 0.5);
-		me.TD(me, 1, 2, e = makeXonoticButton(_("HUD"), '0 0 0'));
-			e.onClick = DialogOpenButton_Click;
-			e.onClickEntity = main.hudDialog;
-		// TODO: show hud config name with text here 
-	me.TR(me);
-		me.TDempty(me, 0.5);
-		me.TD(me, 1, 2, e = makeXonoticButton(_("Notification"), '0 0 0'));
-			e.onClick = DialogOpenButton_Click;
-			e.onClickEntity = main.notificationDialog;
-		// TODO: Show all the notification stuff here
-	me.TR(me);
-		me.TDempty(me, 0.5);
-		me.TD(me, 1, 2, e = makeXonoticButton(_("Playermodel"), '0 0 0'));
-			e.onClick = DialogOpenButton_Click;
-			e.onClickEntity = main.modelDialog;
-		// TODO: show csqc model settings like forcemyplayer and deglowing/ghosting bodies with text here
-	me.TR(me);
-		me.TDempty(me, 0.5);
-		me.TD(me, 1, 2, e = makeXonoticButton(_("View"), '0 0 0'));
-			e.onClick = DialogOpenButton_Click;
-			e.onClickEntity = main.viewDialog;
-		// TODO: show fov and other settings with text here
-	me.TR(me);
-		me.TDempty(me, 0.5);
-		me.TD(me, 1, 2, e = makeXonoticButton(_("Weapon"), '0 0 0'));
-			e.onClick = DialogOpenButton_Click;
-			e.onClickEntity = main.weaponsDialog;
-		// I don't really think this is useful as is, and especially it doesn't look very clean...
-		// In the future, if ALL of these buttons had some information, then it would be justified/clean
-		//me.TD(me, 1, 1, e0 = makeXonoticTextLabel(0, string_null)); 
-		//	e0.textEntity = main.weaponsDialog;
-		//	e0.allowCut = 1;
-
-	//me.gotoRC(me, me.rows - 1, 0);
-	//	me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "color -1 -1;name \"$_cl_name\";sendcvar cl_weaponpriority;sendcvar cl_autoswitch;sendcvar cl_forceplayermodels;sendcvar cl_forceplayermodelsfromxonotic;playermodel $_cl_playermodel;playerskin $_cl_playerskin", COMMANDBUTTON_APPLY));
+	/*
 
+	  makeXonoticGameViewSettingsTab()));
+	  makeXonoticGameGeneralSettingsTab()));
+	makeXonoticGameCrosshairSettingsTab()));
+	
+	       makeXonoticGameWeaponSettingsTab()));
+	l"),   makeXonoticGamePlayermodelSettingsTab()));
+	       makeXonoticGameHUDSettingsTab()));
+	on"),  makeXonoticGameNotificationSettingsTab()));
 
 
-	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "sendcvar cl_gentle; sendcvar cl_allow_uidtracking; sendcvar cl_allow_uid2name;", COMMANDBUTTON_APPLY));
+	me.TR(me);
+		me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_gentle", _("Disable gore effects and harsh language"))); // also set sv_gentle
+	*/
 }
 #endif