Merge branch 'master' into TimePath/issue-1170

Conflicts:
	qcsrc/menu/classes.c
	qcsrc/menu/xonotic/dialog_settings_input.c
	qcsrc/menu/xonotic/dialog_settings_misc.c
	qcsrc/menu/xonotic/mainwindow.c

diff --cc defaultXonotic.cfg
Simple merge

diff --cc qcsrc/menu/classes.c
index 60063224906878d91a83baa098da86f5febd9f95,9b872cbf2945d8a17a454456840692f305faeb72..bc60898c88213dec842d73b2930dbca094ebb77f
--- 1/qcsrc/menu/classes.c
--- 2/qcsrc/menu/classes.c
+++ b/qcsrc/menu/classes.c
@@@ -114,4 -123,4 +123,5 @@@
  #include "xonotic/dialog_hudpanel_buffs.c"
  #include "xonotic/slider_picmip.c"
  #include "xonotic/slider_particles.c"
+ #include "xonotic/slider_sbfadetime.c"
 +#include "xonotic/dialog_settings_misc_reset.c"

diff --cc qcsrc/menu/xonotic/dialog_settings_input.c
index c8ba7c4fd4483defb98d124de8ddbc88c736cf74,f58ce157232886d3119c2f56d73c3e9a783d28e9..4287f1f82e37d52bb8be673378a3ac372e99f469
--- 1/qcsrc/menu/xonotic/dialog_settings_input.c
--- 2/qcsrc/menu/xonotic/dialog_settings_input.c
+++ b/qcsrc/menu/xonotic/dialog_settings_input.c
@@@ -20,16 -27,13 +27,13 @@@ void CheckBox_Click_Redisplay(entity me
  void XonoticInputSettingsTab_fill(entity me)
  {
        entity e;
 -      entity kb;
 +      entity kb = makeXonoticKeyBinder();
  
        me.TR(me);
-               me.TD(me, 1, 2, e = makeXonoticTextLabel(0, _("Key bindings:")));
-               me.TD(me, 1, 1, e = makeXonoticButton(_("Reset all"), '0 0 0'));
-                       e.onClick = KeyBinder_Bind_Reset_All;
-                       e.onClickEntity = kb;
+               me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Key Bindings")));
        me.TR(me);
 -              me.TD(me, me.rows - 2.5, 3, kb = makeXonoticKeyBinder());
 -      me.gotoRC(me, me.rows - 1.5, 0);
 +              me.TD(me, me.rows - 4, 3, kb);
 +      me.gotoRC(me, me.rows - 3, 0);
                me.TD(me, 1, 1, e = makeXonoticButton(_("Change key..."), '0 0 0'));
                        e.onClick = KeyBinder_Bind_Change;
                        e.onClickEntity = kb;
@@@ -44,52 -48,58 +48,62 @@@
                        e.onClick = KeyBinder_Bind_Clear;
                        e.onClickEntity = kb;
                        kb.clearButton = e;
++      me.TR(me);
++              me.TD(me, 1, 3, e = makeXonoticButton(_("Reset all"), '0 0 0'));
++                      e.onClick = KeyBinder_Bind_Reset_All;
++                      e.onClickEntity = kb;
  
        me.gotoRC(me, 0, 3.2); me.setFirstColumn(me, me.currentColumn);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_closeontoggleconsole", _("Pressing \"enter console\" key also closes it")));
+               me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Mouse")));
        me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_movement_track_canjump", _("Automatically repeat jumping if holding jump")));
+               me.TD(me, 1, 1, e = makeXonoticTextLabel(0, _("Sensitivity:")));
+               me.TD(me, 1, 2, e = makeXonoticSlider(1, 32, 0.2, "sensitivity"));
        me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "m_filter", _("Smooth aiming")));
        me.TR(me);
