From cb4247fdab5cd8cfcc58e4825afe5e8990e82fc8 Mon Sep 17 00:00:00 2001
From: Debugger <pyngot@hotmail.com>
Date: Thu, 1 Aug 2013 20:09:57 +0200
Subject: [PATCH] adding a few new things to the notification dialog
---
...log_multiplayer_playersetup_notification.c | 55 ++++++++++++++-----
1 file changed, 40 insertions(+), 15 deletions(-)
diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_notification.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_notification.c
index a4e49021e9..947de92077 100644
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_notification.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_notification.c
@@ -5,8 +5,8 @@ CLASS(XonoticNotificationDialog) EXTENDS(XonoticDialog)
METHOD(XonoticNotificationDialog, showNotify, void(entity))
ATTRIB(XonoticNotificationDialog, title, string, _("Notification settings"))
ATTRIB(XonoticNotificationDialog, color, vector, SKINCOLOR_DIALOG_MODEL)
- ATTRIB(XonoticNotificationDialog, intendedWidth, float, 0.5)
- ATTRIB(XonoticNotificationDialog, rows, float, 7)
+ ATTRIB(XonoticNotificationDialog, intendedWidth, float, 0.8)
+ ATTRIB(XonoticNotificationDialog, rows, float, 15)
ATTRIB(XonoticNotificationDialog, columns, float, 3)
ENDCLASS(XonoticNotificationDialog)
#endif
@@ -24,28 +24,53 @@ void XonoticNotificationDialog_fill(entity me)
{
entity e;
+ // General settings for the player
me.TR(me);
- me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Body fading:")));
- me.TD(me, 1, 2, e = makeXonoticSlider(0, 2, 0.2, "cl_deathglow"));
+ me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("General Settings:")));
+
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Centerprint time:")));
+ me.TD(me, 1, 2, e = makeXonoticSlider(0, 3, 0.1, "notification_item_centerprinttime"));
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_allow_chatboxprint", _("Print all notifications into the chatbox")));
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Notice joining players:")));
+ me.TD(me, 1, 2, e = makeXonoticSlider(0, 2, 1, "notification_INFO_JOIN_CONNECT"));
+
+ // Item notifications
+ me.TR(me);
+ me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Item Notifications:")));
+
+ me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Print weapon notifications:")));
+ me.TD(me, 1, 2, e = makeXonoticSlider(0, 3, 1, "notification_INFO_ITEM_WEAPON_DONTHAVE"));
+
+ // Gamemode dependent notifications
me.TR(me);
- me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Gibs:")));
- me.TD(me, 1, 2, e = makeXonoticTextSlider("cl_nogibs"));
- e.addValue(e, ZCTX(_("GIBS^None")), "1");
- e.addValue(e, ZCTX(_("GIBS^Few")), "0.75");
- e.addValue(e, ZCTX(_("GIBS^Many")), "0.5");
- e.addValue(e, ZCTX(_("GIBS^Lots")), "0");
- e.configureXonoticTextSliderValues(e);
- setDependent(e, "cl_gentle", 0, 0);
+ me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Gamemode Notifications:")));
+
+ // Information on killingsprees
me.TR(me);
+ me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Information on killingsprees:")));
+
me.TR(me);
- me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayermodels", _("Force player models to mine")));
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_show_sprees", _("Print information on sprees")));
me.TR(me);
- me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "cl_forceplayercolors", _("Force player colors to mine")));
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Show spree information:")));
+ me.TD(me, 1, 2, e = makeXonoticSlider(0, 3, 1, "notification_show_sprees_info"));
me.TR(me);
+ me.TDempty(me, 0.2);
+ me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_show_sprees_info_newline", _("Show spree information in a seperate line")));
me.gotoRC(me, me.rows - 1, 0);
me.TD(me, 1, me.columns, e = makeXonoticButton(_("OK"), '0 0 0'));
e.onClick = Dialog_Close;
e.onClickEntity = me;
}
-#endif
+#endif
\ No newline at end of file
--
2.39.5