X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=3e889d8d0a7a1c99810d07e9dea82a9d6f331b16;hb=c29f3526dee9ab2774d7a6e9958ce145c2cd1187;hp=12bd08553d4c4a6b0cf173d71289f62157b4be12;hpb=3191ebfd542da1644e44baf91b6a315359aeefaa;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 12bd085..3e889d8 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -248,7 +248,7 @@ Boolean barbaric; // flag indicating if translation is needed
 #define ABOUTBOX2 -1
 
 int dialogItems[][40] = {
-{ ABOUTBOX, IDOK, 400 }, 
+{ ABOUTBOX, IDOK, OPT_MESS, 400 }, 
 { DLG_TimeControl, IDC_Babble, OPT_TCUseMoves, OPT_TCUseInc, OPT_TCUseFixed, 
   OPT_TCtext1, OPT_TCtext2, OPT_TCitext1, OPT_TCitext2, OPT_TCftext, GPB_Factors,   IDC_Factor1, IDC_Factor2, IDOK, IDCANCEL }, 
 { DLG_LoadOptions, OPT_Autostep, OPT_AStext1, IDOK, IDCANCEL }, 
@@ -282,7 +282,7 @@ int dialogItems[][40] = {
   OPT_AutoFlipView, OPT_ShowButtonBar, OPT_AutoRaiseBoard, OPT_ShowCoordinates,
   OPT_Blindfold, OPT_ShowThinking, OPT_HighlightDragging, OPT_TestLegality,
   OPT_SaveExtPGN, OPT_HideThinkFromHuman, OPT_ExtraInfoInMoveHistory,
-  OPT_HighlightMoveArrow, OPT_AutoLogo }, 
+  OPT_HighlightMoveArrow, OPT_AutoLogo ,OPT_SmartMove }, 
 { DLG_IcsOptions, IDOK, IDCANCEL, OPT_AutoComment, OPT_AutoKibitz, OPT_AutoObserve,
   OPT_GetMoveList, OPT_LocalLineEditing, OPT_QuietPlay, OPT_SeekGraph, OPT_AutoRefresh,
   OPT_BgObserve, OPT_DualBoard, OPT_Premove, OPT_PremoveWhite, OPT_PremoveBlack,
@@ -398,13 +398,11 @@ Translate(HWND hDlg, int dialogID)
 {   // translate all text items in the given dialog
     int i=0, j, k;
     char buf[MSG_SIZ], *s;
-//if(appData.debugMode) fprintf(debugFP, "Translate(%d)\n", dialogID);
     if(!barbaric) return;
     while(dialogItems[i][0] && dialogItems[i][0] != dialogID) i++; // find the dialog description
     if(dialogItems[i][0] != dialogID) return; // unknown dialog, should not happen
     GetWindowText( hDlg, buf, MSG_SIZ );
     s = T_(buf);
-//if(appData.debugMode) fprintf(debugFP, "WindowText '%s' -> '%s'\n", buf, s);
     if(strcmp(buf, s)) SetWindowText(hDlg, s); // replace by translated string (if different)
     for(j=1; k=dialogItems[i][j]; j++) { // translate all listed dialog items
         GetDlgItemText(hDlg, k, buf, MSG_SIZ);
@@ -414,10 +412,35 @@ Translate(HWND hDlg, int dialogID)
     }
 }
 
+HMENU
+TranslateOneMenu(int i, HMENU subMenu)
+{
+    int j;
+    static MENUITEMINFO info;
+
+    info.cbSize = sizeof(MENUITEMINFO);
+    info.fMask = MIIM_STATE | MIIM_TYPE;
+          for(j=GetMenuItemCount(subMenu)-1; j>=0; j--){
+            char buf[MSG_SIZ];
+            info.dwTypeData = buf;
+            info.cch = sizeof(buf);
+            GetMenuItemInfo(subMenu, j, TRUE, &info);
+            if(i < 10) {
+                if(menuText[i][j]) safeStrCpy(buf, menuText[i][j], sizeof(buf)/sizeof(buf[0]) );
+                else menuText[i][j] = strdup(buf); // remember original on first change
+            }
+            if(buf[0] == NULLCHAR) continue;
+            info.dwTypeData = T_(buf);
+            info.cch = strlen(buf)+1;
+            SetMenuItemInfo(subMenu, j, TRUE, &info);
+          }
+    return subMenu;
+}
+
 void
 TranslateMenus(int addLanguage)
 {
-    int i, j;
+    int i;
     WIN32_FIND_DATA fileData;
     HANDLE hFind;
 #define IDM_English 1895
@@ -427,20 +450,7 @@ TranslateMenus(int addLanguage)
           HMENU subMenu = GetSubMenu(mainMenu, i);
           ModifyMenu(mainMenu, i, MF_STRING|MF_BYPOSITION|MF_POPUP|EnableMenuItem(mainMenu, i, MF_BYPOSITION),
                                                                   (UINT) subMenu, T_(menuBarText[tinyLayout][i]));
-          for(j=GetMenuItemCount(subMenu)-1; j>=0; j--){
-            char buf[MSG_SIZ];
-            UINT k = GetMenuItemID(subMenu, j);
-	      if(menuText[i][j])
-		safeStrCpy(buf, menuText[i][j], sizeof(buf)/sizeof(buf[0]) ); else {
-                GetMenuString(subMenu, j, buf, MSG_SIZ, MF_BYPOSITION);
-                menuText[i][j] = strdup(buf); // remember original on first change
-            }
-            if(buf[0] == NULLCHAR) continue;
-//fprintf(debugFP, "menu(%d,%d) = %s (%08x, %08x) %d\n", i, j, buf, mainMenu, subMenu, k);
-            ModifyMenu(subMenu, j, MF_STRING|MF_BYPOSITION
-                                   |CheckMenuItem(subMenu, j, MF_BYPOSITION)
-                                   |EnableMenuItem(subMenu, j, MF_BYPOSITION), k, T_(buf));
-          }
+          TranslateOneMenu(i, subMenu);
         }
         DrawMenuBar(hwndMain);
     }
