X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwoptions.c;h=0f035b93db102f8880ecb6da5b4bcfcb9758da38;hb=0e26c6ad0a2958900703e77da3fdbe7fabfa620c;hp=fd0ac4c52b65c6bf2d92688b42c4b05a96b98668;hpb=31a03160a3ed3b95ce90ac4b704fe0e2ea784425;p=xboard.git

diff --git a/winboard/woptions.c b/winboard/woptions.c
index fd0ac4c..0f035b9 100644
--- a/winboard/woptions.c
+++ b/winboard/woptions.c
@@ -131,7 +131,6 @@ void SelectComboValue(HANDLE hwndCombo, ComboData *cd, unsigned value);
 VOID SetLoadOptionEnables(HWND hDlg);
 VOID SetSaveOptionEnables(HWND hDlg);
 VOID SetTimeControlEnables(HWND hDlg);
-void NewSettingEvent(int option, char *command, int value);
 
 /*---------------------------------------------------------------------------*\
  *
@@ -146,12 +145,14 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
   static Boolean oldShowCoords;
   static Boolean oldBlindfold;
   static Boolean oldShowButtonBar;
+  static Boolean oldAutoLogo;
 
   switch (message) {
   case WM_INITDIALOG: /* message: initialize dialog box */
     oldShowCoords = appData.showCoords;
     oldBlindfold  = appData.blindfold;
     oldShowButtonBar = appData.showButtonBar;
+    oldAutoLogo  = appData.autoLogo;
 
     /* Center the dialog over the application window */
     CenterWindow (hDlg, GetWindow (hDlg, GW_OWNER));
@@ -181,6 +182,7 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     CHECK_BOX(OPT_SaveExtPGN, appData.saveExtendedInfoInPGN);
     CHECK_BOX(OPT_ExtraInfoInMoveHistory, appData.showEvalInMoveHistory);
     CHECK_BOX(OPT_HighlightMoveArrow, appData.highlightMoveWithArrow);
+    CHECK_BOX(OPT_AutoLogo, appData.autoLogo); // [HGM] logo
 
 #undef CHECK_BOX
 
@@ -228,6 +230,7 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       ShowThinkingEvent(); // [HGM] thinking: tests four options
       appData.testLegality         = IS_CHECKED(OPT_TestLegality);
       appData.highlightMoveWithArrow=IS_CHECKED(OPT_HighlightMoveArrow);
+      appData.autoLogo             =IS_CHECKED(OPT_AutoLogo); // [HGM] logo
 
 #undef IS_CHECKED
 
@@ -249,7 +252,10 @@ GeneralOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
        */
       EndDialog(hDlg, TRUE);
 
-      if (oldShowButtonBar != appData.showButtonBar) {
+      if (oldAutoLogo != appData.autoLogo) { // [HGM] logo: remove any logos when we switch autologo off
+	if(oldAutoLogo) first.programLogo = second.programLogo = NULL;
+	InitDrawingSizes(boardSize, 0);
+      } else if (oldShowButtonBar != appData.showButtonBar) {
 	InitDrawingSizes(boardSize, 0);
       } else if ((oldShowCoords != appData.showCoords) || 
 		 (oldBlindfold != appData.blindfold)) {
@@ -1170,6 +1176,7 @@ IcsOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     /* Initialize the dialog items */
 #define CHECK_BOX(x,y) CheckDlgButton(hDlg, (x), (BOOL)(y))
 
+    CHECK_BOX(OPT_AutoKibitz, appData.autoKibitz);
     CHECK_BOX(OPT_AutoComment, appData.autoComment);
     CHECK_BOX(OPT_AutoObserve, appData.autoObserve);
     CHECK_BOX(OPT_GetMoveList, appData.getMoveList);
@@ -1254,6 +1261,7 @@ IcsOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       appData.premove          = IS_CHECKED(OPT_Premove);
       appData.premoveWhite     = IS_CHECKED(OPT_PremoveWhite);
       appData.premoveBlack     = IS_CHECKED(OPT_PremoveBlack);
+      appData.autoKibitz       = IS_CHECKED(OPT_AutoKibitz);
       appData.autoComment      = IS_CHECKED(OPT_AutoComment);
       appData.autoObserve      = IS_CHECKED(OPT_AutoObserve);
       appData.getMoveList      = IS_CHECKED(OPT_GetMoveList);
@@ -2910,6 +2918,9 @@ LRESULT CALLBACK UciOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM
     // [HGM] book: tick boxes for own book use
     CheckDlgButton( hDlg, IDC_OwnBook1, (BOOL) appData.firstHasOwnBookUCI );
     CheckDlgButton( hDlg, IDC_OwnBook2, (BOOL) appData.secondHasOwnBookUCI );
+    SetDlgItemInt( hDlg, IDC_BookDep, appData.bookDepth, TRUE );
+    SetDlgItemInt( hDlg, IDC_BookStr, appData.bookStrength, TRUE );
+    SetDlgItemInt( hDlg, IDC_Games, appData.defaultMatchGames, TRUE );
 
     SendDlgItemMessage( hDlg, IDC_PolyglotDir, EM_SETSEL, 0, -1 );
 
@@ -2930,10 +2941,13 @@ LRESULT CALLBACK UciOptionsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM
       // [HGM] smp: get nr of cores:
       oldCores = appData.smpCores;
       appData.smpCores = GetDlgItemInt(hDlg, IDC_Cores, NULL, FALSE );
-      if(appData.smpCores != oldCores) NewSettingEvent(FALSE, "cores", appData.smpCores);
+      if(appData.smpCores != oldCores) NewSettingEvent(FALSE, &(first.maxCores), "cores", appData.smpCores);
       // [HGM] book: read tick boxes for own book use
       appData.firstHasOwnBookUCI  = (Boolean) IsDlgButtonChecked( hDlg, IDC_OwnBook1 );
       appData.secondHasOwnBookUCI = (Boolean) IsDlgButtonChecked( hDlg, IDC_OwnBook2 );
+      appData.bookDepth = GetDlgItemInt(hDlg, IDC_BookDep, NULL, FALSE );
+      appData.bookStrength = GetDlgItemInt(hDlg, IDC_BookStr, NULL, FALSE );
+      appData.defaultMatchGames = GetDlgItemInt(hDlg, IDC_Games, NULL, FALSE );
 
       if(gameMode == BeginningOfGame) Reset(TRUE, TRUE);
       EndDialog(hDlg, TRUE);