In the Game menu dialog on Quit press show the confirmation dialog in order to avoid...

diff --git a/qcsrc/menu/xonotic/dialog_gamemenu.qc b/qcsrc/menu/xonotic/dialog_gamemenu.qc
index 6374f370a7ac503de3ad05b0dcf6472abfa71f92..6ab4973cce87f82cdf781b8218d85cd0e584071c 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_gamemenu.qc
+++ b/qcsrc/menu/xonotic/dialog_gamemenu.qc
@@ -42,5 +42,5 @@ void XonoticGameMenuDialog_fill(entity me)
                me.TD(me, 1, 1, e = makeXonoticLeaveMatchButton('0 0 0', COMMANDBUTTON_CLOSE));
        me.TR(me);
        me.TR(me);
-               me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Quit Xonotic"), '1 0 0', "echo ]quit; quit", 0));
+               me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Quit"), '1 0 0', "menu_showquitdialog", 0));
 }

diff --git a/qcsrc/menu/xonotic/dialog_quit.qc b/qcsrc/menu/xonotic/dialog_quit.qc
index 89bfae806495085842fce9d19fc6d4573e28966f..f4cf02ae2cab70816a674881ed0094d19ea0d183 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_quit.qc
+++ b/qcsrc/menu/xonotic/dialog_quit.qc
@@ -9,12 +9,11 @@ void XonoticQuitDialog_fill(entity me)
 {
        entity e;
        me.TR(me);
-               me.TDempty(me, 0.5);
-               me.TD(me, 1, 1, e = makeXonoticLeaveMatchButton('0 0 0', COMMANDBUTTON_CLOSE));
+               me.TD(me, 1, 2, makeXonoticTextLabel(0.5, _("Are you sure you want to quit?")));
        me.TR(me);
        me.TR(me);
-               me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Quit Xonotic"), '1 0 0', "echo ]quit; quit", 0));
-               me.TD(me, 1, 1, e = makeXonoticButton(_("Cancel"), '0 1 0'));
+               me.TD(me, 1, 1, e = makeXonoticCommandButton(_("Yes"), '1 0 0', "echo ]quit; quit", 0));
+               me.TD(me, 1, 1, e = makeXonoticButton(_("No"), '0 1 0'));
                        e.onClick = Dialog_Close;
                        e.onClickEntity = me;
 }

diff --git a/qcsrc/menu/xonotic/dialog_quit.qh b/qcsrc/menu/xonotic/dialog_quit.qh
index ddf89e3a7bb5f2874d3a1a55f0c6099bb89e7bd1..6e8c9fea9a9748d7346f6969f4be0ace5b4fe635 100644 (file)
--- a/qcsrc/menu/xonotic/dialog_quit.qh
+++ b/qcsrc/menu/xonotic/dialog_quit.qh
@@ -3,8 +3,8 @@
 #include "dialog.qh"
 CLASS(XonoticQuitDialog, XonoticDialog)
        METHOD(XonoticQuitDialog, fill, void(entity));
-       ATTRIB(XonoticQuitDialog, title, string, _("Quit / Leave match"));
-       ATTRIB(XonoticQuitDialog, tooltip, string, _("Quit the game / Leave current match"));
+       ATTRIB(XonoticQuitDialog, title, string, _("Quit"));
+       ATTRIB(XonoticQuitDialog, tooltip, string, _("Quit the game"));
        ATTRIB(XonoticQuitDialog, color, vector, SKINCOLOR_DIALOG_QUIT);
        ATTRIB(XonoticQuitDialog, intendedWidth, float, 0.5);
        ATTRIB(XonoticQuitDialog, rows, float, 3);

diff --git a/qcsrc/menu/xonotic/keybinder.qc b/qcsrc/menu/xonotic/keybinder.qc
index d1bc88c46a6032d7ef9f80041f38b6972eb7b090..c76af8ceed148338342b68afcef70798071d3768 100644 (file)
--- a/qcsrc/menu/xonotic/keybinder.qc
+++ b/qcsrc/menu/xonotic/keybinder.qc
@@ -106,7 +106,7 @@ void KeyBinds_BuildList()
        KEYBIND_DEF("toggleconsole"                         , _("enter console"));
                string console_shortcut = strcat(translate_key("SHIFT"), "+", translate_key("ESCAPE"));
                KEYBIND_SPECIAL_DEF(console_shortcut, _("enter console"));
-       KEYBIND_DEF("menu_showquitdialog"                   , _("quit / leave match"));
+       KEYBIND_DEF("menu_showquitdialog"                   , _("quit"));
        KEYBIND_EMPTY_LINE();
 
        KEYBIND_HEADER(_("Teamplay"));