From: Samual Lenks Date: Tue, 24 Dec 2013 00:01:59 +0000 (-0500) Subject: Rename notification file to messages file X-Git-Tag: xonotic-v0.8.0~139^2~1^2~46 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=e9d6d84b8a67b1f02b4e360089fdb3cdd4fbd7a5;p=xonotic%2Fxonotic-data.pk3dir.git Rename notification file to messages file --- diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.c b/qcsrc/menu/xonotic/dialog_settings_game_messages.c new file mode 100644 index 000000000..ecf685580 --- /dev/null +++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.c @@ -0,0 +1,96 @@ +#ifdef INTERFACE +CLASS(XonoticGameMessageSettingsTab) EXTENDS(XonoticTab) + //METHOD(XonoticGameWeaponsSettingsTab, toString, string(entity)) + METHOD(XonoticGameMessageSettingsTab, fill, void(entity)) + METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity)) + ATTRIB(XonoticGameMessageSettingsTab, title, string, _("Messages")) + ATTRIB(XonoticGameMessageSettingsTab, intendedWidth, float, 0.9) + ATTRIB(XonoticGameMessageSettingsTab, rows, float, 14) + ATTRIB(XonoticGameMessageSettingsTab, columns, float, 6) + ATTRIB(XonoticGameMessageSettingsTab, weaponsList, entity, NULL) +ENDCLASS(XonoticGameMessageSettingsTab) +entity makeXonoticGameMessageSettingsTab(); +#endif + +#ifdef IMPLEMENTATION +void XonoticGameMessageSettingsTab_showNotify(entity me) +{ + loadAllCvars(me); +} +entity makeXonoticGameMessageSettingsTab() +{ + entity me; + me = spawnXonoticGameMessageSettingsTab(); + me.configureDialog(me); + return me; +} + +void XonoticGameMessageSettingsTab_fill(entity me) +{ + entity e; + + // General settings for the player + me.TR(me); + me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("General Settings:"))); + + me.TR(me); + me.TDempty(me, 0.1); + me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "notification_allow_chatboxprint", _("Print all notifications into the chatbox"))); + me.TR(me); + me.TDempty(me, 0.1); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Notice connecting players:"))); + me.TR(me); + me.TDempty(me, 0.3); + me.TD(me, 1, 3, e = makeXonoticTextSlider("notification_INFO_QUIT_DISCONNECT")); + //makeMulti(me, "notification_INFO_QUIT_KICK_IDLING notification_INFO_QUIT_KICK_SPECTATING notification_INFO_JOIN_PLAY notification_INFO_JOIN_CONNECT_TEAM_BLUE notification_INFO_JOIN_CONNECT_TEAM_PINK notification_INFO_JOIN_CONNECT_TEAM_RED notification_INFO_JOIN_CONNECT_TEAM_YELLOW"); + e.addValue(e, ZCTX(_("off")), "0"); + e.addValue(e, ZCTX(_("only console")), "1"); + e.addValue(e, ZCTX(_("console & chat")), "2"); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.1); + me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "notification_ITEM_WEAPON_DONTHAVE", _("Item notifications"))); + me.TR(me); + me.TDempty(me, 0.1); + me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "notification_CENTER_POWERUP_INVISIBILITY", _("Powerup notifications"))); + //makeMulti(e, "notification_CENTER_POWERUP_SHIELD notification_CENTER_POWERUP_SPEED notification_CENTER_POWERUP_STRENGTH notification_CENTER_POWERDOWN_INVISIBILITY notification_CENTER_POWERDOWN_SHIELD notification_CENTER_POWERDOWN_SPEED notification_CENTER_POWERDOWN_STRENGTH notification_CENTER_SUPERWEAPON_BROKEN notification_CENTER_SUPERWEAPON_LOST notification_CENTER_SUPERWEAPON_PICKUP"); + me.TR(me); + me.TDempty(me, 0.1); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_frag_verbose", _("Additional information on frags"))); + me.TR(me); + me.TR(me); + + // Gamemode specific notifications + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Gamemode notifications:"))); + me.TR(me); + me.TDempty(me, 0.1); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_CENTER_ARENA_BEGIN", _("Centerprint for gamemode notifications"))); + //makeMulti(me, "notification_CENTER_ARENA_NEEDPLAYER notification_CENTER_ARENA_ROUNDSTART notification_CENTER_ASSAULT_ATTACKING notification_CENTER_ASSAULT_DEFENDING notification_CENTER_CTF_PICKUP_BLUE notification_CENTER_CTF_PICKUP_ENEMY notification_CENTER_CTF_PICKUP_RED notification_CENTER_CTF_PICKUP_TEAM notification_CENTER_FREEZETAG_FREEZE notification_CENTER_FREEZETAG_FROZEN notification_CENTER_FREEZETAG_REVIVE notification_CENTER_FREEZETAG_REVIVED notification_CENTER_FREEZETAG_ROUND_WIN_BLUE notification_CENTER_FREEZETAG_ROUND_WIN_PINK notification_CENTER_FREEZETAG_ROUND_WIN_RED notification_CENTER_FREEZETAG_ROUND_WIN_YELLOW notification_CENTER_FREEZETAG_SELF notification_CENTER_FREEZETAG_SPAWN_LATE notification_CENTER_KEEPAWAY_DROPPED notification_CENTER_KEEPAWAY_PICKUP notification_CENTER_KEEPAWAY_WARN notification_CENTER_KEYHUNT_HELP notification_CENTER_KEYHUNT_INTERFERE_BLUE notification_CENTER_KEYHUNT_INTERFERE_PINK notification_CENTER_KEYHUNT_INTERFERE_RED notification_CENTER_KEYHUNT_INTERFERE_YELLOW notification_CENTER_KEYHUNT_MEET notification_CENTER_KEYHUNT_SCAN notification_CENTER_KEYHUNT_START_BLUE notification_CENTER_KEYHUNT_START_PINK notification_CENTER_KEYHUNT_START_RED notification_CENTER_KEYHUNT_START_YELLOW notification_CENTER_KEYHUNT_WAIT notification_CENTER_LMS_CAMPCHECK"); + me.TR(me); + me.TDempty(me, 0.1); + me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_ctf_capture_verbose", _("Additional information on flag captures"))); + me.TR(me); + + // Information on killingsprees + me.TR(me); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Information on killingsprees:"))); + me.TR(me); + me.TDempty(me, 0.1); + me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "notification_show_sprees", _("Print information on sprees"))); + me.TR(me); + me.TDempty(me, 0.1); + me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Show spree information:"))); + me.TR(me); + me.TDempty(me, 0.3); + me.TD(me, 1, 3, e = makeXonoticTextSlider("notification_show_sprees_info")); + e.addValue(e, ZCTX(_("off")), "0"); + e.addValue(e, ZCTX(_("target")), "1"); + e.addValue(e, ZCTX(_("attacker")), "2"); + e.addValue(e, ZCTX(_("target & attacker")), "3"); + e.configureXonoticTextSliderValues(e); + me.TR(me); + me.TDempty(me, 0.1); + me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "notification_show_sprees_info_newline", _("Print spree information in a new line"))); + +} +#endif diff --git a/qcsrc/menu/xonotic/dialog_settings_game_notification.c b/qcsrc/menu/xonotic/dialog_settings_game_notification.c deleted file mode 100644 index ecf685580..000000000 --- a/qcsrc/menu/xonotic/dialog_settings_game_notification.c +++ /dev/null @@ -1,96 +0,0 @@ -#ifdef INTERFACE -CLASS(XonoticGameMessageSettingsTab) EXTENDS(XonoticTab) - //METHOD(XonoticGameWeaponsSettingsTab, toString, string(entity)) - METHOD(XonoticGameMessageSettingsTab, fill, void(entity)) - METHOD(XonoticGameMessageSettingsTab, showNotify, void(entity)) - ATTRIB(XonoticGameMessageSettingsTab, title, string, _("Messages")) - ATTRIB(XonoticGameMessageSettingsTab, intendedWidth, float, 0.9) - ATTRIB(XonoticGameMessageSettingsTab, rows, float, 14) - ATTRIB(XonoticGameMessageSettingsTab, columns, float, 6) - ATTRIB(XonoticGameMessageSettingsTab, weaponsList, entity, NULL) -ENDCLASS(XonoticGameMessageSettingsTab) -entity makeXonoticGameMessageSettingsTab(); -#endif - -#ifdef IMPLEMENTATION -void XonoticGameMessageSettingsTab_showNotify(entity me) -{ - loadAllCvars(me); -} -entity makeXonoticGameMessageSettingsTab() -{ - entity me; - me = spawnXonoticGameMessageSettingsTab(); - me.configureDialog(me); - return me; -} - -void XonoticGameMessageSettingsTab_fill(entity me) -{ - entity e; - - // General settings for the player - me.TR(me); - me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("General Settings:"))); - - me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "notification_allow_chatboxprint", _("Print all notifications into the chatbox"))); - me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Notice connecting players:"))); - me.TR(me); - me.TDempty(me, 0.3); - me.TD(me, 1, 3, e = makeXonoticTextSlider("notification_INFO_QUIT_DISCONNECT")); - //makeMulti(me, "notification_INFO_QUIT_KICK_IDLING notification_INFO_QUIT_KICK_SPECTATING notification_INFO_JOIN_PLAY notification_INFO_JOIN_CONNECT_TEAM_BLUE notification_INFO_JOIN_CONNECT_TEAM_PINK notification_INFO_JOIN_CONNECT_TEAM_RED notification_INFO_JOIN_CONNECT_TEAM_YELLOW"); - e.addValue(e, ZCTX(_("off")), "0"); - e.addValue(e, ZCTX(_("only console")), "1"); - e.addValue(e, ZCTX(_("console & chat")), "2"); - e.configureXonoticTextSliderValues(e); - me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "notification_ITEM_WEAPON_DONTHAVE", _("Item notifications"))); - me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "notification_CENTER_POWERUP_INVISIBILITY", _("Powerup notifications"))); - //makeMulti(e, "notification_CENTER_POWERUP_SHIELD notification_CENTER_POWERUP_SPEED notification_CENTER_POWERUP_STRENGTH notification_CENTER_POWERDOWN_INVISIBILITY notification_CENTER_POWERDOWN_SHIELD notification_CENTER_POWERDOWN_SPEED notification_CENTER_POWERDOWN_STRENGTH notification_CENTER_SUPERWEAPON_BROKEN notification_CENTER_SUPERWEAPON_LOST notification_CENTER_SUPERWEAPON_PICKUP"); - me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_frag_verbose", _("Additional information on frags"))); - me.TR(me); - me.TR(me); - - // Gamemode specific notifications - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Gamemode notifications:"))); - me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_CENTER_ARENA_BEGIN", _("Centerprint for gamemode notifications"))); - //makeMulti(me, "notification_CENTER_ARENA_NEEDPLAYER notification_CENTER_ARENA_ROUNDSTART notification_CENTER_ASSAULT_ATTACKING notification_CENTER_ASSAULT_DEFENDING notification_CENTER_CTF_PICKUP_BLUE notification_CENTER_CTF_PICKUP_ENEMY notification_CENTER_CTF_PICKUP_RED notification_CENTER_CTF_PICKUP_TEAM notification_CENTER_FREEZETAG_FREEZE notification_CENTER_FREEZETAG_FROZEN notification_CENTER_FREEZETAG_REVIVE notification_CENTER_FREEZETAG_REVIVED notification_CENTER_FREEZETAG_ROUND_WIN_BLUE notification_CENTER_FREEZETAG_ROUND_WIN_PINK notification_CENTER_FREEZETAG_ROUND_WIN_RED notification_CENTER_FREEZETAG_ROUND_WIN_YELLOW notification_CENTER_FREEZETAG_SELF notification_CENTER_FREEZETAG_SPAWN_LATE notification_CENTER_KEEPAWAY_DROPPED notification_CENTER_KEEPAWAY_PICKUP notification_CENTER_KEEPAWAY_WARN notification_CENTER_KEYHUNT_HELP notification_CENTER_KEYHUNT_INTERFERE_BLUE notification_CENTER_KEYHUNT_INTERFERE_PINK notification_CENTER_KEYHUNT_INTERFERE_RED notification_CENTER_KEYHUNT_INTERFERE_YELLOW notification_CENTER_KEYHUNT_MEET notification_CENTER_KEYHUNT_SCAN notification_CENTER_KEYHUNT_START_BLUE notification_CENTER_KEYHUNT_START_PINK notification_CENTER_KEYHUNT_START_RED notification_CENTER_KEYHUNT_START_YELLOW notification_CENTER_KEYHUNT_WAIT notification_CENTER_LMS_CAMPCHECK"); - me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_ctf_capture_verbose", _("Additional information on flag captures"))); - me.TR(me); - - // Information on killingsprees - me.TR(me); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Information on killingsprees:"))); - me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "notification_show_sprees", _("Print information on sprees"))); - me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Show spree information:"))); - me.TR(me); - me.TDempty(me, 0.3); - me.TD(me, 1, 3, e = makeXonoticTextSlider("notification_show_sprees_info")); - e.addValue(e, ZCTX(_("off")), "0"); - e.addValue(e, ZCTX(_("target")), "1"); - e.addValue(e, ZCTX(_("attacker")), "2"); - e.addValue(e, ZCTX(_("target & attacker")), "3"); - e.configureXonoticTextSliderValues(e); - me.TR(me); - me.TDempty(me, 0.1); - me.TD(me, 1, 2, e = makeXonoticCheckBox(0, "notification_show_sprees_info_newline", _("Print spree information in a new line"))); - -} -#endif