X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=db7e249f24bba8ac082f923743523f0092545dfd;hb=21a44c336aa8cd16a38f3c682386528c8f112650;hp=773a30533d476724ee678a96c55e1bb14eddf312;hpb=177f117f792a71a016c3d13e6c45161d0f45dd70;p=xboard.git

diff --git a/dialogs.c b/dialogs.c
index 773a305..db7e249 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"
@@ -478,6 +479,7 @@ Pick (int n)
 void
 NewVariantProc ()
 {
+   if(appData.noChessProgram) sprintf(warning, _("Only bughouse is not available in viewer mode")); else
    sprintf(warning, _("All variants not supported by first engine\n(currently %s) are disabled"), first.tidy);
    GenericPopUp(variantDescriptors, _("New Variant"), TransientDlg, BoardWindow, MODAL, 0);
 }
@@ -804,8 +806,8 @@ static Option boardOptions[] = {
 { 0, 0, 0, NULL, (void*) &appData.monoMode, "", NULL, CheckBox, N_("Mono Mode") },
 { 0,-1, 5, NULL, (void*) &appData.overrideLineGap, "", NULL, Spin, N_("Line Gap ( -1 = default for board size):") },
 { 0, 0, 0, NULL, (void*) &appData.useBitmaps, "", NULL, CheckBox, N_("Use Board Textures") },
-{ 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, ".xpm", NULL, FileName, N_("Light-Squares Texture File:") },
-{ 0, 0, 0, NULL, (void*) &appData.darkBackTextureFile, ".xpm", NULL, FileName, N_("Dark-Squares Texture File:") },
+{ 0, 0, 0, NULL, (void*) &appData.liteBackTextureFile, ".png", NULL, FileName, N_("Light-Squares Texture File:") },
+{ 0, 0, 0, NULL, (void*) &appData.darkBackTextureFile, ".png", NULL, FileName, N_("Dark-Squares Texture File:") },
 { 0, 0, 0, NULL, (void*) &appData.trueColors, "", NULL, CheckBox, N_("Use external piece bitmaps with their own colors") },
 { 0, 0, 0, NULL, (void*) &appData.pieceDirectory, "", NULL, PathName, N_("Directory with Pieces Images:") },
 { 0, 0, 0, NULL, (void*) &BoardOptionsOK, "", NULL, EndMark , "" }
@@ -1013,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;
@@ -1172,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);
 }
@@ -1399,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 -----------------------------------------
@@ -1455,6 +1484,7 @@ static Option promoOptions[] = {
 {   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
 {   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
 {   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
+{   0,  SAME_ROW,    0, NULL, (void*) &PromoPick, NULL, NULL, Button, NULL },
 {   0, SAME_ROW | NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" }
 };
 
@@ -1491,7 +1521,7 @@ SetPromo (char *name, int nr, char promoChar)
 void
 PromotionPopUp ()
 { // choice depends on variant: prepare dialog acordingly
-  count = 7;
+  count = 8;
   SetPromo(_("Cancel"), --count, 0); // Beware: GenericPopUp cannot handle user buttons named "cancel" (lowe case)!
   if(gameInfo.variant != VariantShogi) {
     if (!appData.testLegality || gameInfo.variant == VariantSuicide ||