X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fmenu%2Fxonotic%2Fdialog_settings_user.c;h=b3f888594eae083f767a4a36df28e50843bd0650;hb=81a2ea6d51caecebfd69945e447ab48c275a7c80;hp=9a1710a9f5bbe8635bcf665281dcd9cdafc621d8;hpb=1ecbcab6230a6b7b58eb1c5dfddb887b390c937e;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 9a1710a9f..b3f888594 100644
--- a/qcsrc/menu/xonotic/dialog_settings_user.c
+++ b/qcsrc/menu/xonotic/dialog_settings_user.c
@@ -3,8 +3,8 @@ 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, columns, float, 5)
+	ATTRIB(XonoticUserSettingsTab, rows, float, 14.5)
+	ATTRIB(XonoticUserSettingsTab, columns, float, 6)
 ENDCLASS(XonoticUserSettingsTab)
 entity makeXonoticUserSettingsTab();
 #endif
@@ -24,11 +24,13 @@ void XonoticUserSettingsTab_fill(entity me)
 	entity sk;
 
 	me.TR(me);
-		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Menu skins:")));
+		me.TDempty(me, 0.25);
+		me.TD(me, 1, 2.5, e = makeXonoticHeaderLabel(_("Menu Skins")));
 	me.TR(me);
-		me.TD(me, me.rows - 2, 2, sk = makeXonoticSkinList());
-	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, 2, e = makeXonoticButton(_("Set skin"), '0 0 0'));
+		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, 1, 2.5, e = makeXonoticButton(_("Set skin"), '0 0 0'));
 			e.onClick = SetSkin_Click;
 			e.onClickEntity = sk;
 
@@ -60,32 +62,35 @@ 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, 3.1); me.setFirstColumn(me, me.currentColumn);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Text language:")));
-	me.TR(me);
-		me.TD(me, 6, 1, sk = makeXonoticLanguageList());
-	me.TR(me);
-	me.TR(me);
-	me.TR(me);
-	me.TR(me);
-	me.TR(me);
+
+	me.gotoRC(me, 0, 3.75); me.setFirstColumn(me, me.currentColumn);
+		me.TD(me, 1, 1.5, e = makeXonoticHeaderLabel(_("Text Language")));
 	me.TR(me);
-		me.TD(me, 1, 1, e = makeXonoticButton(_("Set language"), '0 0 0'));
+		me.TD(me, 8, 1.5, sk = makeXonoticLanguageList());
+
+	me.gotoRC(me, 9, 3.75); me.setFirstColumn(me, me.currentColumn);
+		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.TR(me);
-		me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_allow_uidtracking", _("Allow player statistics to track your client")));
-	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 - 3, 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, 11.5, 3.25); me.setFirstColumn(me, me.currentColumn);
+		me.TD(me, 1, 2.5, 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"))); // 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));
 
 }
 #endif