From: terencehill Date: Thu, 20 Jan 2011 20:37:11 +0000 (+0100) Subject: Merge branch 'master' into terencehill/menu_dialogs_cleanups X-Git-Tag: xonotic-v0.5.0~316^2~2^2~1 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=8b5335b125ddeb8a0c023ff5cf7f5f28f034f4e3;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into terencehill/menu_dialogs_cleanups Conflicts: qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c qcsrc/menu/xonotic/dialog_settings_effects.c --- 8b5335b125ddeb8a0c023ff5cf7f5f28f034f4e3 diff --cc qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c index 3a5cc82dc,470fc6785..5805d2ea1 --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_waypoint.c @@@ -1,49 -1,49 +1,44 @@@ #ifdef INTERFACE CLASS(XonoticWaypointDialog) EXTENDS(XonoticDialog) - METHOD(XonoticWaypointDialog, toString, string(entity)) METHOD(XonoticWaypointDialog, fill, void(entity)) METHOD(XonoticWaypointDialog, showNotify, void(entity)) - ATTRIB(XonoticWaypointDialog, title, string, "Waypoints") + ATTRIB(XonoticWaypointDialog, title, string, _("Waypoints")) - ATTRIB(XonoticWaypointDialog, color, vector, SKINCOLOR_DIALOG_RADAR) - ATTRIB(XonoticWaypointDialog, intendedWidth, float, 0.7) + ATTRIB(XonoticWaypointDialog, color, vector, SKINCOLOR_DIALOG_WAYPOINTS) + ATTRIB(XonoticWaypointDialog, intendedWidth, float, 0.5) ATTRIB(XonoticWaypointDialog, rows, float, 6) - ATTRIB(XonoticWaypointDialog, columns, float, 4) + ATTRIB(XonoticWaypointDialog, columns, float, 3) ENDCLASS(XonoticWaypointDialog) #endif #ifdef IMPLEMENTATION void XonoticWaypointDialog_showNotify(entity me) { - loadAllCvars(me); + loadAllCvars(me); } - string XonoticWaypointDialog_toString(entity me) - { - return "XXX"; - } void XonoticWaypointDialog_fill(entity me) { entity e; - - me.TR(me); - me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Waypoint settings:"))); + me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_hidewaypoints", "Show base waypoints")); - me.TDempty(me, 0.2); - me.TD(me, 1, 3.8, e = makeXonoticCheckBox(1, "cl_hidewaypoints", _("Show base waypoints"))); ++ me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_hidewaypoints", _("Show base waypoints"))); me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Waypoint scale:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0.5, 1.5, 0.05, "g_waypointsprite_scale")); - setDependent(e, "cl_hidewaypoints", 0, 0); - me.TDempty(me, 0.2); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Waypoint scale:"))); - me.TD(me, 1, 3, e = makeXonoticSlider(0.5, 1.5, 0.01, "g_waypointsprite_scale")); ++ me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Waypoint scale:"))); ++ me.TD(me, 1, 2, e = makeXonoticSlider(0.5, 1.5, 0.05, "g_waypointsprite_scale")); + setDependent(e, "cl_hidewaypoints", 0, 0); me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Waypoint alpha:")); - me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1, 0.05, "g_waypointsprite_alpha")); - setDependent(e, "cl_hidewaypoints", 0, 0); - me.TDempty(me, 0.2); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Waypoint alpha:"))); - me.TD(me, 1, 3, e = makeXonoticSlider(0.1, 1, 0.01, "g_waypointsprite_alpha")); ++ me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Waypoint alpha:"))); ++ me.TD(me, 1, 2, e = makeXonoticSlider(0.1, 1, 0.05, "g_waypointsprite_alpha")); + setDependent(e, "cl_hidewaypoints", 0, 0); me.TR(me); - me.TDempty(me, 0.2); - me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Show names:"))); - me.TD(me, 1, 3, e = makeXonoticTextSlider("cl_shownames")); + me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, "Show names:")); ++ me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Show names:"))); + me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_shownames")); - e.addValue(e, "Never", "0"); - e.addValue(e, "Teammates", "1"); - e.addValue(e, "All players", "2"); + e.addValue(e, _("Never"), "0"); + e.addValue(e, _("Teammates"), "1"); + e.addValue(e, _("All players"), "2"); e.configureXonoticTextSliderValues(e); me.gotoRC(me, me.rows - 1, 0); - me.TD(me, 1, me.columns, e = makeXonoticButton("OK", '0 0 0')); + me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0')); e.onClick = Dialog_Close; e.onClickEntity = me; } diff --cc qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c index 0cc9f3368,ed5802a97..d20a6483b --- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c +++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_weapons.c @@@ -3,11 -3,11 +3,11 @@@ CLASS(XonoticWeaponsDialog) EXTENDS(Xon METHOD(XonoticWeaponsDialog, toString, string(entity)) METHOD(XonoticWeaponsDialog, fill, void(entity)) METHOD(XonoticWeaponsDialog, showNotify, void(entity)) - ATTRIB(XonoticWeaponsDialog, title, string, "Weapon settings") + ATTRIB(XonoticWeaponsDialog, title, string, _("Weapon settings")) ATTRIB(XonoticWeaponsDialog, color, vector, SKINCOLOR_DIALOG_WEAPONS) - ATTRIB(XonoticWeaponsDialog, intendedWidth, float, 0.5) + ATTRIB(XonoticWeaponsDialog, intendedWidth, float, 0.4) ATTRIB(XonoticWeaponsDialog, rows, float, 17) - ATTRIB(XonoticWeaponsDialog, columns, float, 4) + ATTRIB(XonoticWeaponsDialog, columns, float, 3) ATTRIB(XonoticWeaponsDialog, weaponsList, entity, NULL) ENDCLASS(XonoticWeaponsDialog) #endif @@@ -26,33 -26,33 +26,33 @@@ void XonoticWeaponsDialog_fill(entity m entity e; me.TR(me); - me.TD(me, 1, 3, makeXonoticTextLabel(0, "Weapon priority list:")); - me.TD(me, 1, 4, makeXonoticTextLabel(0, _("Weapon priority list:"))); ++ me.TD(me, 1, 3, makeXonoticTextLabel(0, _("Weapon priority list:"))); me.TR(me); - me.TD(me, 9, 4, e = me.weaponsList = makeXonoticWeaponsList()); + me.TD(me, 9, 3, e = me.weaponsList = makeXonoticWeaponsList()); me.gotoRC(me, 10, 0); - me.TDempty(me, 1); + me.TDempty(me, 0.5); - me.TD(me, 1, 1, e = makeXonoticButton("Up", '0 0 0')); + me.TD(me, 1, 1, e = makeXonoticButton(_("Up"), '0 0 0')); e.onClick = WeaponsList_MoveUp_Click; e.onClickEntity = me.weaponsList; - me.TD(me, 1, 1, e = makeXonoticButton("Down", '0 0 0')); + me.TD(me, 1, 1, e = makeXonoticButton(_("Down"), '0 0 0')); e.onClick = WeaponsList_MoveDown_Click; e.onClickEntity = me.weaponsList; - me.gotoRC(me, 11, 0); + me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_weaponpriority_useforcycling", "Use priority list for weapon cycling")); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_weaponpriority_useforcycling", _("Use priority list for weapon cycling"))); me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_autoswitch", "Auto switch weapons on pickup")); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_autoswitch", _("Auto switch weapons on pickup"))); me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "r_drawviewmodel", "Draw 1st person weapon model")); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "r_drawviewmodel", _("Draw 1st person weapon model"))); me.TR(me); me.TDempty(me, 0.2); - me.TD(me, 1, 1.4, e = makeXonoticRadioButton(1, "cl_gunalign", "4", "Left align")); - me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_gunalign", "4", _("Left align"))); ++ me.TD(me, 1, 1.4, e = makeXonoticRadioButton(1, "cl_gunalign", "4", _("Left align"))); setDependent(e, "r_drawviewmodel", 1, 1); - me.TD(me, 1, 1.4, e = makeXonoticRadioButton(1, "cl_gunalign", "3", "Right align")); - me.TD(me, 1, 1, e = makeXonoticRadioButton(1, "cl_gunalign", "3", _("Right align"))); ++ me.TD(me, 1, 1.4, e = makeXonoticRadioButton(1, "cl_gunalign", "3", _("Right align"))); setDependent(e, "r_drawviewmodel", 1, 1); me.TR(me); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "v_flipped", "Flip view horizontally")); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "v_flipped", _("Flip view horizontally"))); me.TR(me); - me.TD(me, 1, me.columns, e = makeXonoticButton("OK", '0 0 0')); + me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0')); e.onClick = Dialog_Close; e.onClickEntity = me; } diff --cc qcsrc/menu/xonotic/dialog_settings_effects.c index 0d00c3a79,ec8329b5d..b94bd1f08 --- a/qcsrc/menu/xonotic/dialog_settings_effects.c +++ b/qcsrc/menu/xonotic/dialog_settings_effects.c @@@ -129,23 -129,23 +129,23 @@@ void XonoticEffectsSettingsTab_fill(ent setDependent(e, "cl_decals", 1, 1); me.gotoRC(me, 2, 3.5); me.setFirstColumn(me, me.currentColumn); - me.TD(me, 1, 1.2, e = makeXonoticCheckBox(1, "mod_q3bsp_nolightmaps", "Use lightmaps")); - me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "r_glsl_deluxemapping", "Deluxe mapping")); - me.TD(me, 1, 1.3, e = makeXonoticCheckBox(1, "mod_q3bsp_nolightmaps", _("Use lightmaps"))); - me.TD(me, 1, 0.9, e = makeXonoticCheckBox(0, "r_glsl_deluxemapping", _("Deluxe mapping"))); ++ me.TD(me, 1, 1.2, e = makeXonoticCheckBox(1, "mod_q3bsp_nolightmaps", _("Use lightmaps"))); ++ me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "r_glsl_deluxemapping", _("Deluxe mapping"))); setDependentAND(e, "vid_gl20", 1, 1, "mod_q3bsp_nolightmaps", 0, 0); - me.TD(me, 1, 0.6, e = makeXonoticCheckBox(0, "r_shadow_gloss", "Gloss")); - me.TD(me, 1, 0.8, e = makeXonoticCheckBox(0, "r_shadow_gloss", _("Gloss"))); ++ me.TD(me, 1, 0.6, e = makeXonoticCheckBox(0, "r_shadow_gloss", _("Gloss"))); setDependentAND3(e, "vid_gl20", 1, 1, "r_glsl_deluxemapping", 1, 2, "mod_q3bsp_nolightmaps", 0, 0); me.TR(me); - me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping", "Offset mapping")); - me.TD(me, 1, 1.3, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping", _("Offset mapping"))); ++ me.TD(me, 1, 1.2, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping", _("Offset mapping"))); setDependent(e, "vid_gl20", 1, 1); - me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_reliefmapping", "Relief mapping")); - me.TD(me, 1, 1.7, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_reliefmapping", _("Relief mapping"))); ++ me.TD(me, 1, 1.8, e = makeXonoticCheckBox(0, "r_glsl_offsetmapping_reliefmapping", _("Relief mapping"))); setDependentAND(e, "vid_gl20", 1, 1, "r_glsl_offsetmapping", 1, 1); me.TR(me); - me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_water", "Reflections:")); + me.TD(me, 1, 1, e = makeXonoticCheckBox(0, "r_water", _("Reflections:"))); setDependent(e, "vid_gl20", 1, 1); me.TD(me, 1, 2, e = makeXonoticTextSlider("r_water_resolutionmultiplier")); - e.addValue(e, "Blurred", "0.25"); - e.addValue(e, "Good", "0.5"); - e.addValue(e, "Sharp", "1"); + e.addValue(e, _("Blurred"), "0.25"); + e.addValue(e, ZCTX(_("REFL^Good")), "0.5"); + e.addValue(e, _("Sharp"), "1"); e.configureXonoticTextSliderValues(e); setDependentAND(e, "vid_gl20", 1, 1, "r_water", 1, 1); me.TR(me);