-               if(cvar_type("joy_enable") & CVAR_TYPEFLAG_ENGINE)
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joy_enable", _("Use joystick input")));
-               else if(cvar_type("joystick") & CVAR_TYPEFLAG_ENGINE)
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joystick", _("Use joystick input")));
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(1.022, "m_pitch", _("Invert aiming")));
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "menu_mouse_absolute", _("Use system mouse positioning")));
+                       makeMulti(e, "hud_cursormode");
+                       e.onClick = CheckBox_Click_Redisplay;
+                       e.onClickEntity = e;
+       me.TR(me);
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "m_accelerate", _("Enable built in mouse acceleration")));
+       me.TR(me);
+               if(cvar_type("vid_dgamouse") & CVAR_TYPEFLAG_ENGINE)
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "vid_dgamouse", _("Disable system mouse acceleration")));
+               else if(cvar_type("apple_mouse_noaccel") & CVAR_TYPEFLAG_ENGINE)
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "apple_mouse_noaccel", _("Disable system mouse acceleration")));
                else
                {
-                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, string_null, _("Use joystick input")));
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, string_null, _("Disable system mouse acceleration")));
                        e.disabled = 1; // the option is never available in this case, just there for show
                }
+ 
        me.TR(me);
        me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticTextLabel(0, _("Mouse:")));
+               me.TD(me, 1, 3, e = makeXonoticHeaderLabel(_("Other")));
        me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 0.8, e = makeXonoticTextLabel(0, _("Sensitivity:")));
-               me.TD(me, 1, 2, e = makeXonoticSlider(1, 32, 0.2, "sensitivity"));
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "con_closeontoggleconsole", _("Pressing \"enter console\" key also closes it")));
        me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "m_filter", _("Smooth aiming")));
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(1, "cl_movement_track_canjump", _("Automatically repeat jumping if holding jump")));
+                       e.sendCvars = TRUE;
        me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 2.8, e = makeXonoticCheckBox(1.022, "m_pitch", _("Invert aiming")));
        me.TR(me);
-               me.TDempty(me, 0.2);
-               if(cvar_type("vid_dgamouse") & CVAR_TYPEFLAG_ENGINE)
-                       me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "vid_dgamouse", _("Disable system mouse acceleration")));
-               else if(cvar_type("apple_mouse_noaccel") & CVAR_TYPEFLAG_ENGINE)
-                       me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "apple_mouse_noaccel", _("Disable system mouse acceleration")));
+               if(cvar_type("joy_enable") & CVAR_TYPEFLAG_ENGINE)
+               {
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joy_enable", _("Use joystick input")));
+                       setDependent(e, "joy_detected", 1, 10000000);
+               }
+               else if(cvar_type("joystick") & CVAR_TYPEFLAG_ENGINE)
+               {
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "joystick", _("Use joystick input")));
+                       setDependent(e, "joy_detected", 1, 10000000);
+               }
                else
                {
-                       me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, string_null, _("Disable system mouse acceleration")));
+                       me.TD(me, 1, 3, e = makeXonoticCheckBox(0, string_null, _("Use joystick input")));
                        e.disabled = 1; // the option is never available in this case, just there for show
                }
-       me.TR(me);
-               me.TDempty(me, 0.2);
-               me.TD(me, 1, 2.8, e = makeXonoticCheckBox(0, "m_accelerate", _("Enable built in mouse acceleration")));
- 
- 
-       me.gotoRC(me, me.rows - 1, 0);
-               me.TD(me, 1, me.columns, makeXonoticCommandButton(_("Apply immediately"), '0 0 0', "sendcvar cl_movement_track_canjump", COMMANDBUTTON_APPLY));
  }
  #endif

