X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_user.c;h=c8dc2c175c246ce599590aa134aa138f22c0fd24;hb=d5d861641b0c708c3e148a601af553eef82ff9eb;hp=fbd9ecf4ab81c027337a639a63471a73542d38cc;hpb=f8d89c06e0b40ce3d7ec536868d24059f0505096;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/menu/xonotic/dialog_settings_user.c b/qcsrc/menu/xonotic/dialog_settings_user.c
index fbd9ecf4a..c8dc2c175 100644
--- a/qcsrc/menu/xonotic/dialog_settings_user.c
+++ b/qcsrc/menu/xonotic/dialog_settings_user.c
@@ -3,7 +3,7 @@ CLASS(XonoticUserSettingsTab) EXTENDS(XonoticTab)
 	METHOD(XonoticUserSettingsTab, fill, void(entity))
 	ATTRIB(XonoticUserSettingsTab, title, string, _("User"))
 	ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9)
-	ATTRIB(XonoticUserSettingsTab, rows, float, 17)
+	ATTRIB(XonoticUserSettingsTab, rows, float, 14.5)
 	ATTRIB(XonoticUserSettingsTab, columns, float, 5)
 ENDCLASS(XonoticUserSettingsTab)
 entity makeXonoticUserSettingsTab();
@@ -24,10 +24,12 @@ void XonoticUserSettingsTab_fill(entity me)
 	entity sk;
 
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Menu skins:")));
+		me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Menu Skins")));
+			e.isBold = TRUE;
+			e.alpha = 0.5;
 	me.TR(me);
-		me.TD(me, me.rows - 2, 2, sk = makeXonoticSkinList());
-	me.gotoRC(me, me.rows - 1, 0);
+		me.TD(me, me.rows - 2.5, 2, sk = makeXonoticSkinList());
+	me.gotoRC(me, me.rows - 1.5, 0);
 		me.TD(me, 1, 2, e = makeXonoticButton(_("Set skin"), '0 0 0'));
 			e.onClick = SetSkin_Click;
 			e.onClickEntity = sk;
@@ -60,9 +62,11 @@ void XonoticUserSettingsTab_fill(entity me)
 		me.TD(me, 1, 1.5, e = makeXonoticButton(_("Set font"), '0 0 0'));
 			e.onClick = SetLanguage_Click;
 			e.onClickEntity = sk;*/
-			
+
 	me.gotoRC(me, 0, 2.85); me.setFirstColumn(me, me.currentColumn);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Text language:")));
+		me.TD(me, 1, 1.5, e = makeXonoticTextLabel(0.5, _("Text Language")));
+			e.isBold = TRUE;
+			e.alpha = 0.5;
 	me.TR(me);
 		me.TD(me, 6, 1.5, sk = makeXonoticLanguageList());
 	me.TR(me);
@@ -74,17 +78,23 @@ void XonoticUserSettingsTab_fill(entity me)
 		me.TD(me, 1, 1.5, e = makeXonoticButton(_("Set language"), '0 0 0'));
 			e.onClick = SetLanguage_Click;
 			e.onClickEntity = sk;
-		
+
 	me.gotoRC(me, 9, 2.2); me.setFirstColumn(me, me.currentColumn);
 		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_gentle", _("Disable gore effects and harsh language")));
 	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")));
+		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 - 2, 2.6);
+
+	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));
 
 }