X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=ca2bd12ca4c9899d540c69456b6d79c2065597c2;hb=0a3919ff10a347a8d840f75fd2c816efe52e5098;hp=af767e505c798f797cb1ec3420260306124b1585;hpb=1cab74f1ba222cbeac2696eb4f827f056328b4ba;p=xboard.git

diff --git a/dialogs.c b/dialogs.c
index af767e5..ca2bd12 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -48,8 +48,9 @@ extern char *getenv();
 #include <stdint.h>
 
 #include "common.h"
+#include "frontend.h"
 #include "backend.h"
-#include "xboard.h"
+#include "xboard2.h"
 #include "menus.h"
 #include "dialogs.h"
 #include "gettext.h"
@@ -327,7 +328,7 @@ AddToTourney (int n, int sel)
     }
     nr = NamesToList(firstChessProgramNames, engineList, engineMnemonic, buf); // replace list by only the group contents
     ASSIGN(engineMnemonic[0], buf);
-    LoadListBox(&matchOptions[8], _("# no engines are installed"));
+    LoadListBox(&matchOptions[8], _("# no engines are installed"), -1, -1);
     HighlightWithScroll(&matchOptions[8], 0, nr);
 }
 
@@ -1014,6 +1015,31 @@ NewTagsPopup (char *text, char *msg)
     GenericPopUp(tagsOptions, title, TagsDlg, BoardWindow, NONMODAL, 1);
 }
 
+void
+TagsPopUp (char *tags, char *msg)
+{
+    NewTagsPopup(tags, cmailMsgLoaded ? msg : NULL);
+}
+
+void
+EditTagsPopUp (char *tags, char **dest)
+{   // wrapper to preserve old name used in back-end
+    NewTagsPopup(tags, NULL);
+}
+
+void
+TagsPopDown()
+{
+    PopDown(TagsDlg);
+    bookUp = False;
+}
+
+void
+EditTagsProc ()
+{
+  if (bookUp || !PopDown(TagsDlg)) EditTagsEvent();
+}
+
 //---------------------------------------------- ICS Input Box ----------------------------------
 
 char *icsText;
@@ -1173,6 +1199,7 @@ BoxAutoPopUp (char *buf)
 void
 SettingsPopUp (ChessProgramState *cps)
 {
+   if(!cps->nrOptions) { DisplayNote(_("Engine has no options")); return; }
    currentCps = cps;
    GenericPopUp(cps->option, _("Engine Settings"), TransientDlg, BoardWindow, MODAL, 0);
 }
@@ -1241,7 +1268,7 @@ EngSel (int n, int sel)
     }
     nr = NamesToList(firstChessProgramNames, engineList, engineMnemonic, buf); // replace list by only the group contents
     ASSIGN(engineMnemonic[0], buf);
-    LoadListBox(&installOptions[1], _("# no engines are installed"));
+    LoadListBox(&installOptions[1], _("# no engines are installed"), -1, -1);
     HighlightWithScroll(&installOptions[1], 0, nr);
 }
 
@@ -1400,6 +1427,7 @@ TimeControlProc ()
    tmpOdds1 = tmpOdds2 = 1; tcType = 0;
    tmpTc = atoi(appData.timeControl);
    GenericPopUp(tcOptions, _("Time Control"), TransientDlg, BoardWindow, MODAL, 0);
+   SetTcType(searchTime ? 2 : appData.timeIncrement < 0 ? 0 : 1);
 }
 
 //------------------------------- Ask Question -----------------------------------------
@@ -1689,17 +1717,19 @@ GLT_Button (int n)
         if(index >= strlen(GLT_ALL_TAGS)) return;
 	strings[index] = strings[index+1];
 	strings[++index] = p;
+      LoadListBox(&listOptions[0], "?", index, index-1); // only change the two specified entries
     } else
     if (n == 2) {
         if(index == 0) return;
 	strings[index] = strings[index-1];
 	strings[--index] = p;
+      LoadListBox(&listOptions[0], "?", index, index+1);
     } else
     if (n == 1) {
       safeStrCpy(lpUserGLT, GLT_DEFAULT_TAGS, LPUSERGLT_SIZE);
       GLT_TagsToList(lpUserGLT);
       index = 0;
-      LoadListBox(&listOptions[0], "?"); // Note: the others don't need this, as the highlight switching redraws the change items
+      LoadListBox(&listOptions[0], "?", -1, -1);
     }
     HighlightListBoxItem(&listOptions[0], index);
 }
@@ -1983,7 +2013,7 @@ CCB (int n)
 }
 
 Option mainOptions[] = { // description of main window in terms of generic dialog creator
-{ 0, 0xCA, 0, NULL, NULL, "", NULL, BoxBegin, "" }, // menu bar
+{ 0, 0xCA, 0, NULL, NULL, "", NULL, BarBegin, "" }, // menu bar
   { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("File") },
   { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Edit") },
   { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("View") },
@@ -1992,7 +2022,7 @@ Option mainOptions[] = { // description of main window in terms of generic dialo
   { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Engine") },
   { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Options") },
   { 0, COMBO_CALLBACK, 0, NULL, (void*)&MenuCallback, NULL, NULL, DropDown, N_("Help") },
-{ 0, 0, 0, NULL, (void*)&SizeKludge, "", NULL, BoxEnd, "" },
+{ 0, 0, 0, NULL, (void*)&SizeKludge, "", NULL, BarEnd, "" },
 { 0, LR|T2T|BORDER|SAME_ROW, 0, NULL, NULL, "", NULL, Label, "1" }, // optional title in window
 { 50,    LL|TT,            100, NULL, (void*) &LogoW, NULL, NULL, -1, "LogoW" }, // white logo
 {  0,   L2L|T2T,           200, NULL, (void*) &CCB, NULL, NULL, Label, "White" }, // white clock
@@ -2394,8 +2424,8 @@ void
 Refresh (int pathFlag)
 {
     ListDir(pathFlag); // and make new one
-    LoadListBox(&browseOptions[5], "");
-    LoadListBox(&browseOptions[6], "");
+    LoadListBox(&browseOptions[5], "", -1, -1);
+    LoadListBox(&browseOptions[6], "", -1, -1);
     SetWidgetLabel(&browseOptions[0], title);
 }
 
@@ -2419,7 +2449,7 @@ Switch (int n)
     if(byExtension == (n == 4)) return;
     extFlag = byExtension = (n == 4);
     qsort((void*)fileList, filePtr, sizeof(char*), &Comp);
-    LoadListBox(&browseOptions[6], "");
+    LoadListBox(&browseOptions[6], "", -1, -1);
 }
 
 void