From fec15c23267fd669978b923d104a331bdb5c0674 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Sat, 25 Jan 2014 23:32:43 -0500 Subject: [PATCH] Better organization for user tab, add back the tooltips to misc tab --- qcsrc/menu/xonotic/dialog_settings_input.c | 4 +- qcsrc/menu/xonotic/dialog_settings_misc.c | 7 +++ qcsrc/menu/xonotic/dialog_settings_user.c | 57 +++++++++++----------- 3 files changed, 37 insertions(+), 31 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c index 917a92044..50b40f9b3 100644 --- a/qcsrc/menu/xonotic/dialog_settings_input.c +++ b/qcsrc/menu/xonotic/dialog_settings_input.c @@ -27,8 +27,8 @@ void XonoticInputSettingsTab_fill(entity me) e.isBold = TRUE; e.alpha = 0.5; me.TR(me); - me.TD(me, me.rows - 4, 3, kb = makeXonoticKeyBinder()); - me.gotoRC(me, me.rows - 3, 0); + me.TD(me, me.rows - 3.5, 3, kb = makeXonoticKeyBinder()); + me.gotoRC(me, me.rows - 2.5, 0); me.TD(me, 1, 1, e = makeXonoticButton(_("Change key..."), '0 0 0')); e.onClick = KeyBinder_Bind_Change; e.onClickEntity = kb; diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c index 98e8a5e1d..91d25b026 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc.c +++ b/qcsrc/menu/xonotic/dialog_settings_misc.c @@ -122,6 +122,13 @@ void XonoticMiscSettingsTab_fill(entity me) me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Other"))); e.isBold = TRUE; e.alpha = 0.5; + 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, 3, e = makeXonoticCheckBox(0, "showtime", _("Show current date and time"))); makeMulti(e, "showdate"); diff --git a/qcsrc/menu/xonotic/dialog_settings_user.c b/qcsrc/menu/xonotic/dialog_settings_user.c index c8dc2c175..547ac5221 100644 --- a/qcsrc/menu/xonotic/dialog_settings_user.c +++ b/qcsrc/menu/xonotic/dialog_settings_user.c @@ -4,7 +4,7 @@ CLASS(XonoticUserSettingsTab) EXTENDS(XonoticTab) ATTRIB(XonoticUserSettingsTab, title, string, _("User")) ATTRIB(XonoticUserSettingsTab, intendedWidth, float, 0.9) ATTRIB(XonoticUserSettingsTab, rows, float, 14.5) - ATTRIB(XonoticUserSettingsTab, columns, float, 5) + ATTRIB(XonoticUserSettingsTab, columns, float, 6) ENDCLASS(XonoticUserSettingsTab) entity makeXonoticUserSettingsTab(); #endif @@ -24,13 +24,15 @@ void XonoticUserSettingsTab_fill(entity me) entity sk; me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Menu Skins"))); + me.TDempty(me, 0.25); + me.TD(me, 1, 2.5, e = makeXonoticTextLabel(0.5, _("Menu Skins"))); e.isBold = TRUE; e.alpha = 0.5; me.TR(me); - 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')); + 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; @@ -63,39 +65,36 @@ void XonoticUserSettingsTab_fill(entity me) e.onClick = SetLanguage_Click; e.onClickEntity = sk;*/ - me.gotoRC(me, 0, 2.85); me.setFirstColumn(me, me.currentColumn); + me.gotoRC(me, 0, 3.75); me.setFirstColumn(me, me.currentColumn); 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); - me.TR(me); - me.TR(me); - me.TR(me); - me.TR(me); - me.TR(me); + 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.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, 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)); + //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 -- 2.39.2