Merge branch 'master' into terencehill/translate_colors_2

[xonotic/xonotic-data.pk3dir.git] / qcsrc / menu / xonotic / dialog_multiplayer_profile.qc

diff --git a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
index 6c753a98c669e3beb29c53425b9658fa4193a30c..68154221878670c8c7bcdd642bf5a6c0f07d24fa 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
+++ b/qcsrc/menu/xonotic/dialog_multiplayer_profile.qc
@@ -1,19 +1,17 @@
-#ifndef DIALOG_MULTIPLAYER_PROFILE_H
-#define DIALOG_MULTIPLAYER_PROFILE_H
-#include "tab.qc"
-CLASS(XonoticProfileTab, XonoticTab)
-       METHOD(XonoticProfileTab, fill, void(entity));
-       METHOD(XonoticProfileTab, draw, void(entity));
-       ATTRIB(XonoticProfileTab, intendedWidth, float, 0.9)
-       ATTRIB(XonoticProfileTab, rows, float, 23)
-       ATTRIB(XonoticProfileTab, columns, float, 6.1) // added extra .2 for center space
-       ATTRIB(XonoticProfileTab, playerNameLabel, entity, NULL)
-       ATTRIB(XonoticProfileTab, playerNameLabelAlpha, float, SKINALPHA_HEADER)
-ENDCLASS(XonoticProfileTab)
-entity makeXonoticProfileTab();
-#endif
+#include "dialog_multiplayer_profile.qh"
+
+#include "playermodel.qh"
+#include "statslist.qh"
+#include "languagelist.qh"
+#include "textlabel.qh"
+#include "commandbutton.qh"
+#include "inputbox.qh"
+#include "colorpicker.qh"
+#include "charmap.qh"
+#include "colorbutton.qh"
+#include "checkbox.qh"
+#include "radiobutton.qh"
 
-#ifdef IMPLEMENTATION
 entity makeXonoticProfileTab()
 {
        entity me;
@@ -64,6 +62,7 @@ void XonoticProfileTab_fill(entity me)
                        box.maxLength = -127; // negative means encoded length in bytes
                        box.saveImmediately = 0;  // Sorry, can't do this, it spams "name" commands.
                        box.enableClearButton = 0;
+                       box.applyButton = profileApplyButton;
                        label.textEntity = box;
        me.TR(me);
                me.TD(me, 5, 1, e = makeXonoticColorpicker(box));
@@ -178,4 +177,3 @@ void XonoticProfileTab_fill(entity me)
        me.gotoRC(me, me.rows - 1, 0);
                me.TD(me, 1, me.columns, profileApplyButton);
 }
-#endif