X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwsettings.c;h=2cb488eece908fc8d4cbbb6ccddae5816e4397dd;hb=bd85ed7a2aac57e6afa8fdab7f3a13ce22910b18;hp=dbfecfe26fac3b457da0158c529cf1229c8f7490;hpb=74506c0e852b35465c651f331e010ca7e60e7dd3;p=xboard.git

diff --git a/winboard/wsettings.c b/winboard/wsettings.c
index dbfecfe..2cb488e 100644
--- a/winboard/wsettings.c
+++ b/winboard/wsettings.c
@@ -472,12 +472,12 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
 		if(j == -2) {
 		          char filter[] =
 				"All files\0*.*\0Game files\0*.pgn;*.gam\0Position files\0*.fen;*.epd;*.pos\0"
-				"EXE files\0*.exe\0Tournament files (*.trn)\0*.trn\0"
+				"EXE files\0*.exe;*.jar\0Tournament files (*.trn)\0*.trn\0"
 				"BIN Files\0*.bin\0LOG Files\0*.log\0INI Files\0*.ini\0"
 				"Image files\0*.bmp\0\0";
 		          OPENFILENAME ofn;
 
-		          safeStrCpy( buf, "" , sizeof( buf)/sizeof( buf[0]) );
+			  GetDlgItemText( hDlg, i+3, buf, MSG_SIZ );
 
 		          ZeroMemory( &ofn, sizeof(ofn) );
 
@@ -499,6 +499,7 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
 		          }
 		} else
 		if(j == -3) {
+		    GetDlgItemText( hDlg, i+3, buf, MSG_SIZ );
 		    if( BrowseForFolder( _("Choose Folder:"), buf ) ) {
 			SetDlgItemText( hDlg, i+3, buf );
 		    }
@@ -550,13 +551,15 @@ void AddControl(int x, int y, int w, int h, int type, int style, int n)
 
 void AddOption(int x, int y, Control type, int i)
 {
-    int extra;
+    int extra, num = ES_NUMBER;
 
     switch(type) {
+	case Slider+100:
+	    num = 0; // needs text control for accepting negative numbers
 	case Slider:
 	case Spin:
 	    AddControl(x, y+1, 95, 9, 0x0082, SS_ENDELLIPSIS | WS_VISIBLE | WS_CHILD, i);
-	    AddControl(x+95, y, 50, 11, 0x0081, ES_AUTOHSCROLL | ES_NUMBER | WS_BORDER | WS_VISIBLE | WS_CHILD | WS_TABSTOP, i+1);
+	    AddControl(x+95, y, 50, 11, 0x0081, ES_AUTOHSCROLL | num | WS_BORDER | WS_VISIBLE | WS_CHILD | WS_TABSTOP, i+1);
 	    break;
 	case TextBox:
 	    extra = 13*activeList[layoutList[i/2]].min; // when extra high, left-align and put description text above it
@@ -624,7 +627,8 @@ CreateDialogTemplate(int *layoutList, int nr, Option *optionList)
 	}
 	j = layoutList[i];
 	if(j >= 0) {
-	    AddOption(x+155-150*(i&1), y+13*(i>>1)+5, optionList[j].type, 2*i);
+	    int neg = (optionList[j].type == Spin && optionList[j].min < 0 ? 100 : 0); // flags spin with negative range
+	    AddOption(x+155-150*(i&1), y+13*(i>>1)+5, optionList[j].type + neg, 2*i);
 	    // listboxes have the special power to adjust the width of the column they are in
 	    if(optionList[j].type == ListBox) x -= optionList[j].value, template.header.cx -= optionList[j].value;
 	}
@@ -685,7 +689,7 @@ Option installOptions[] = {
   {   0,  0,    0, NULL, NULL, NULL, NULL, Label, N_("or specify one below:") },
   {   0,  0,    0, NULL, (void*) &nickName, NULL, NULL, TextBox, N_("Nickname (optional):") },
   {   0,  0,    0, NULL, (void*) &useNick, NULL, NULL, CheckBox, N_("Use nickname in PGN tag") },
-  {   0,  0, 32+3, NULL, (void*) &engineName, NULL, NULL, FileName, N_("Engine (*.exe):") },
+  {   0,  0, 32+3, NULL, (void*) &engineName, NULL, NULL, FileName, N_("Engine (.exe or .jar):") },
   {   0,  0,    0, NULL, (void*) &params, NULL, NULL, TextBox, N_("command-line parameters:") },
   {   0,  0,    0, NULL, (void*) &wbOptions, NULL, NULL, TextBox, N_("Special WinBoard options:") },
   {   0,  0,    0, NULL, (void*) &engineDir, NULL, NULL, PathName, N_("directory:") },
@@ -976,7 +980,7 @@ void TourneyPopup(HWND hwnd)
 {
     int n = NamesToList(firstChessProgramNames, engineList, engineMnemonic, "");
     autoinc = appData.loadGameIndex < 0 || appData.loadPositionIndex < 0;
-    twice = FALSE; swiss = appData.tourneyType < 0;
+    twice = appData.loadGameIndex == -2 || appData.loadPositionIndex == -2; swiss = appData.tourneyType < 0;
     tourneyOptions[0].max = n;
     snprintf(title, MSG_SIZ, _("Tournament and Match Options"));
     ASSIGN(tfName, appData.tourneyFile[0] ? appData.tourneyFile : MakeName(appData.defName));