Merge branch 'master' into TimePath/issue-1170

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_settings_game_messages.c

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_messages.c b/qcsrc/menu/xonotic/dialog_settings_game_messages.c
index b0e01d19f0b816992af1d4287dc168e974364282..6f605ccbcb98cd370cf2ad11e9f90721182f63ba 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_messages.c
+++ b/qcsrc/menu/xonotic/dialog_settings_game_messages.c
@@ -29,26 +29,8 @@ void XonoticGameMessageSettingsTab_fill(entity me)
 {
        entity e;
 
-       // todo:
-       // notification_CHOICE_CTF_CAPTURE_* CTF capture record
-       // notification_CHOICE_CTF_PICKUP_* CTF pickup verbose info
-       // notification_FRAG* Frag message verbose info
-       // notification_show_location Show location of deaths in death messages
-       // notification_show_sprees Show spree information
-       // notification_INFO_ITEM_WEAPON* Show weapon notifications in console
-       // Enable con_notify
-       // notification_ANNCE_NUM_RESPAWN* Add respawning countdown slider
-       // notification_ANNCE_NUM_ROUNDSTART* Add roundstart countdown slider
-       // notification_ANNCE_NUM_KILL* Add kill countdown slider
-       // notification_ANNCE_NUM_GAMESTART* Add gamestart countdown slider
-       // notification_ANNCE_ACHIEVEMENT* achievements toggle
-       // notification_ANNCE_KILLSTREAK* killstreak toggles
-
-       /// frag information
        me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Frag Information")));
-                       e.isBold = TRUE;
-                       e.alpha = 0.5;
+               me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Frag Information")));
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_show_sprees", _("Display information about killing sprees")));
        me.TR(me);
@@ -88,10 +70,8 @@ void XonoticGameMessageSettingsTab_fill(entity me)
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_show_location", _("Add frag location to death messages when available")));
 
-       me.gotoRC(me, 8.5, 0); me.setFirstColumn(me, me.currentColumn);
-               me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Gamemode Settings")));
-                       e.isBold = TRUE;
-                       e.alpha = 0.5;
+       me.gotoRC(me, 9, 0); me.setFirstColumn(me, me.currentColumn);
+               me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Gamemode Settings")));
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(2, 1, "notification_CHOICE_CTF_CAPTURE_TIME_RED", _("Display capture times in Capture The Flag")));
                        makeMulti(e, "notification_CHOICE_CTF_CAPTURE_TIME_BLUE notification_CHOICE_CTF_CAPTURE_BROKEN_RED notification_CHOICE_CTF_CAPTURE_BROKEN_BLUE notification_CHOICE_CTF_CAPTURE_UNBROKEN_RED notification_CHOICE_CTF_CAPTURE_UNBROKEN_BLUE ");
@@ -102,9 +82,7 @@ void XonoticGameMessageSettingsTab_fill(entity me)
                        e.sendCvars = TRUE;
 
        me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
-               me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Other")));
-                       e.isBold = TRUE;
-                       e.alpha = 0.5;
+               me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Other")));
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(4, 1, "con_notify", _("Display console messages in the top left corner")));
        me.TR(me);
@@ -123,10 +101,8 @@ void XonoticGameMessageSettingsTab_fill(entity me)
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "notification_INFO_ITEM_WEAPON_DONTHAVE", _("Weapon info message notifications")));
                        makeMulti(e, "notification_INFO_ITEM_WEAPON_DROP notification_INFO_ITEM_WEAPON_GOT notification_INFO_ITEM_WEAPON_NOAMMO notification_INFO_ITEM_WEAPON_PRIMORSEC notification_INFO_ITEM_WEAPON_UNAVAILABLE"); 
 
-       me.gotoRC(me, 8.5, 3.2); me.setFirstColumn(me, me.currentColumn);
-               me.TD(me, 1, 3, e = makeXonoticTextLabel(0.5, _("Announcers")));
-                       e.isBold = TRUE;
-                       e.alpha = 0.5;
+       me.gotoRC(me, 9, 3.2); me.setFirstColumn(me, me.currentColumn);
+               me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Announcers")));
        #if 0
        // there's just not enough room for this, and it's not important enough to justify...
        me.TR(me);
@@ -139,8 +115,5 @@ void XonoticGameMessageSettingsTab_fill(entity me)
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBoxEx(1, 0, "notification_ANNCE_ACHIEVEMENT_AIRSHOT", _("Achievement sounds")));
                        makeMulti(e, "notification_ANNCE_ACHIEVEMENT_AMAZING notification_ANNCE_ACHIEVEMENT_AWESOME notification_ANNCE_ACHIEVEMENT_BOTLIKE notification_ANNCE_ACHIEVEMENT_ELECTROBITCH notification_ANNCE_ACHIEVEMENT_IMPRESSIVE notification_ANNCE_ACHIEVEMENT_YODA");
-
-       me.gotoRC(me, me.rows - 1, 0);
-               me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "echo stuff", COMMANDBUTTON_APPLY));
 }
 #endif