From: Samual <samual@xonotic.org>
Date: Fri, 13 Jan 2012 05:01:59 +0000 (-0500)
Subject: Re-write firstrun "welcome" dialog, plus a fix for my singleplayer menu
X-Git-Tag: xonotic-v0.6.0~184
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=cf2330d82aea158124e105b42f567853c695c8b1;p=xonotic%2Fxonotic-data.pk3dir.git

Re-write firstrun "welcome" dialog, plus a fix for my singleplayer menu
---

diff --git a/qcsrc/menu/xonotic/dialog_firstrun.c b/qcsrc/menu/xonotic/dialog_firstrun.c
index 6568a7198..dc917d84a 100644
--- a/qcsrc/menu/xonotic/dialog_firstrun.c
+++ b/qcsrc/menu/xonotic/dialog_firstrun.c
@@ -3,9 +3,9 @@ CLASS(XonoticFirstRunDialog) EXTENDS(XonoticRootDialog)
 	METHOD(XonoticFirstRunDialog, fill, void(entity)) // to be overridden by user to fill the dialog with controls
 	ATTRIB(XonoticFirstRunDialog, title, string, _("Welcome"))
 	ATTRIB(XonoticFirstRunDialog, color, vector, SKINCOLOR_DIALOG_FIRSTRUN)
-	ATTRIB(XonoticFirstRunDialog, intendedWidth, float, 0.6)
-	ATTRIB(XonoticFirstRunDialog, rows, float, 15)
-	ATTRIB(XonoticFirstRunDialog, columns, float, 3)
+	ATTRIB(XonoticFirstRunDialog, intendedWidth, float, 0.7)
+	ATTRIB(XonoticFirstRunDialog, rows, float, 16)
+	ATTRIB(XonoticFirstRunDialog, columns, float, 6)
 	ATTRIB(XonoticFirstRunDialog, name, string, "FirstRun")
 	ATTRIB(XonoticFirstRunDialog, playerNameLabel, entity, NULL)
 	ATTRIB(XonoticFirstRunDialog, playerNameLabelAlpha, float, 0)
@@ -30,43 +30,56 @@ void XonoticFirstRunDialog_fill(entity me)
 	entity label, box;
 
 	me.TR(me);
-		me.TD(me, 2, 3, e = makeXonoticTextLabel(0, _("Welcome to Xonotic, please select your language preference and enter your player name to get started.  You can change these options later through the menu system.")));
+	me.TR(me);
+		me.TDempty(me, 1);
+		me.TD(me, 2, 4, e = makeXonoticTextLabel(0, _("Welcome to Xonotic, please select your language preference and enter your player name to get started.  You can change these options later through the menu system.")));
 		e.allowWrap = 1;
 	me.TR(me);
 
 	me.TR(me);
-		me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Text language:")));
-	me.TR(me);
-		me.TD(me, 3, 3, e = makeXonoticLanguageList());
-			e.name = "languageselector_firstrun";
-			e.doubleClickCommand = "saveconfig; menu_restart; togglemenu";
-	me.TR(me);
-	me.TR(me);
-
 	me.TR(me);
 		me.TD(me, 1, 0.5, me.playerNameLabel = makeXonoticTextLabel(0, _("Name:")));
 			me.playerNameLabelAlpha = me.playerNameLabel.alpha;
-		me.TD(me, 1, 2.5, label = makeXonoticTextLabel(0, string_null));
+		me.TD(me, 1, 3.25, label = makeXonoticTextLabel(0, string_null));
 			label.allowCut = 1;
 			label.allowColors = 1;
 			label.alpha = 1;
 	me.TR(me);
-		me.TD(me, 1, 3.0, box = makeXonoticInputBox(1, "_cl_name"));
+		me.TD(me, 1, 3.75, box = makeXonoticInputBox(1, "_cl_name"));
 			box.forbiddenCharacters = "\r\n\\\"$"; // don't care, isn't getting saved
 			box.maxLength = -127; // negative means encoded length in bytes
 			box.saveImmediately = 1;
 			label.textEntity = box;
 	me.TR(me);
-		me.TD(me, 5, 1, e = makeXonoticColorpicker(box));
-		me.TD(me, 5, 2, e = makeXonoticCharmap(box));
+		me.TD(me, 5, 1.25, e = makeXonoticColorpicker(box));
+		me.TD(me, 5, 2.5, e = makeXonoticCharmap(box));
 	me.TR(me);
 	me.TR(me);
 	me.TR(me);
 	me.TR(me);
+	
+	me.gotoRC(me, 3, 4); me.setFirstColumn(me, me.currentColumn);
+	me.TR(me);
+		me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Text language:")));
+	me.TR(me);
+		me.TD(me, 6, 2, e = makeXonoticLanguageList());
+			e.name = "languageselector_firstrun";
+			e.doubleClickCommand = "saveconfig; menu_restart; togglemenu";
+	me.TR(me);
+	me.TR(me);
+
+	me.gotoRC(me, me.rows - 4, 0);
+	me.TD(me, 1, me.columns, e = makeXonoticTextLabel(0.5, _("Allow player statistics to use your nickname at stats.xonotic.org?")));
+	
+	me.gotoRC(me, me.rows - 3, 0);
+	me.TDempty(me, 1.5);
+	me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_allow_uid2name", "1", _("Sure")));
+	me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_allow_uid2name", "0", _("No")));
+	me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_allow_uid2name", "-1", _("Undecided")));
 
 	// because of the language selector, this is a menu_restart!
 	me.gotoRC(me, me.rows - 1, 0);
-		me.TD(me, 1, me.columns, e = makeXonoticCommandButton(_("Save settings"), '0 0 0', "saveconfig; menu_restart; togglemenu", COMMANDBUTTON_APPLY));
+	me.TD(me, 1, me.columns, e = makeXonoticCommandButton(_("Save settings"), '0 0 0', "saveconfig; menu_restart; togglemenu", COMMANDBUTTON_APPLY));
 		setDependentWeird(e, CheckFirstRunButton);
 }
 #endif
diff --git a/qcsrc/menu/xonotic/dialog_singleplayer.c b/qcsrc/menu/xonotic/dialog_singleplayer.c
index ec81b638b..351e3ac81 100644
--- a/qcsrc/menu/xonotic/dialog_singleplayer.c
+++ b/qcsrc/menu/xonotic/dialog_singleplayer.c
@@ -123,7 +123,7 @@ void XonoticSingleplayerDialog_fill(entity me)
 		me.TD(me, 1, me.columns - 2, lblTitle = makeXonoticTextLabel(0.5, _("???")));
 		me.TD(me, 1, 1, btnNext = makeXonoticButton(">>", '0 0 0'));
 	me.TR(me);
-		me.TD(me, me.rows - 5, me.columns, me.campaignBox = makeXonoticCampaignList());
+		me.TD(me, me.rows - 6, me.columns, me.campaignBox = makeXonoticCampaignList());
 			btnPrev.onClick = MultiCampaign_Prev;
 			btnPrev.onClickEntity = me.campaignBox;
 			btnNext.onClick = MultiCampaign_Next;