Start working on Messages tab

diff --git a/qcsrc/menu/xonotic/dialog_settings_game.c b/qcsrc/menu/xonotic/dialog_settings_game.c
index 6ba8aa16397721c983f7818e20c7eccd6781d5de..fa9adbf47a49ded54f1325d78f9708b8f1c0acbc 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game.c
+++ b/qcsrc/menu/xonotic/dialog_settings_game.c
@@ -29,7 +29,7 @@ void XonoticGameSettingsTab_fill(entity me)
                me.TD(me, 1, 1, mc.makeTabButton(mc, _("View"),           makeXonoticGameViewSettingsTab()));
                me.TD(me, 1, 1, mc.makeTabButton(mc, _("Crosshair"),      makeXonoticGameCrosshairSettingsTab()));
                me.TD(me, 1, 1, mc.makeTabButton(mc, _("HUD"),            makeXonoticGameHUDSettingsTab()));
-               me.TD(me, 1, 1, mc.makeTabButton(mc, _("Messages"),       makeXonoticGameCrosshairSettingsTab()));
+               me.TD(me, 1, 1, mc.makeTabButton(mc, _("Messages"),       makeXonoticGameMessageSettingsTab()));
                me.TD(me, 1, 1, mc.makeTabButton(mc, _("Weapons"),        makeXonoticGameWeaponsSettingsTab()));
                me.TD(me, 1, 1, mc.makeTabButton(mc, _("Playermodels"),   makeXonoticGameCrosshairSettingsTab()));
 

diff --git a/qcsrc/menu/xonotic/dialog_settings_game_notification.c b/qcsrc/menu/xonotic/dialog_settings_game_notification.c
index 7d4b50bc68223f126bd336934d09ee6065b39e4b..ecf68558021862370539ead2f5d861aef9620dba 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_settings_game_notification.c
+++ b/qcsrc/menu/xonotic/dialog_settings_game_notification.c
@@ -1,29 +1,34 @@
 #ifdef INTERFACE
-CLASS(XonoticNotificationDialog) EXTENDS(XonoticDialog)
-       METHOD(XonoticNotificationDialog, toString, string(entity))
-       METHOD(XonoticNotificationDialog, fill, void(entity))
-       METHOD(XonoticNotificationDialog, showNotify, void(entity))
-       ATTRIB(XonoticNotificationDialog, title, string, _("Notification settings"))
-       ATTRIB(XonoticNotificationDialog, color, vector, SKINCOLOR_DIALOG_MODEL)
-       ATTRIB(XonoticNotificationDialog, intendedWidth, float, 0.6)
-       ATTRIB(XonoticNotificationDialog, rows, float, 19)
-       ATTRIB(XonoticNotificationDialog, columns, float, 3)
-ENDCLASS(XonoticNotificationDialog)
+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 XonoticNotificationDialog_showNotify(entity me)
+void XonoticGameMessageSettingsTab_showNotify(entity me)
 {
        loadAllCvars(me);
 }
-string XonoticNotificationDialog_toString(entity me)
+entity makeXonoticGameMessageSettingsTab()
 {
-       return "hi"; // TODO: show csqc model settings like forcemyplayer and deglowing/ghosting bodies with text here
+       entity me;
+       me = spawnXonoticGameMessageSettingsTab();
+       me.configureDialog(me);
+       return me;
 }
-void XonoticNotificationDialog_fill(entity 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:")));
@@ -87,10 +92,5 @@ void XonoticNotificationDialog_fill(entity 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")));
                
-       // Close this dialog
-       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
\ No newline at end of file
+#endif