X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwedittags.c;h=b3cf334f722ac0060405a58a7b2f7b81603d562b;hb=e6e38912837a4fe2464356408d10dee950b3121c;hp=e3a868f3cbac644fefbb361b6ae70ee8b928bf17;hpb=7b4dacf6fe9f8c10b6eb4d6070869a3d933dbeb5;p=xboard.git

diff --git a/winboard/wedittags.c b/winboard/wedittags.c
index e3a868f..b3cf334 100644
--- a/winboard/wedittags.c
+++ b/winboard/wedittags.c
@@ -1,7 +1,9 @@
 /*
  * wedittags.c -- EditTags window for WinBoard
  *
- * Copyright 1995,2009 Free Software Foundation, Inc.
+ * Copyright 1995, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
+ *
+ * Enhancements Copyright 2005 Alessandro Scotti
  *
  * ------------------------------------------------------------------------
  *
@@ -33,17 +35,16 @@
 #include <dlgs.h>
 
 #include "common.h"
-#include "winboard.h"
 #include "frontend.h"
 #include "backend.h"
-#include "wedittags.h"
+#include "winboard.h"
+
+#define _(s) T_(s)
 
 /* Module globals */
-static char *editTagsText;
-HWND editTagsDialog = NULL;
+static char *editTagsText, **resPtr;
 BOOL editTagsUp = FALSE;
 BOOL canEditTags = FALSE;
-int editTagsX, editTagsY, editTagsW, editTagsH;
 
 /* Imports from winboard.c */
 extern HINSTANCE hInst;
