Merge branch 'master' into save_ext

2017-03-28 02:26:13 +01:00
parent c4e06808a2 065a0547e2
commit f58fe00294
79 changed files with 468 additions and 168 deletions
--- a/src/table/settings.ini
+++ b/src/table/settings.ini
@@ -2585,6 +2585,14 @@ str      = STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING
 strhelp  = STR_CONFIG_SETTING_LEFT_MOUSE_BTN_SCROLLING_HELPTEXT
 cat      = SC_BASIC

+[SDTC_BOOL]
+var      = gui.right_mouse_wnd_close
+flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC
+def      = false
+str      = STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE
+strhelp  = STR_CONFIG_SETTING_RIGHT_MOUSE_WND_CLOSE_HELPTEXT
+cat      = SC_BASIC
+
 [SDTC_BOOL]
 var      = gui.measure_tooltip
 flags    = SLF_NOT_IN_SAVE | SLF_NO_NETWORK_SYNC