diff --cc qcsrc/menu/xonotic/dialog_settings_misc.c
index 489b00967b95e74d0177f979f9dd860f52866295,0fd2db2fe08d541c6d288fa66d6e43f5aa920624..1deda87df078a26c24569b2bf1dd6cb54155b1b6
--- 1/qcsrc/menu/xonotic/dialog_settings_misc.c
--- 2/qcsrc/menu/xonotic/dialog_settings_misc.c
+++ b/qcsrc/menu/xonotic/dialog_settings_misc.c
@@@ -138,23 -124,15 +124,20 @@@ void XonoticMiscSettingsTab_fill(entit
                        e.addValue(e, ZCTX(_("TLTIP^Advanced")), "2");
                        e.configureXonoticTextSliderValues(e);
        me.TR(me);
-       me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showtime", _("Show current time")));
-       me.TR(me);
-               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showdate", _("Show current date")));
+               me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "showtime", _("Show current date and time")));
+                       makeMulti(e, "showdate");
        me.TR(me);
                me.TD(me, 1, 3, e = makeXonoticCheckBox(0, "developer", _("Enable developer mode")));
--      me.TR(me);
++
        me.TR(me);
                me.TDempty(me, 0.5);
                me.TD(me, 1, 2, e = makeXonoticButton(_("Advanced settings..."), '0 0 0'));
                        e.onClick = DialogOpenButton_Click;
                        e.onClickEntity = main.cvarsDialog;
-       me.TR(me);
 +      me.TR(me);
 +              me.TDempty(me, 0.5);
 +              me.TD(me, 1, 2, e = makeXonoticButton(_("Factory reset"), '0 0 0'));
 +                      e.onClick = DialogOpenButton_Click;
 +                      e.onClickEntity = main.resetDialog;
  }
  #endif

diff --cc qcsrc/menu/xonotic/keybinder.c
index d54ab6671f95e506950af0de8ce959dd6a9fd5f0,57f501f5c145a050724cb570045aa4b332622a74..6fe961871c14c99ca0873e385d3af1e21593e826
--- 1/qcsrc/menu/xonotic/keybinder.c
--- 2/qcsrc/menu/xonotic/keybinder.c
+++ b/qcsrc/menu/xonotic/keybinder.c
@@@ -238,15 -238,9 +238,15 @@@ void KeyBinder_Bind_Clear(entity btn, e
        localcmd("-zoom\n"); // to make sure we aren't in togglezoom'd state
        cvar_set("_hud_showbinds_reload", "1");
  }
 +void KeyBinder_Bind_Reset_All(entity btn, entity me)
 +{
 +      localcmd("exec binds-default.cfg\n");
 +      localcmd("-zoom\n"); // to make sure we aren't in togglezoom'd state
 +      cvar_set("_hud_showbinds_reload", "1");
 +}
  void XonoticKeyBinder_clickListBoxItem(entity me, float i, vector where)
  {
-       if(i == me.lastClickedServer)
+       if(i == me.lastClickedKey)
                if(time < me.lastClickedTime + 0.3)
                {
                        // DOUBLE CLICK!

diff --cc qcsrc/menu/xonotic/mainwindow.c
index 480e801d4818344f17bc3880bb318193fd10e80d,6eba4f7a7a316a3f27fbf3ffe032e310f3daa915..6fa40bfac69cf687997ec45952d7b10eb7825d12
--- 1/qcsrc/menu/xonotic/mainwindow.c
--- 2/qcsrc/menu/xonotic/mainwindow.c
+++ b/qcsrc/menu/xonotic/mainwindow.c
@@@ -20,7 -17,8 +17,9 @@@ CLASS(MainWindow) EXTENDS(ModalControll
        ATTRIB(MainWindow, mainNexposee, entity, NULL)
        ATTRIB(MainWindow, fadedAlpha, float, SKINALPHA_BEHIND)
        ATTRIB(MainWindow, dialogToShow, entity, NULL)
+       ATTRIB(MainWindow, demostartconfirmDialog, entity, NULL)
+       ATTRIB(MainWindow, demotimeconfirmDialog, entity, NULL)
 +      ATTRIB(MainWindow, resetDialog, entity, NULL)
  ENDCLASS(MainWindow)
  #endif