From: terencehill <piuntn@gmail.com>
Date: Wed, 9 Dec 2015 00:05:23 +0000 (+0100)
Subject: Add back a few Apply buttons and update/fix their commands
X-Git-Tag: xonotic-v0.8.2~1285^2~4
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=c1594a871b7f3d2a0c7318b1d40cb869f7115e99;p=xonotic%2Fxonotic-data.pk3dir.git

Add back a few Apply buttons and update/fix their commands
---

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
index 449a35e80..12adbfc2a 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
@@ -161,6 +161,6 @@ void XonoticProfileTab_fill(entity me)
 	#endif
 
 	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_autoswitch;sendcvar cl_forceplayermodels;sendcvar cl_forceplayermodelsfromxonotic;playermodel $_cl_playermodel;playerskin $_cl_playerskin", COMMANDBUTTON_APPLY));
+		me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "color -1 -1;name \"$_cl_name\";playermodel $_cl_playermodel;playerskin $_cl_playerskin; sendcvar cl_allow_uidtracking; sendcvar cl_allow_uid2name;", COMMANDBUTTON_APPLY));
 }
 #endif
diff --git a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
index ec52b5e4d..5b20e3842 100644
--- a/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.qc
@@ -37,8 +37,8 @@ void XonoticGameWeaponsSettingsTab_fill(entity me)
 		me.TD(me, 1, 2.5, e = makeXonoticHeaderLabel(_("Weapon Priority List (* = mutator weapon)")));
 	me.TR(me);
 		me.TDempty(me, 0.25);
-		me.TD(me, 10, 2.5, e = me.weaponsList = makeXonoticWeaponsList());
-	me.gotoRC(me, 11, 0.25);
+		me.TD(me, 9, 2.5, e = me.weaponsList = makeXonoticWeaponsList());
+	me.gotoRC(me, 10, 0.25);
 		me.TD(me, 1, 1.25, e = makeXonoticButton(_("Up"), '0 0 0'));
 			e.onClick = WeaponsList_MoveUp_Click;
 			e.onClickEntity = me.weaponsList;
@@ -82,5 +82,8 @@ void XonoticGameWeaponsSettingsTab_fill(entity me)
 		me.TDempty(me, 0.2);
 		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_bobmodel", _("Gun model bobbing")));
 		setDependent(e, "r_drawviewmodel", 1, 1);
+	me.gotoRC(me, me.rows - 1, 0); me.setFirstColumn(me, me.currentColumn);
+		me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0',
+			"sendcvar cl_autoswitch; sendcvar cl_weaponpriority; sendcvar cl_weaponimpulsemode", COMMANDBUTTON_APPLY));
 }
 #endif
diff --git a/qcsrc/menu/xonotic/dialog_settings_user.qc b/qcsrc/menu/xonotic/dialog_settings_user.qc
index 062d538bb..93002ba02 100644
--- a/qcsrc/menu/xonotic/dialog_settings_user.qc
+++ b/qcsrc/menu/xonotic/dialog_settings_user.qc
@@ -29,8 +29,8 @@ void XonoticUserSettingsTab_fill(entity me)
 		me.TD(me, 1, 2.5, e = makeXonoticHeaderLabel(_("Menu Skins")));
 	me.TR(me);
 		me.TDempty(me, 0.25);
-		me.TD(me, me.rows - 2.5, 2.5, sk = makeXonoticSkinList());
-	me.gotoRC(me, me.rows - 1.5, 0.25);
+		me.TD(me, me.rows - 3.5, 2.5, sk = makeXonoticSkinList());
+	me.gotoRC(me, me.rows - 2.5, 0.25);
 		me.TD(me, 1, 2.5, e = makeXonoticButton(_("Set skin"), '0 0 0'));
 			e.onClick = SetSkin_Click;
 			e.onClickEntity = sk;
@@ -78,21 +78,8 @@ void XonoticUserSettingsTab_fill(entity me)
 		me.TD(me, 1, 2.5, e = makeXonoticCheckBox_T(0, "cl_gentle", _("Disable gore effects and harsh language"),
 			_("Replace blood and gibs with content that does not have any gore effects (default: disabled)")));
 
-	//me.TR(me);
-	//	me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Menu tooltips:")));
-	//	me.TD(me, 1, 2, e = makeXonoticTextSlider("menu_tooltips"));
-	//		e.addValue(e, ZCTX(_("TLTIP^Disabled")), "0");
-	//		e.addValue(e, ZCTX(_("TLTIP^Standard")), "1");
-	//		e.addValue(e, ZCTX(_("TLTIP^Advanced")), "2");
-	//		e.configureXonoticTextSliderValues(e);
-	//me.TR(me);
-	//	me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_allow_uidtracking", _("Allow player statistics to track your client"))); // TODO: move to profile tab
-	//me.TR(me);
-	//	me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_allow_uid2name", _("Allow player statistics to use your nickname")));
-	//	setDependent(e, "cl_allow_uidtracking", 1, 1);
-
-	//me.gotoRC(me, me.rows - 1, 2.6);
-	//	me.TD(me, 1, 2, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "sendcvar cl_gentle; sendcvar cl_allow_uidtracking; sendcvar cl_allow_uid2name;", COMMANDBUTTON_APPLY));
+	me.gotoRC(me, me.rows - 1, 0);
+		me.TD(me, 1, 6, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "sendcvar cl_gentle;", COMMANDBUTTON_APPLY));
 
 }
 #endif