From: H.G. Muller <h.g.muller@hccnet.nl>
Date: Tue, 23 Aug 2011 19:24:23 +0000 (+0200)
Subject: Replace Analyze File by Analyz Game function
X-Git-Url: http://winboard.nl/cgi-bin?a=commitdiff_plain;h=20da18ecff230e9460827a80d4c2608da12190fa;p=xboard.git

Replace Analyze File by Analyz Game function
---

diff --git a/backend.c b/backend.c
index 79614cc..12931a7 100644
--- a/backend.c
+++ b/backend.c
@@ -12881,6 +12881,7 @@ AnalyzeFileEvent()
     StartAnalysisClock();
     GetTimeMark(&lastNodeCountTime);
     lastNodeCount = 0;
+    if(appData.timeDelay > 0) StartLoadGameTimer((long)(1000.0 * appData.timeDelay));
 }
 
 void
diff --git a/winboard/winboard.c b/winboard/winboard.c
index 3423ebd..223a6f8 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -4925,7 +4925,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       } else {
 	if (!appData.showThinking) ToggleShowThinking();
 	AnalyzeFileEvent();
-	LoadGameDialog(hwnd, _("Analyze Game from File"));
+//	LoadGameDialog(hwnd, _("Analyze Game from File"));
 	AnalysisPeriodicEvent(1);
       }
       break;
diff --git a/winboard/winboard.rc b/winboard/winboard.rc
index ee9c2a1..19621f2 100644
--- a/winboard/winboard.rc
+++ b/winboard/winboard.rc
@@ -1206,7 +1206,7 @@ BEGIN
         MENUITEM "&Two Machines\tCtrl+T",       IDM_TwoMachines
 //        MENUITEM "Machine Both",                IDM_MachineBoth
         MENUITEM "&Analysis Mode\tCtrl+A",      IDM_AnalysisMode
-        MENUITEM "Analyze &File\tCtrl+F",       IDM_AnalyzeFile
+        MENUITEM "Analyze &Game\tCtrl+G",       IDM_AnalyzeFile
         MENUITEM "&Edit Game\tCtrl+E",          IDM_EditGame
         MENUITEM "E&dit Position\tCtrl+Shift+E",IDM_EditPosition
         MENUITEM "Trai&ning",                   IDM_Training, GRAYED
@@ -1473,7 +1473,7 @@ BEGIN
     "T",            IDM_TwoMachines,        VIRTKEY, CONTROL, NOINVERT
     "E",            IDM_EditGame,           VIRTKEY, CONTROL, NOINVERT
     "E",            IDM_EditPosition,       VIRTKEY, SHIFT, CONTROL, NOINVERT
-    "F",            IDM_AnalyzeFile,        VIRTKEY, CONTROL, NOINVERT
+    "G",            IDM_AnalyzeFile,        VIRTKEY, CONTROL, NOINVERT
     "M",            IDM_MoveNow,            VIRTKEY, CONTROL, NOINVERT
     "X",            IDM_RetractMove,        VIRTKEY, CONTROL, NOINVERT
     VK_DOWN,        IDM_ToEnd,              VIRTKEY, ALT, NOINVERT
diff --git a/xboard.c b/xboard.c
index 033c53b..4a88774 100644
--- a/xboard.c
+++ b/xboard.c
@@ -683,7 +683,7 @@ MenuItem modeMenu[] = {
     {N_("Machine Black  Ctrl+B"), "Machine Black", MachineBlackProc},
     {N_("Two Machines   Ctrl+T"), "Two Machines", TwoMachinesProc},
     {N_("Analysis Mode  Ctrl+A"), "Analysis Mode", AnalyzeModeProc},
-    {N_("Analyze File      Ctrl+F"), "Analyze File", AnalyzeFileProc },
+    {N_("Analyze Game   Ctrl+G"), "Analyze File", AnalyzeFileProc },
     {N_("Edit Game         Ctrl+E"), "Edit Game", EditGameProc},
     {N_("Edit Position      Ctrl+Shift+E"), "Edit Position", EditPositionProc},
     {N_("Training"),      "Training", TrainingProc},
@@ -1067,7 +1067,7 @@ char globalTranslations[] =
    :Ctrl<Key>b: MachineBlackProc() \n \
    :Ctrl<Key>t: TwoMachinesProc() \n \
    :Ctrl<Key>a: AnalysisModeProc() \n \
-   :Ctrl<Key>f: AnalyzeFileProc() \n \
+   :Ctrl<Key>g: AnalyzeFileProc() \n \
    :Ctrl<Key>e: EditGameProc() \n \
    :Ctrl<Key>E: EditPositionProc() \n \
    :Meta<Key>O: EngineOutputProc() \n \
@@ -5939,13 +5939,13 @@ void AnalyzeFileProc(w, event, prms, nprms)
       DisplayError(buf, 0);
       return;
     }
-    Reset(FALSE, TRUE);
+//    Reset(FALSE, TRUE);
 #ifndef OPTIONSDIALOG
     if (!appData.showThinking)
       ShowThinkingProc(w,event,prms,nprms);
 #endif
     AnalyzeFileEvent();
-    FileNamePopUp(_("File to analyze"), "", ".pgn .game", LoadGamePopUp, "rb");
+//    FileNamePopUp(_("File to analyze"), "", ".pgn .game", LoadGamePopUp, "rb");
     AnalysisPeriodicEvent(1);
 }