X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=a0e22845b8bcbdca6e57c5c1af17bdafdee05fc7;hb=12921be07acd4ac78e94a1c5699f1183f76b1c93;hp=fcadd27f1984cfae3c312c49170838e7942e750e;hpb=9c7cb89d6ae88edc97bc99e51fb6779ddf6e33b8;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index fcadd27..a0e2284 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -334,7 +334,7 @@ static char languageBuf[50000], *foreign[1000], *english[1000], *languageFile[MS
 static int lastChecked;
 static char oldLanguage[MSG_SIZ], *menuText[10][30];
 extern int tinyLayout;
-extern char * menuBarText[][8];
+extern char * menuBarText[][10];
 
 void
 LoadLanguageFile(char *name)
@@ -549,10 +549,10 @@ MyButtonDesc buttonDesc[N_BUTTONS] =
 };
 
 int tinyLayout = 0, smallLayout = 0;
-#define MENU_BAR_ITEMS 7
+#define MENU_BAR_ITEMS 9
 char *menuBarText[2][MENU_BAR_ITEMS+1] = {
-  { N_("&File"), N_("&Mode"), N_("&Action"), N_("&Step"), N_("&Options"), N_("&Help"), NULL },
-  { N_("&F"), N_("&M"), N_("&A"), N_("&S"), N_("&O"), N_("&H"), NULL },
+  { N_("&File"), N_("&Edit"), N_("&View"), N_("&Mode"), N_("&Action"), N_("E&ngine"), N_("&Options"), N_("&Help"), NULL },
+  { N_("&F"), N_("&E"), N_("&V"), N_("&M"), N_("&A"), N_("&N"), N_("&O"), N_("&H"), NULL },
 };
 
 
