X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwoptions.c;h=94da5b8402c0e1cc5fc14a362a255a5b9ae2ddd7;hb=d9f4b584106f4d7477158476ff792f6fa0b2630a;hp=9aa820fb982189ac165b8dbf078ee0d4eed0d22d;hpb=a2724ace243e91f45310697eafaafe8d44245242;p=xboard.git

diff --git a/winboard/woptions.c b/winboard/woptions.c
index 9aa820f..94da5b8 100644
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -819,6 +819,7 @@ int radioButton[] = {
     -1, // Twilight,
     OPT_VariantMakruk,
     OPT_VariantSChess,
+    OPT_VariantGrand,
     OPT_VariantSpartan, // Spartan
     -2 // sentinel
 };
@@ -1550,6 +1551,7 @@ FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       SetSampleFontText(hDlg, OPT_SampleCommentsFont, &workFont[COMMENT_FONT]);
       SetSampleFontText(hDlg, OPT_SampleConsoleFont, &workFont[CONSOLE_FONT]);
       SetSampleFontText(hDlg, OPT_SampleMoveHistoryFont, &workFont[MOVEHISTORY_FONT]);
+      SetSampleFontText(hDlg, OPT_SampleGameListFont, &workFont[GAMELIST_FONT]);
       firstPaint = FALSE;
     }
     break;
@@ -1578,6 +1580,7 @@ FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	CopyFont(font[i][CONSOLE_FONT],  &workFont[CONSOLE_FONT]);
 	CopyFont(font[i][COMMENT_FONT],  &workFont[COMMENT_FONT]);
 	CopyFont(font[i][MOVEHISTORY_FONT],  &workFont[MOVEHISTORY_FONT]);
+	CopyFont(font[i][GAMELIST_FONT],  &workFont[GAMELIST_FONT]);
       }
       /* end sad necessity */
 
@@ -1667,6 +1670,11 @@ FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       SetSampleFontText(hDlg, OPT_SampleMoveHistoryFont, &workFont[MOVEHISTORY_FONT]);
       break;
 
+    case OPT_ChooseGameListFont:
+      MyCreateFont(hDlg, &workFont[GAMELIST_FONT]);
+      SetSampleFontText(hDlg, OPT_SampleGameListFont, &workFont[GAMELIST_FONT]);
+      break;
+
     case OPT_DefaultFonts:
       for (i=0; i<NUM_FONTS; i++) {
 	DeleteObject(&workFont[i].hf);
@@ -1680,6 +1688,7 @@ FontOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       SetSampleFontText(hDlg, OPT_SampleCommentsFont, &workFont[COMMENT_FONT]);
       SetSampleFontText(hDlg, OPT_SampleConsoleFont, &workFont[CONSOLE_FONT]);
       SetSampleFontText(hDlg, OPT_SampleMoveHistoryFont, &workFont[MOVEHISTORY_FONT]);
+      SetSampleFontText(hDlg, OPT_SampleGameListFont, &workFont[GAMELIST_FONT]);
       break;
     }
   }
@@ -2133,7 +2142,7 @@ ParseCommSettings(char *arg, DCB *dcb)
   if (cd->label == NULL) goto cant_parse;
   return;
 cant_parse:
-    ExitArgError(_("Can't parse com port settings"), arg);
+    ExitArgError(_("Can't parse com port settings"), arg, TRUE);
 }
 
 
@@ -2382,6 +2391,15 @@ CommPortOptionsPopup(HWND hwnd)
  *
 \*---------------------------------------------------------------------------*/
 
+int
+LoadOptionsWhichRadio(HWND hDlg)
+{
+  return (IsDlgButtonChecked(hDlg, OPT_Exact) ? 1 :
+         (IsDlgButtonChecked(hDlg, OPT_Subset) ? 2 :
+         (IsDlgButtonChecked(hDlg, OPT_Struct) ? 3 :
+         (IsDlgButtonChecked(hDlg, OPT_Material) ? 4 : -1))));
+}
+
 VOID
 SetLoadOptionEnables(HWND hDlg)
 {
@@ -2397,6 +2415,7 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 {
   char buf[MSG_SIZ];
   float fnumber;
+  int ok;
 
   switch (message) {
   case WM_INITDIALOG: /* message: initialize dialog box */
@@ -2412,6 +2431,23 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       CheckDlgButton(hDlg, OPT_Autostep, FALSE);
     }
     SetLoadOptionEnables(hDlg);
+    SetDlgItemInt(hDlg, OPT_elo1, appData.eloThreshold1, FALSE);
+    SetDlgItemInt(hDlg, OPT_elo2, appData.eloThreshold2, FALSE);
+    SetDlgItemInt(hDlg, OPT_date, appData.dateThreshold, FALSE);
+    switch (appData.searchMode) {
+    case 1:
+      CheckDlgButton(hDlg, OPT_Exact, TRUE);
+      break;
+    case 2:
+      CheckDlgButton(hDlg, OPT_Subset, TRUE);
+      break;
+    case 3:
+      CheckDlgButton(hDlg, OPT_Struct, TRUE);
+      break;
+    case 4:
+      CheckDlgButton(hDlg, OPT_Material, TRUE);
+      break;
+    }
     return TRUE;
 
   case WM_COMMAND: /* message: received a command */
@@ -2429,6 +2465,10 @@ LoadOptions(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       } else {
 	appData.timeDelay = (float) -1.0;
       }
+      appData.eloThreshold1 = GetDlgItemInt(hDlg, OPT_elo1, &ok, FALSE);
+      appData.eloThreshold2 = GetDlgItemInt(hDlg, OPT_elo2, &ok, FALSE);
+      appData.dateThreshold = GetDlgItemInt(hDlg, OPT_date, &ok, FALSE);
+      appData.searchMode = LoadOptionsWhichRadio(hDlg);
       EndDialog(hDlg, TRUE);
       return TRUE;