From: terencehill <piuntn@gmail.com>
Date: Sun, 6 Nov 2011 19:18:53 +0000 (+0100)
Subject: Menu for the quick menu panel in hud setup mode
X-Git-Tag: xonotic-v0.8.2~1987^2~55^2~35
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=0c65b4cc7bf708e0d46f02e6235b9b047411db4b;p=xonotic%2Fxonotic-data.pk3dir.git

Menu for the quick menu panel in hud setup mode
---

diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index 5b7331e37..fc0a91094 100644
--- a/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@ -105,4 +105,5 @@
 #include "xonotic/dialog_hudpanel_weapons.c"
 #include "xonotic/dialog_hudpanel_physics.c"
 #include "xonotic/dialog_hudpanel_centerprint.c"
+#include "xonotic/dialog_hudpanel_quickmenu.c"
 #include "xonotic/slider_picmip.c"
diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.c b/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.c
new file mode 100644
index 000000000..f9527d423
--- /dev/null
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_quickmenu.c
@@ -0,0 +1,21 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDQuickMenuDialog) EXTENDS(XonoticRootDialog)
+	METHOD(XonoticHUDQuickMenuDialog, fill, void(entity))
+	ATTRIB(XonoticHUDQuickMenuDialog, title, string, _("Quick Menu Panel"))
+	ATTRIB(XonoticHUDQuickMenuDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+	ATTRIB(XonoticHUDQuickMenuDialog, intendedWidth, float, 0.4)
+	ATTRIB(XonoticHUDQuickMenuDialog, rows, float, 15)
+	ATTRIB(XonoticHUDQuickMenuDialog, columns, float, 4)
+	ATTRIB(XonoticHUDQuickMenuDialog, name, string, "HUDquickmenu")
+ENDCLASS(XonoticHUDQuickMenuDialog)
+#endif
+
+#ifdef IMPLEMENTATION
+void XonoticHUDQuickMenuDialog_fill(entity me)
+{
+	entity e;
+	string panelname = "quickmenu";
+
+	DIALOG_HUDPANEL_COMMON();
+}
+#endif
diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c
index 55d496047..336622e14 100644
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@ -122,6 +122,10 @@ void MainWindow_configureMainWindow(entity me)
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
+	i = spawnXonoticHUDQuickMenuDialog();
+	i.configureDialog(i);
+	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+
 	me.advancedDialog = i = spawnXonoticAdvancedDialog();
 	i.configureDialog(i);
 	me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);