@@ -64,18 +65,23 @@ EditTagsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
   switch (message) {
   case WM_INITDIALOG: /* message: initialize dialog box */
     /* Initialize the dialog items */
-    hwndText = GetDlgItem(hDlg, OPT_TagsText);
+    Translate(hDlg, DLG_EditTags);
+   hwndText = GetDlgItem(hDlg, OPT_TagsText);
     SendMessage(hwndText, WM_SETFONT, 
       (WPARAM)font[boardSize][EDITTAGS_FONT]->hf, MAKELPARAM(FALSE, 0));
     SetDlgItemText(hDlg, OPT_TagsText, editTagsText);
     EnableWindow(GetDlgItem(hDlg, OPT_TagsCancel), canEditTags);
     EnableWindow(GetDlgItem(hDlg, OPT_EditTags), !canEditTags);
     SendMessage(hwndText, EM_SETREADONLY, !canEditTags, 0);
+    if (bookUp) {
+      SetWindowText(hDlg, _("Edit Book"));
+      SetFocus(hwndText);
+    } else
     if (canEditTags) {
-      SetWindowText(hDlg, "Edit Tags");
+      SetWindowText(hDlg, _("Edit Tags"));
       SetFocus(hwndText);
     } else {
-      SetWindowText(hDlg, "Tags");
+      SetWindowText(hDlg, _("Tags"));
       SetFocus(GetDlgItem(hDlg, IDOK));
     }
     if (!editTagsDialog) {
@@ -84,18 +90,18 @@ EditTagsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
       GetClientRect(hDlg, &rect);
       sizeX = rect.right;
       sizeY = rect.bottom;
-      if (editTagsX != CW_USEDEFAULT && editTagsY != CW_USEDEFAULT &&
-	  editTagsW != CW_USEDEFAULT && editTagsH != CW_USEDEFAULT) {
+      if (wpTags.x != CW_USEDEFAULT && wpTags.y != CW_USEDEFAULT &&
+	  wpTags.width != CW_USEDEFAULT && wpTags.height != CW_USEDEFAULT) {
 	WINDOWPLACEMENT wp;
-	EnsureOnScreen(&editTagsX, &editTagsY, 0, 0);
+	EnsureOnScreen(&wpTags.x, &wpTags.y, 0, 0);
 	wp.length = sizeof(WINDOWPLACEMENT);
 	wp.flags = 0;
 	wp.showCmd = SW_SHOW;
 	wp.ptMaxPosition.x = wp.ptMaxPosition.y = 0;
-	wp.rcNormalPosition.left = editTagsX;
-	wp.rcNormalPosition.right = editTagsX + editTagsW;
-	wp.rcNormalPosition.top = editTagsY;
-	wp.rcNormalPosition.bottom = editTagsY + editTagsH;
+	wp.rcNormalPosition.left = wpTags.x;
+	wp.rcNormalPosition.right = wpTags.x + wpTags.width;
+	wp.rcNormalPosition.top = wpTags.y;
+	wp.rcNormalPosition.bottom = wpTags.y + wpTags.height;
 	SetWindowPlacement(hDlg, &wp);
 
 	GetClientRect(hDlg, &rect);
@@ -112,6 +118,7 @@ EditTagsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
   case WM_COMMAND:
     switch (LOWORD(wParam)) {
     case IDOK:
+    case OPT_TagsSave:
       if (canEditTags) {
 	char *p, *q;
 	/* Read changed options from the dialog box */
@@ -120,18 +127,20 @@ EditTagsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 	GetWindowText(hwndText, str, len + 1);
 	p = q = str;
 	while (*q) {
-	  if (*q == '\r'|| *q == '\n')
+	  if (*q == '\r')
 	    q++;
 	  else
 	    *p++ = *q++;
 	}
-	*p = NULLCHAR;
+	*p = NULLCHAR; err = 0;
+        if(resPtr) *resPtr = strdup(str); else
+	if(bookUp) SaveToBook(str), DisplayBook(currentMove); else
 	err = ReplaceTags(str, &gameInfo);
-	if (err) DisplayError("Error replacing tags.", err);
+	if (err) DisplayError(_("Error replacing tags."), err);
 
 	free(str);
       }
-      TagsPopDown();
+      if(LOWORD(wParam) == IDOK) TagsPopDown();
       return TRUE;
       
     case IDCANCEL:
@@ -169,8 +178,8 @@ EditTagsDialog(HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam)
 VOID TagsPopDown(void)
 {
   if (editTagsDialog) ShowWindow(editTagsDialog, SW_HIDE);
-  CheckMenuItem(GetMenu(hwndMain), IDM_EditTags, MF_UNCHECKED);
-  editTagsUp = FALSE;
+  CheckMenuItem(GetMenu(hwndMain), IDM_Tags, MF_UNCHECKED);
+  editTagsUp = bookUp = FALSE;
 }
 
 
@@ -199,10 +208,11 @@ VOID EitherTagsPopUp(char *tags, char *msg, BOOLEAN edit)
   editTagsText = p;
   canEditTags = edit;
   
-  CheckMenuItem(GetMenu(hwndMain), IDM_EditTags, MF_CHECKED);
+  CheckMenuItem(GetMenu(hwndMain), IDM_Tags, MF_CHECKED);
   if (editTagsDialog) {
     SendMessage(editTagsDialog, WM_INITDIALOG, 0, 0);
     ShowWindow(editTagsDialog, SW_SHOW);
+    if(bookUp) SetFocus(hwndMain);
   } else {
     lpProc = MakeProcInstance((FARPROC)EditTagsDialog, hInst);
     CreateDialog(hInst, MAKEINTRESOURCE(DLG_EditTags),
@@ -219,14 +229,15 @@ VOID TagsPopUp(char *tags, char *msg)
   SetActiveWindow(hwnd);
 }
 
-VOID EditTagsPopUp(char *tags)
+VOID EditTagsPopUp(char *tags, char **dest)
 {
+  resPtr = dest;
   EitherTagsPopUp(tags, "", TRUE);
 }
 
 VOID EditTagsProc()
 {
-  if (editTagsUp) {
+  if (editTagsUp && !bookUp) {
     TagsPopDown();
   } else {
     EditTagsEvent();