From 0c308fd0efc108b326bd3352462f0a40520f0c04 Mon Sep 17 00:00:00 2001 From: Samual Lenks Date: Thu, 19 Dec 2013 15:26:56 -0500 Subject: [PATCH] Make headers of subsections use bolded/faded Title Case, with center alignment --- .../menu/xonotic/dialog_multiplayer_create.c | 8 ++- .../menu/xonotic/dialog_multiplayer_profile.c | 18 ++++-- qcsrc/menu/xonotic/dialog_settings_audio.c | 4 +- .../xonotic/dialog_settings_game_weapons.c | 4 +- qcsrc/menu/xonotic/dialog_settings_input.c | 8 ++- qcsrc/menu/xonotic/dialog_settings_misc.c | 57 ++++++++----------- qcsrc/menu/xonotic/dialog_settings_user.c | 8 ++- 7 files changed, 59 insertions(+), 48 deletions(-) diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_create.c b/qcsrc/menu/xonotic/dialog_multiplayer_create.c index acf868b33..dfdc046db 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_create.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_create.c @@ -65,7 +65,9 @@ void XonoticServerCreateTab_fill(entity me) entity e, e0; me.gotoRC(me, 0.5, 0); - me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Game type:"))); + me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Gametype"))); + e.isBold = TRUE; + e.alpha = 0.5; me.TR(me); me.TD(me, 10.5, 3, e = makeXonoticGametypeList()); @@ -143,7 +145,9 @@ void XonoticServerCreateTab_fill(entity me) me.gotoRC(me, 0.5, 3.2); me.setFirstColumn(me, me.currentColumn); me.mapListBox = makeXonoticMapList(); - me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Map list:"))); + me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Maplist"))); + e.isBold = TRUE; + e.alpha = 0.5; makeCallback(e, me.mapListBox, me.mapListBox.refilterCallback); me.TR(me); me.TD(me, me.rows - 4, 3, me.mapListBox); diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_profile.c b/qcsrc/menu/xonotic/dialog_multiplayer_profile.c index 08402c844..ebeec714b 100644 --- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.c @@ -58,8 +58,10 @@ void XonoticProfileTab_fill(entity me) // Statistic Stuff -Debugger me.TR(me); - me.TDempty(me, 0.5); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Player Statistics:"))); + me.TDempty(me, 0.5); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0.5, _("Player Statistics"))); + e.isBold = TRUE; + e.alpha = 0.5; me.TR(me); me.TR(me); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Join time:"))); @@ -86,7 +88,9 @@ void XonoticProfileTab_fill(entity me) me.gotoRC(me, 0.5, 3.2); me.setFirstColumn(me, me.currentColumn); me.TDempty(me, 1); - me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Model:"))); + me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Model"))); + e.isBold = TRUE; + e.alpha = 0.5; me.TR(me); pms = makeXonoticPlayerModelSelector(); me.TD(me, 1, 0.3, e = makeXonoticButton("<<", '0 0 0')); @@ -99,7 +103,9 @@ void XonoticProfileTab_fill(entity me) me.gotoRC(me, 15.5, 3.533); me.setFirstColumn(me, me.currentColumn); me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0.5, _("Glowing color:"))); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0.5, _("Glowing color"))); + e.isBold = TRUE; + e.alpha = 0.5; for(i = 0; i < 15; ++i) { if(mod(i, 5) == 0) @@ -108,7 +114,9 @@ void XonoticProfileTab_fill(entity me) } me.gotoRC(me, 15.5, 4.866); me.setFirstColumn(me, me.currentColumn); me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0.5, _("Detail color:"))); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0.5, _("Detail color"))); + e.isBold = TRUE; + e.alpha = 0.5; for(i = 0; i < 15; ++i) { if(mod(i, 5) == 0) diff --git a/qcsrc/menu/xonotic/dialog_settings_audio.c b/qcsrc/menu/xonotic/dialog_settings_audio.c index 03c08da55..8d51e3151 100644 --- a/qcsrc/menu/xonotic/dialog_settings_audio.c +++ b/qcsrc/menu/xonotic/dialog_settings_audio.c @@ -123,7 +123,7 @@ void XonoticAudioSettingsTab_fill(entity me) e.addValue(e, _("7.1"), "8"); e.configureXonoticTextSliderValues(e); me.TR(me); - me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "snd_swapstereo", _("Swap Stereo"))); + me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "snd_swapstereo", _("Swap Stereo"))); // TODO: remove from inline setDependent(e, "snd_channels", 1.5, 0.5); me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "snd_spatialization_control", _("Headphone friendly mode"))); setDependent(e, "snd_channels", 1.5, 0.5); @@ -148,7 +148,7 @@ void XonoticAudioSettingsTab_fill(entity me) sl = makeXonoticSlider(0.15, 1, 0.05, "cl_autotaunt"); sl.valueDisplayMultiplier = 100; sl.valueDigits = 0; - me.TD(me, 1, 3, e = makeXonoticSliderCheckBox(0, 1, sl, _("Automatic taunts"))); + me.TD(me, 1, 3, e = makeXonoticSliderCheckBox(0, 1, sl, _("Automatic taunts"))); // TODO if(sl.value != e.savedValue) e.savedValue = 0.65; // default me.TR(me); diff --git a/qcsrc/menu/xonotic/dialog_settings_game_weapons.c b/qcsrc/menu/xonotic/dialog_settings_game_weapons.c index 0bcafd3fe..28a2255a3 100644 --- a/qcsrc/menu/xonotic/dialog_settings_game_weapons.c +++ b/qcsrc/menu/xonotic/dialog_settings_game_weapons.c @@ -31,7 +31,9 @@ void XonoticGameWeaponsSettingsTab_fill(entity me) me.TR(me); me.TDempty(me, 0.25); - me.TD(me, 1, 2.5, makeXonoticTextLabel(0, _("Weapon priority list:"))); + me.TD(me, 1, 2.5, e = makeXonoticTextLabel(0.5, _("Weapon Priority List"))); + e.isBold = TRUE; + e.alpha = 0.5; me.TR(me); me.TDempty(me, 0.25); me.TD(me, 11, 2.5, e = me.weaponsList = makeXonoticWeaponsList()); diff --git a/qcsrc/menu/xonotic/dialog_settings_input.c b/qcsrc/menu/xonotic/dialog_settings_input.c index 78bd1e4e8..bf974ef91 100644 --- a/qcsrc/menu/xonotic/dialog_settings_input.c +++ b/qcsrc/menu/xonotic/dialog_settings_input.c @@ -23,7 +23,9 @@ void XonoticInputSettingsTab_fill(entity me) entity kb; me.TR(me); - me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Key bindings:"))); + me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Key Bindings"))); + 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); @@ -65,7 +67,9 @@ void XonoticInputSettingsTab_fill(entity me) } me.TR(me); me.TR(me); - me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Mouse:"))); + me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Mouse"))); + e.isBold = TRUE; + e.alpha = 0.5; me.TR(me); me.TDempty(me, 0.2); me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Sensitivity:"))); diff --git a/qcsrc/menu/xonotic/dialog_settings_misc.c b/qcsrc/menu/xonotic/dialog_settings_misc.c index 57a121e4d..a01fda131 100644 --- a/qcsrc/menu/xonotic/dialog_settings_misc.c +++ b/qcsrc/menu/xonotic/dialog_settings_misc.c @@ -23,16 +23,16 @@ void XonoticMiscSettingsTab_fill(entity me) //entity sk; me.TR(me); - me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Network:"))); + me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Network"))); + e.isBold = TRUE; + e.alpha = 0.5; me.TR(me); - me.TDempty(me, 0.2); me.TD(me, 1, 1.2, e = makeXonoticTextLabel(0, _("Client UDP port:"))); me.TD(me, 1, 1.5, e = makeXonoticInputBox(0, "cl_port")); me.TR(me); me.TR(me); - me.TDempty(me, 0.2); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Bandwidth:"))); - me.TD(me, 1, 1.8, e = makeXonoticTextSlider("_cl_rate")); + me.TD(me, 1, 2, e = makeXonoticTextSlider("_cl_rate")); e.addValue(e, _("56k"), "4000"); e.addValue(e, _("ISDN"), "7000"); e.addValue(e, _("Slow ADSL"), "15000"); @@ -40,49 +40,42 @@ void XonoticMiscSettingsTab_fill(entity me) e.addValue(e, _("Broadband"), "66666"); e.configureXonoticTextSliderValues(e); me.TR(me); - me.TDempty(me, 0.2); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Input packets/s:"))); - me.TD(me, 1, 1.8, e = makeXonoticSlider(20, 100, 5, "cl_netfps")); + me.TD(me, 1, 2, e = makeXonoticSlider(20, 100, 5, "cl_netfps")); me.TR(me); - me.TDempty(me, 0.2); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Server queries/s:"))); - me.TD(me, 1, 1.8, e = makeXonoticSlider(20, 100, 10, "net_slist_queriespersecond")); + me.TD(me, 1, 2, e = makeXonoticSlider(20, 100, 10, "net_slist_queriespersecond")); me.TR(me); me.TR(me); - me.TDempty(me, 0.2); me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Downloads:"))); - me.TD(me, 1, 1.8, e = makeXonoticSlider(1, 5, 1, "cl_curl_maxdownloads")); + me.TD(me, 1, 2, e = makeXonoticSlider(1, 5, 1, "cl_curl_maxdownloads")); me.TR(me); - me.TDempty(me, 0.3); + me.TDempty(me, 0.1); me.TD(me, 1, 0.9, e = makeXonoticTextLabel(0, _("Speed (kB/s):"))); - me.TD(me, 1, 1.8, e = makeXonoticSlider(10, 2000, 50, "cl_curl_maxspeed")); + me.TD(me, 1, 2, e = makeXonoticSlider(10, 2000, 50, "cl_curl_maxspeed")); me.TR(me); if(cvar("developer")) { - me.TDempty(me, 0.2); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Local latency:"))); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Local latency:"))); me.TD(me, 1, 2, e = makeXonoticSlider(0, 1000, 25, "cl_netlocalping")); } me.TR(me); - me.TDempty(me, 0.2); - me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "shownetgraph", _("Show netgraph"))); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "shownetgraph", _("Show netgraph"))); me.TR(me); - me.TDempty(me, 0.2); - me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_movement", _("Client-side movement prediction"))); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_movement", _("Client-side movement prediction"))); me.TR(me); - me.TDempty(me, 0.2); - me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_movement_errorcompensation", _("Movement error compensation"))); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_movement_errorcompensation", _("Movement error compensation"))); setDependent(e, "cl_movement", 1, 1); me.TR(me); - me.TDempty(me, 0.2); if(cvar_type("crypto_aeslevel") & CVAR_TYPEFLAG_ENGINE) - me.TD(me, 1, 2.8, e = makeXonoticCheckBoxEx(2, 1, "crypto_aeslevel", _("Use encryption (AES) when available"))); + me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(2, 1, "crypto_aeslevel", _("Use encryption (AES) when available"))); // TODO: move up me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn); - me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Framerate:"))); + me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Framerate"))); + e.isBold = TRUE; + e.alpha = 0.5; me.TR(me); - me.TDempty(me, 0.2); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Maximum:"))); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Maximum:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxfps")); e.addValue(e, ZCTX(_("MAXFPS^5 fps")), "5"); e.addValue(e, ZCTX(_("MAXFPS^10 fps")), "10"); @@ -98,8 +91,7 @@ void XonoticMiscSettingsTab_fill(entity me) e.addValue(e, ZCTX(_("MAXFPS^Unlimited")), "0"); e.configureXonoticTextSliderValues(e); me.TR(me); - me.TDempty(me, 0.2); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Target:"))); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Target:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_minfps")); e.addValue(e, ZCTX(_("TRGT^Disabled")), "0"); e.addValue(e, ZCTX(_("TRGT^30 fps")), "30"); @@ -111,8 +103,7 @@ void XonoticMiscSettingsTab_fill(entity me) e.addValue(e, ZCTX(_("TRGT^200 fps")), "200"); e.configureXonoticTextSliderValues(e); me.TR(me); - me.TDempty(me, 0.2); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Idle limit:"))); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Idle limit:"))); me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_maxidlefps")); e.addValue(e, ZCTX(_("IDLFPS^10 fps")), "10"); e.addValue(e, ZCTX(_("IDLFPS^20 fps")), "20"); @@ -122,15 +113,13 @@ void XonoticMiscSettingsTab_fill(entity me) e.configureXonoticTextSliderValues(e); me.TR(me); me.TR(me); - me.TDempty(me, 0.2); - me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "showfps", _("Show frames per second"))); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showfps", _("Show frames per second"))); // TODO: swap me.TR(me); - me.TDempty(me, 0.2); - me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "cl_maxfps_alwayssleep", _("Save processing time for other apps"))); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_maxfps_alwayssleep", _("Save processing time for other apps"))); setDependent(e, "cl_maxfps", 1, 1000); me.TR(me); me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Menu tooltips:"))); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Menu tooltips:"))); // TODO: move this elsewhere? me.TD(me, 1, 2, e = makeXonoticTextSlider("menu_tooltips")); e.addValue(e, ZCTX(_("TLTIP^Disabled")), "0"); e.addValue(e, ZCTX(_("TLTIP^Standard")), "1"); diff --git a/qcsrc/menu/xonotic/dialog_settings_user.c b/qcsrc/menu/xonotic/dialog_settings_user.c index 911410b94..241c83341 100644 --- a/qcsrc/menu/xonotic/dialog_settings_user.c +++ b/qcsrc/menu/xonotic/dialog_settings_user.c @@ -24,7 +24,9 @@ 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.5, 2, sk = makeXonoticSkinList()); me.gotoRC(me, me.rows - 1.5, 0); @@ -62,7 +64,9 @@ void XonoticUserSettingsTab_fill(entity me) 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); -- 2.39.2