adding more stuff, lack a good organization still

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_notification.c b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_notification.c
index 947de920776398767b8f5e334a8ace70c7567627..7bb58402ee86fc2c812a00ef42be44f43318fbd9 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_notification.c
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_playersetup_notification.c
@@ -6,7 +6,7 @@ CLASS(XonoticNotificationDialog) EXTENDS(XonoticDialog)
        ATTRIB(XonoticNotificationDialog, title, string, _("Notification settings"))
        ATTRIB(XonoticNotificationDialog, color, vector, SKINCOLOR_DIALOG_MODEL)
        ATTRIB(XonoticNotificationDialog, intendedWidth, float, 0.8)
-       ATTRIB(XonoticNotificationDialog, rows, float, 15)
+       ATTRIB(XonoticNotificationDialog, rows, float, 20)
        ATTRIB(XonoticNotificationDialog, columns, float, 3)
 ENDCLASS(XonoticNotificationDialog)
 #endif
@@ -24,6 +24,9 @@ void XonoticNotificationDialog_fill(entity me)
 {
        entity e;
        
+       // Make a proper structure of this... 
+       // Like, go through all notifications and strip out useless ones, then write down the plan and group things properly
+       
        // General settings for the player
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("General Settings:")));
@@ -38,7 +41,12 @@ void XonoticNotificationDialog_fill(entity me)
        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"));
+               me.TD(me, 1, 2, e = makeXonoticSlider(0, 2, 1, "notifications_INFO_JOIN_CONNECT"));
+                       makeMulti(me, "notifications_INFO_JOIN_CONNECT notifications_INFO_JOIN_CONNECT_TEAM_BLUE notifications_INFO_JOIN_CONNECt_TEAM_RED notifications_INFO_JOIN_CONNECT_TEAM_YELLOW notifications_INFO_JOIN_CONNECT_TEAM_PINK");
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_CENTER_TEAMCHANGE_AUTO", _("Print teamchanges")));
+                       makeMulti(e, "notification_CENTER_TEAMCHANGE_AUTO notification_CENTER_TEAMCHANGE_SUICIDE notification_CENTER_TEAMCHANGE_SPECTATE notification_CENTER_TEAMCHANGE_BLUE notification_CENTER_TEAMCHANGE_RED notification_CENTER_TEAMCHANGE_YELLOW notification_CENTER_TEAMCHANGE_PINK");
 
        // Item notifications
        me.TR(me);
@@ -46,13 +54,22 @@ void XonoticNotificationDialog_fill(entity me)
                
        me.TR(me);
                me.TDempty(me, 0.2);
-               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Print weapon notifications:")));
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Weapon notifications:")));
                me.TD(me, 1, 2, e = makeXonoticSlider(0, 3, 1, "notification_INFO_ITEM_WEAPON_DONTHAVE"));
+       me.TR(me);
+               me.TDempty(me, 0.2);
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_CENTER_POWERDOWN_INVISIBILITY", _("Print powerup notifications")));
+                               makeMulti(e, "notification_CENTER_POWERDOWN_INVISIBILITY notification_CENTER_POWERDOWN_STRENGTH notification_CENTER_POWERDOWN_SHIELD notification_CENTER_POWERDOWN_SPEED notification_CENTER_POWERUP_INVISIBILITY notification_CENTER_POWERUP_STRENGTH notification_CENTER_POWERUP_SHIELD notification_CENTER_POWERUP_SPEED notification_CENTER_POWERDOWN_INVISIBILITY notification_CENTER_POWERDOWN_STRENGTH notification_CENTER_POWERDOWN_SHIELD notification_CENTER_SUPERWEAPON_LOST notification_CENTER_POWERDOWN_INVISIBILITY notification_CENTER_POWERDOWN_STRENGTH notification_CENTER_POWERDOWN_SHIELD notification_CENTER_SUPERWEAPON_PICKUP");
                
        // Gamemode dependent notifications
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Gamemode Notifications:")));
-               
+       me.TR(me);
+               me.TDempty(me, 0.2);
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Keyhunt notifications:")));
+               me.TD(me, 1, 2, e = makeXonoticSlider(0, 3, 1, "Keyhunt notifications in the infopanel"));
+                       makeMulti(e, "notification_INFO_KEYHUNT_CAPTURE_BLUE notification_INFO_KEYHUNT_DROP_BLUE notification_INFO_KEYHUNT_LOST_BLUE notification_INFO_KEYHUNT_PICKUP_BLUE notification_INFO_KEYHUNT_CAPTURE_RED notification_INFO_KEYHUNT_DROP_RED notification_INFO_KEYHUNT_LOST_RED notification_INFO_KEYHUNT_PICKUP_RED notification_INFO_KEYHUNT_CAPTURE_PINK notification_INFO_KEYHUNT_DROP_PINK notification_INFO_KEYHUNT_LOST_PINK notification_INFO_KEYHUNT_PICKUP_PINK notification_INFO_KEYHUNT_CAPTURE_YELLOW notification_INFO_KEYHUNT_DROP_YELLOW notification_INFO_KEYHUNT_LOST_YELLOW notification_INFO_KEYHUNT_PICKUP_YELLOW");
+       
        // Information on killingsprees
        me.TR(me);
                me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Information on killingsprees:")));