@@ -756,6 +766,7 @@ WinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance,
   }
 
   JAWS_INIT
+  TranslateMenus(1);
 
 //  InitCommonControlsEx(&ex);
   InitCommonControls();
@@ -884,6 +895,8 @@ SetUserLogo()
 	    snprintf(oldUserName, MSG_SIZ, "logos\\%s.bmp", curName);
 		userLogo = LoadImage( 0, oldUserName, IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
 		safeStrCpy(oldUserName, curName, sizeof(oldUserName)/sizeof(oldUserName[0]) );
+		if(userLogo == NULL)
+		    userLogo = LoadImage( 0, "logos\\dummy.bmp", IMAGE_BITMAP, 0, 0, LR_LOADFROMFILE );	
 	  }
     }
 }
@@ -1048,7 +1061,6 @@ InitInstance(HINSTANCE hInstance, int nCmdShow, LPSTR lpCmdLine)
   }
 
   InitDrawingSizes(boardSize, 0);
-  TranslateMenus(1);
   InitMenuChecks();
   buttonCount = GetSystemMetrics(SM_CMOUSEBUTTONS);
 
@@ -4904,11 +4916,13 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_EditGame:
+    case IDM_EditGame2:
       EditGameEvent();
       SAY("edit game");
       break;
 
     case IDM_EditPosition:
+    case IDM_EditPosition2:
       EditPositionEvent();
       SAY("enter a FEN string or setup a position on the board using the control R pop up menu");
       break;
@@ -4921,6 +4935,18 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       ShowGameListProc();
       break;
 
+    case IDM_EditProgs1:
+      EditTagsPopUp(firstChessProgramNames, &firstChessProgramNames);
+      break;
+
+    case IDM_EditProgs2:
+      EditTagsPopUp(secondChessProgramNames, &secondChessProgramNames);
+      break;
+
+    case IDM_EditServers:
+      EditTagsPopUp(icsNames, &icsNames);
+      break;
+
     case IDM_EditTags:
     case IDM_Tags:
       EditTagsProc();
@@ -5790,6 +5816,7 @@ MenuPopup(HWND hwnd, POINT pt, HMENU hmenu, UINT def)
    * menu that TrackPopupMenu displays.
    */
   hmenuTrackPopup = GetSubMenu(hmenu, 0);
+  TranslateOneMenu(10, hmenuTrackPopup);
 
   SetMenuDefaultItem(hmenuTrackPopup, def, FALSE);
 
@@ -6874,7 +6901,8 @@ ConsoleTextSubclass(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       SendMessage(hInput, message, wParam, lParam);
     }
     return 0;
-   } // [HGM] navigate: for Ctrl+R, flow into nex case (moved up here) to summon up menu
+   } // [HGM] navigate: for Ctrl+R, flow into next case (moved up here) to summon up menu
+   lParam = -1;
   case WM_RBUTTONDOWN:
     if (!(GetKeyState(VK_SHIFT) & ~1)) {
       /* Move selection here if it was empty */
@@ -6883,7 +6911,7 @@ ConsoleTextSubclass(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       pt.y = HIWORD(lParam);
       SendMessage(hwnd, EM_EXGETSEL, 0, (LPARAM)&sel);
       if (sel.cpMin == sel.cpMax) {
-        sel.cpMin = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&pt); /*doc is wrong*/
+        if(lParam != -1) sel.cpMin = SendMessage(hwnd, EM_CHARFROMPOS, 0, (LPARAM)&pt); /*doc is wrong*/
 	sel.cpMax = sel.cpMin;
 	SendMessage(hwnd, EM_EXSETSEL, 0, (LPARAM)&sel);
       }