Add checkboxes for autoDisplayTags/Comments in menu WB

The auto-display options can now be controlled from the Genral Options
menu dialog through two new checkboxes.

diff --git a/winboard/resource.h b/winboard/resource.h
index 7bc3e69..62d7406 100644 (file)
--- a/winboard/resource.h
+++ b/winboard/resource.h
@@ -443,6 +443,7 @@
 #define OPT_ExtraInfoInMoveHistory      1437\r
 #define OPT_HighlightMoveArrow          1438\r
 #define OPT_AutoLogo                   1439\r
+#define OPT_AutoTags                    1440\r
 #define IDC_BUTTON1                     1440\r
 #define IDC_BrowseForPolyglotDir        1440\r
 #define IDC_BrowseForEGTB               1441\r

diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index 7c2d4be..2656e7b 100644 (file)
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -445,7 +445,7 @@ BEGIN
     PUSHBUTTON      "Cancel",IDCANCEL,208,86,50,14\r
 END\r
 \r
-DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 300, 197\r
+DLG_GeneralOptions DIALOG DISCARDABLE  0, 0, 300, 211\r
 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
 CAPTION "General Options"\r
 FONT 8, "MS Sans Serif"\r
@@ -498,8 +498,12 @@ BEGIN
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,160,151,10\r
     CONTROL         "One-Click Move",OPT_SmartMove,\r
                     "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,160,151,10\r
-    DEFPUSHBUTTON   "OK",IDOK,180,178,50,14\r
-    PUSHBUTTON      "Cancel",IDCANCEL,236,178,50,14\r
+    CONTROL         "auto-Display Tags",OPT_AutoTags,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,174,151,10\r
+    CONTROL         "auto-Display Comment",OPT_AutoComment,\r
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,156,174,151,10\r
+    DEFPUSHBUTTON   "OK",IDOK,180,192,50,14\r
+    PUSHBUTTON      "Cancel",IDCANCEL,236,192,50,14\r
 END\r
 \r
 DLG_IcsOptions DIALOGEX 0, 0, 302, 268\r

diff --git a/winboard/woptions.c b/winboard/woptions.c
index a97248b..8a8406a 100644 (file)
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -210,6 +210,8 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     CHECK_BOX(OPT_HighlightMoveArrow, appData.highlightMoveWithArrow);\r
     CHECK_BOX(OPT_AutoLogo, appData.autoLogo); // [HGM] logo\r
     CHECK_BOX(OPT_SmartMove, appData.oneClick); // [HGM] one-click\r
+    CHECK_BOX(OPT_AutoTags, appData.autoDisplayTags); // [HGM]\r
+    CHECK_BOX(OPT_AutoComment, appData.autoDisplayComment); // [HGM]\r
 \r
 #undef CHECK_BOX\r
 \r
@@ -259,6 +261,8 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       appData.highlightMoveWithArrow=IS_CHECKED(OPT_HighlightMoveArrow);\r
       appData.autoLogo             =IS_CHECKED(OPT_AutoLogo); // [HGM] logo\r
       appData.oneClick             =IS_CHECKED(OPT_SmartMove); // [HGM] one-click\r
+      appData.autoDisplayTags      =IS_CHECKED(OPT_AutoTags); // [HGM]\r
+      appData.autoDisplayComment   =IS_CHECKED(OPT_AutoComment); // [HGM]\r
 \r
 #undef IS_CHECKED\r
 \r
@@ -695,6 +699,7 @@ BoardOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       }\r
       DeleteObject(pieces[0]);\r
       DeleteObject(pieces[1]);\r
+\r
       DeleteObject(pieces[2]);\r
       return TRUE;\r
 \r