Add a doubleclick dialog which is just empty for now.

diff --git a/defaultXonotic.cfg b/defaultXonotic.cfg
index 0294ddd636dc64c03551cd34e8e0e91d58789f61..1f23a8798fd6b199f0acfac001e2b39a18ae7c39 100644 (file)
--- a/defaultXonotic.cfg
+++ b/defaultXonotic.cfg
@@ -1694,6 +1694,7 @@ exec turrets.cfg
 // alias for switching the teamselect menu
 alias menu_showteamselect "menu_cmd directmenu TeamSelect"
 alias menu_showhudexit "menu_cmd directmenu HUDExit"
+alias menu_showhudoptions "menu_cmd directmenu HUDOptions"
 alias menu_sync "menu_cmd sync"
 bind f5 menu_showteamselect
 

diff --git a/qcsrc/client/hud.qc b/qcsrc/client/hud.qc
index c4bd34bc6b8aabdab7f70462ba3ccbbb77d7cac1..a2f2997a5c93feaeac4a5bf157044d181328af07 100644 (file)
--- a/qcsrc/client/hud.qc
+++ b/qcsrc/client/hud.qc
@@ -1203,7 +1203,7 @@ void HUD_Panel_Mouse()
                if(time - prevMouseClickedTime < 0.4 && prevMouseClicked == 0 && prevMouseClickedPos == mousepos)
                {
                        mouseClicked = 0; // to prevent spam, I guess.
-                       print("Doubleclick!\n");
+                       localcmd("menu_showhudoptions\n");
                        return;
                }
 

diff --git a/qcsrc/menu/classes.c b/qcsrc/menu/classes.c
index b03c7ebcc4ba54d9767ea5a8617300e796550ce8..91313570605ca93e3f6391c8c6d26a6b7038e342 100644 (file)
--- a/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@ -84,3 +84,4 @@
 #include "xonotic/cvarlist.c"
 #include "xonotic/dialog_settings_misc_cvars.c"
 #include "xonotic/dialog_hudsetup_exit.c"
+#include "xonotic/dialog_hudpanel_options.c"

diff --git a/qcsrc/menu/xonotic/dialog_hudpanel_options.c b/qcsrc/menu/xonotic/dialog_hudpanel_options.c
new file mode 100644 (file)
index 0000000..7765523
--- /dev/null
+++ b/qcsrc/menu/xonotic/dialog_hudpanel_options.c
@@ -0,0 +1,21 @@
+#ifdef INTERFACE
+CLASS(XonoticHUDOptionsDialog) EXTENDS(XonoticRootDialog)
+       METHOD(XonoticHUDOptionsDialog, fill, void(entity))
+       ATTRIB(XonoticHUDOptionsDialog, title, string, "HUD Setup")
+       ATTRIB(XonoticHUDOptionsDialog, color, vector, SKINCOLOR_DIALOG_TEAMSELECT)
+       ATTRIB(XonoticHUDOptionsDialog, intendedWidth, float, 0.4)
+       ATTRIB(XonoticHUDOptionsDialog, rows, float, 15)
+       ATTRIB(XonoticHUDOptionsDialog, columns, float, 4)
+       ATTRIB(XonoticHUDOptionsDialog, name, string, "HUDOptions")
+ENDCLASS(XonoticHUDOptionsDialog)
+
+#endif
+
+#ifdef IMPLEMENTATION
+void fillXonoticHUDOptionsDialog(entity me)
+{
+       entity e;
+       me.TR(me);
+       
+}
+#endif

diff --git a/qcsrc/menu/xonotic/dialog_hudsetup_exit.c b/qcsrc/menu/xonotic/dialog_hudsetup_exit.c
index 6f7eea12317b2683dec59f75a1c740b95fc06e46..8e58fd5ee02448438a3f7e7283b6d93759c44bc9 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_hudsetup_exit.c
+++ b/qcsrc/menu/xonotic/dialog_hudsetup_exit.c
@@ -17,7 +17,6 @@ void fillXonoticHUDExitDialog(entity me)
        entity e;
        me.TR(me);
                me.TD(me, 1, 4, makeXonoticTextLabel(0, "Panel Settings:"));
-
                        me.TR(me);
                                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_bg", "Panel Background"));
                        me.TR(me);
@@ -35,6 +34,7 @@ void fillXonoticHUDExitDialog(entity me)
                        me.TR(me);
                                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "hud_configure_checkcollisions", "Collision Check"));
        me.TR(me);
+       
        me.TR(me);
                me.TD(me, 1, 4, makeXonoticTextLabel(0, "Dock Settings:"));
 
@@ -45,6 +45,7 @@ void fillXonoticHUDExitDialog(entity me)
                                me.TD(me, 1, 2, e = makeXonoticTextLabel(0, "Dock Alpha:"));
                                        me.TD(me, 1, 2, e = makeXonoticSlider(0, 1, 0.01, "hud_dock_alpha"));
        me.TR(me);
+       
        me.TR(me);
                me.TD(me, 1, 4, makeXonoticTextLabel(0, "Grid Settings:"));
 

diff --git a/qcsrc/menu/xonotic/mainwindow.c b/qcsrc/menu/xonotic/mainwindow.c
index 5a4168f5421caf203bfac9b1fac3fb47af2b32f6..627a580208fd9f3bd49562f0f67bca5c9d42e82a 100644 (file)
--- a/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@ -36,6 +36,10 @@ void configureMainWindowMainWindow(entity me)
        i = spawnXonoticHUDExitDialog();
        i.configureDialog(i);
        me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
+       
+       i = spawnXonoticHUDOptionsDialog();
+       i.configureDialog(i);
+       me.addItemCentered(me, i, i.intendedWidth * eX + i.intendedHeight * eY, SKINALPHAS_MAINMENU_z);
 
        me.advancedDialog = i = spawnXonoticAdvancedDialog();
        i.configureDialog(i);