X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=dialogs.c;h=6287a91648a9befed162e714fa84c1acaa31f5a9;hb=7e0222e64da6706bf0dc2468f459b98e4346206b;hp=a720a9fd61db06fefd4e604d542b1d677c3c3d13;hpb=87c2133b5e998ff349a7aa2a8eb3026ff958c395;p=xboard.git

diff --git a/dialogs.c b/dialogs.c
index a720a9f..6287a91 100644
--- a/dialogs.c
+++ b/dialogs.c
@@ -48,6 +48,7 @@ extern char *getenv();
 #include <stdint.h>
 
 #include "common.h"
+#include "frontend.h"
 #include "backend.h"
 #include "xboard.h"
 #include "menus.h"
@@ -439,12 +440,6 @@ static Option variantDescriptors[] = {
 { 0, -1, BOARD_RANKS-1, NULL, (void*) &appData.NrRanks, "", NULL, Spin, N_("Number of Board Ranks:") },
 { 0, -1, BOARD_FILES, NULL, (void*) &appData.NrFiles, "", NULL, Spin, N_("Number of Board Files:") },
 { 0, -1, BOARD_RANKS-1, NULL, (void*) &appData.holdingsSize, "", NULL, Spin, N_("Holdings Size:") },
-{ 0, 0, 0, NULL, NULL, NULL, NULL, Label,
-				N_("WARNING: variants with un-orthodox\n"
-				  "pieces only have built-in bitmaps\n"
-				  "for -boardSize middling, bulky and\n"
-				  "petite, and substitute king or amazon\n"
-				  "for missing bitmaps. (See manual.)")},
 { 0, NO_OK, 0, NULL, NULL, "", NULL, EndMark , "" }
 };
 
@@ -484,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);
 }
@@ -810,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 , "" }
@@ -1178,6 +1174,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);
 }
@@ -1405,6 +1402,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 -----------------------------------------
@@ -1461,6 +1459,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 , "" }
 };
 
@@ -1497,7 +1496,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 ||
@@ -1825,10 +1824,12 @@ DisplayFatalError (String message, int error, int status)
 	snprintf(buf, sizeof(buf), "%s: %s", message, strerror(error));
 	message = buf;
     }
-    if (appData.popupExitMessage && boardWidget && XtIsRealized(boardWidget)) {
-      ErrorPopUp(status ? _("Fatal Error") : _("Exiting"), message, TRUE);
-    } else {
-      ExitEvent(status);
+    if(mainOptions[W_BOARD].handle) {
+	if (appData.popupExitMessage) {
+	    ErrorPopUp(status ? _("Fatal Error") : _("Exiting"), message, TRUE);
+	} else {
+	    ExitEvent(status);
+	}
     }
 }