From: Samual <samual@xonotic.org>
Date: Tue, 17 Jan 2012 09:13:01 +0000 (-0500)
Subject: Next comes font selection list...
X-Git-Tag: xonotic-v0.6.0~142
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8ca663a207f1bf65bee13bb39ba238f15f7309d2;p=xonotic%2Fxonotic-data.pk3dir.git

Next comes font selection list...
---

diff --git a/qcsrc/menu/xonotic/dialog_settings_user.c b/qcsrc/menu/xonotic/dialog_settings_user.c
index be6da7a3f..e482b5033 100644
--- a/qcsrc/menu/xonotic/dialog_settings_user.c
+++ b/qcsrc/menu/xonotic/dialog_settings_user.c
@@ -32,7 +32,7 @@ void XonoticUserSettingsTab_fill(entity me)
 			e.onClick = SetSkin_Click;
 			e.onClickEntity = sk;
 
-	me.gotoRC(me, 0, 2.4); me.setFirstColumn(me, me.currentColumn);
+	me.gotoRC(me, 0, 2.2); 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());
@@ -46,8 +46,19 @@ void XonoticUserSettingsTab_fill(entity me)
 			e.onClick = SetLanguage_Click;
 			e.onClickEntity = sk;
 
-	me.gotoRC(me, 0, 3.6); me.setFirstColumn(me, me.currentColumn);
-		me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Font:")));
+	me.gotoRC(me, 0, 3.3); me.setFirstColumn(me, me.currentColumn);
+		me.TD(me, 1, 1.5, e = makeXonoticTextLabel(0, _("Font:")));
+	me.TR(me);
+		me.TD(me, 2, 1.5, sk = makeXonoticLanguageList());
+	me.TR(me);
+	me.TR(me);
+	me.TR(me);
+	me.TR(me);
+	me.TR(me);
+	me.TR(me);
+		me.TD(me, 1, 1.5, e = makeXonoticButton(_("Set font"), '0 0 0'));
+			e.onClick = SetLanguage_Click;
+			e.onClickEntity = sk;
 		
 	me.gotoRC(me, 7, 2.2); me.setFirstColumn(me, me.currentColumn);
 	if(cvar("developer"))