@@ -2486,14 +2486,24 @@ InitDrawingSizes(BoardSize boardSize, int flags)
       pieceBitmap[1][WhiteLance] = DoLoadBitmap(hInst, "l", squareSize, "o");
       pieceBitmap[2][WhiteLance] = DoLoadBitmap(hInst, "l", squareSize, "w");
     } else { // Smirf-like
-      pieceBitmap[0][WhiteAngel] = DoLoadBitmap(hInst, "aa", squareSize, "s");
-      pieceBitmap[1][WhiteAngel] = DoLoadBitmap(hInst, "aa", squareSize, "o");
-      pieceBitmap[2][WhiteAngel] = DoLoadBitmap(hInst, "aa", squareSize, "w");
+      if(gameInfo.variant == VariantSChess) {
+        pieceBitmap[0][WhiteAngel] = DoLoadBitmap(hInst, "v", squareSize, "s");
+        pieceBitmap[1][WhiteAngel] = DoLoadBitmap(hInst, "v", squareSize, "o");
+        pieceBitmap[2][WhiteAngel] = DoLoadBitmap(hInst, "v", squareSize, "w");
+      } else {
+        pieceBitmap[0][WhiteAngel] = DoLoadBitmap(hInst, "aa", squareSize, "s");
+        pieceBitmap[1][WhiteAngel] = DoLoadBitmap(hInst, "aa", squareSize, "o");
+        pieceBitmap[2][WhiteAngel] = DoLoadBitmap(hInst, "aa", squareSize, "w");
+      }
     }
     if(gameInfo.variant == VariantGothic) { // Vortex-like
       pieceBitmap[0][WhiteMarshall] = DoLoadBitmap(hInst, "cv", squareSize, "s");
       pieceBitmap[1][WhiteMarshall] = DoLoadBitmap(hInst, "cv", squareSize, "o");
       pieceBitmap[2][WhiteMarshall] = DoLoadBitmap(hInst, "cv", squareSize, "w");
+    } else if(gameInfo.variant == VariantSChess && (squareSize == 49 || squareSize == 72)) {
+      pieceBitmap[0][WhiteMarshall] = DoLoadBitmap(hInst, "e", squareSize, "s");
+      pieceBitmap[1][WhiteMarshall] = DoLoadBitmap(hInst, "e", squareSize, "o");
+      pieceBitmap[2][WhiteMarshall] = DoLoadBitmap(hInst, "e", squareSize, "w");
     } else { // WinBoard standard
       pieceBitmap[0][WhiteMarshall] = DoLoadBitmap(hInst, "c", squareSize, "s");
       pieceBitmap[1][WhiteMarshall] = DoLoadBitmap(hInst, "c", squareSize, "o");
@@ -4297,12 +4307,11 @@ Promotion(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
     ShowWindow(GetDlgItem(hDlg, PB_Bishop), 
        gameInfo.variant != VariantShogi ?
 	       SW_SHOW : SW_HIDE);
-    ShowWindow(GetDlgItem(hDlg, IDC_Yes), 
-       gameInfo.variant == VariantShogi ?
-	       SW_SHOW : SW_HIDE);
-    ShowWindow(GetDlgItem(hDlg, IDC_No), 
-       gameInfo.variant == VariantShogi ?
-	       SW_SHOW : SW_HIDE);
+    if(gameInfo.variant == VariantShogi) {
+        SetDlgItemText(hDlg, PB_Queen, "YES");
+        SetDlgItemText(hDlg, PB_Knight, "NO");
+        SetWindowText(hDlg, "Promote?");
+    }
     ShowWindow(GetDlgItem(hDlg, IDC_Centaur), 
        gameInfo.variant == VariantSuper ?
 	       SW_SHOW : SW_HIDE);
@@ -4818,7 +4827,9 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_Match: // [HGM] match: flows into next case, after setting Match Mode and nr of Games
-      if(gameMode != BeginningOfGame) break; // allow menu item to remain enabled for better mode highligting
+      if(gameMode != BeginningOfGame) { // allow menu item to remain enabled for better mode highligting
+        DisplayError(_("You can only start a match from the initial position."), 0); break;
+      }
       matchMode = 2;// distinguish from command-line-triggered case (matchMode=1)
       appData.matchGames = appData.defaultMatchGames;
       matchGame = 1;
@@ -4909,10 +4920,12 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_EditTags:
+    case IDM_Tags:
       EditTagsProc();
       break;
 
     case IDM_EditComment:
+    case IDM_Comment:
       if (commentUp && editComment) {
 	CommentPopDown();
       } else {
@@ -6312,7 +6325,7 @@ EitherCommentPopUp(int index, char *title, char *str, BOOLEAN edit)
   FARPROC lpProc;
   char *p, *q;
 
-  CheckMenuItem(GetMenu(hwndMain), IDM_EditComment, edit ? MF_CHECKED : MF_UNCHECKED);
+  CheckMenuItem(GetMenu(hwndMain), IDM_Comment, edit ? MF_CHECKED : MF_UNCHECKED);
 
   if (str == NULL) str = "";
   p = (char *) malloc(2 * strlen(str) + 2);
@@ -7798,6 +7811,7 @@ Enables ncpEnables[] = {
 
 Enables trainingOnEnables[] = {
   { IDM_EditComment, MF_BYCOMMAND|MF_GRAYED },
+  { IDM_Comment, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Pause, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Forward, MF_BYCOMMAND|MF_GRAYED },
   { IDM_Backward, MF_BYCOMMAND|MF_GRAYED },
@@ -7810,6 +7824,7 @@ Enables trainingOnEnables[] = {
 
 Enables trainingOffEnables[] = {
   { IDM_EditComment, MF_BYCOMMAND|MF_ENABLED },
+  { IDM_Comment, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Pause, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Forward, MF_BYCOMMAND|MF_ENABLED },
   { IDM_Backward, MF_BYCOMMAND|MF_ENABLED },
@@ -8507,7 +8522,7 @@ CommentPopUp(char *title, char *str)
 VOID
 CommentPopDown(void)
 {
-  CheckMenuItem(GetMenu(hwndMain), IDM_EditComment, MF_UNCHECKED);
+  CheckMenuItem(GetMenu(hwndMain), IDM_Comment, MF_UNCHECKED);
   if (commentDialog) {
     ShowWindow(commentDialog, SW_HIDE);
   }