X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwsettings.c;h=caacb0c0b93d469bf1f0853e95ae624eca2c0862;hb=eae7684295f1bd6a48e793a9d0e93f1ad6d6c573;hp=643de2ae62f572eef66c7e1f5bd7a8d44381b262;hpb=9d270b7479328210b4f4f47ad3c769c60e4ce200;p=xboard.git

diff --git a/winboard/wsettings.c b/winboard/wsettings.c
index 643de2a..caacb0c 100644
--- a/winboard/wsettings.c
+++ b/winboard/wsettings.c
@@ -59,6 +59,7 @@ PrintOpt(int i, int right, ChessProgramState *cps)
 	    case ResetButton:
 		fprintf(debugFP, "[ %26.26s ]", opt.name);
 	    case Message:
+	    default:
 		break;
 	}
     }
@@ -99,6 +100,7 @@ LayoutOptions(int firstOption, int endOption, char *groupName, Option *optionLis
 		case PathName:
 		case Slider:
 		case Spin: stop++;
+		default:
 		case Message: ; // cannot happen
 	    }
 	    nextOption++;
@@ -107,7 +109,7 @@ LayoutOptions(int firstOption, int endOption, char *groupName, Option *optionLis
 	if(!stop)
 	    nextType = Button; // kudge to flush remaining checks and combos undistorted
 	// Take a new line if a spin follows combos or checks, or when we encounter a textbox
-	if((combos+checks || nextType == TextBox) && layout&1) {
+	if((combos+checks || nextType == TextBox || nextType == FileName || nextType == PathName) && layout&1) {
 	    layoutList[layout++] = -1;
 	}
 	// The last check or combo before a spin will be put on the same line as that spin (prefix)
@@ -119,7 +121,7 @@ LayoutOptions(int firstOption, int endOption, char *groupName, Option *optionLis
 	}
 	// if a combo is followed by a textbox, it must stay at the end of the combo/checks list to appear
 	// immediately above the textbox, so treat it as check. (A check would automatically be and remain there.)
-	if(nextType == TextBox && lastType == ComboBox)
+	if((nextType == TextBox || nextType == FileName || nextType == PathName) && lastType == ComboBox)
 	    checkList[checks++] = comboList[--combos];
 	// Now append the checks behind the (remaining) combos to treat them as one group
 	for(i=0; i< checks; i++)
@@ -137,7 +139,7 @@ LayoutOptions(int firstOption, int endOption, char *groupName, Option *optionLis
 	    layoutList[layout++] = -1;
 	    layoutList[layout++] = comboList[2*right];
 	}
-	if(nextType == TextBox) {
+	if(nextType == TextBox || nextType == FileName || nextType == PathName) {
 	    // A textBox is double width, so must be left-adjusted, and the right column remains empty
 	    breaks[layout/2] = lastType == Button ? 0 : 100;
 	    layoutList[layout++] = -1;
@@ -259,6 +261,8 @@ SetOptionValues(HWND hDlg, ChessProgramState *cps)
 		SetDlgItemInt( hDlg, 2001+2*i, cps->option[j].value, TRUE );
 		break;
 	    case TextBox:
+	    case FileName:
+	    case PathName:
 		SetDlgItemText( hDlg, 2001+2*i, cps->option[j].textValue );
 		break;
 	    case CheckBox:
@@ -409,12 +413,17 @@ LRESULT CALLBACK SettingsProc(HWND hDlg, UINT message, WPARAM wParam, LPARAM lPa
 		          ofn.lpstrFilter = filter;
 		          ofn.lpstrFile = buf;
 		          ofn.nMaxFile = sizeof(buf);
-		          ofn.lpstrTitle = _("Choose Book");
+		          ofn.lpstrTitle = _("Choose File");
 		          ofn.Flags = OFN_FILEMUSTEXIST | OFN_LONGNAMES | OFN_HIDEREADONLY;
 
 		          if( GetOpenFileName( &ofn ) ) {
 		              SetDlgItemText( hDlg, i+3, buf );
 		          }
+		} else
+		if(j == -3) {
+		    if( BrowseForFolder( _("Choose Folder:"), buf ) ) {
+			SetDlgItemText( hDlg, i+3, buf );
+		    }
 		}
 		if(j < 0) break;
 		if( activeCps->option[j].type  == SaveButton)
@@ -460,17 +469,16 @@ void AddOption(int x, int y, Control type, int i)
 	    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);
 	    break;
-//	case TextBox:
+	case TextBox:
 	    AddControl(x, y+1, 95, 9, 0x0082, SS_ENDELLIPSIS | WS_VISIBLE | WS_CHILD, i);
 	    AddControl(x+95, y, 190, 11, 0x0081, ES_AUTOHSCROLL | WS_BORDER | WS_VISIBLE | WS_CHILD | WS_TABSTOP, i+1);
 	    break;
-	case TextBox:  // For now all text edits get a browse button, as long as -file and -path options are not yet implemented
 	case FileName:
 	case PathName:
 	    AddControl(x, y+1, 95, 9, 0x0082, SS_ENDELLIPSIS | WS_VISIBLE | WS_CHILD, i);
 	    AddControl(x+95, y, 180, 11, 0x0081, ES_AUTOHSCROLL | WS_BORDER | WS_VISIBLE | WS_CHILD | WS_TABSTOP, i+1);
 	    AddControl(x+275, y, 20, 12, 0x0080, BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD | WS_TABSTOP, i-2);
-	    layoutList[i/2-1] = -2;
+	    layoutList[i/2-1] = -2 - (type == PathName);
 	    break;
 	case CheckBox:
 	    AddControl(x, y, 145, 11, 0x0080, BS_AUTOCHECKBOX | WS_VISIBLE | WS_CHILD | WS_TABSTOP, i);
@@ -484,6 +492,7 @@ void AddOption(int x, int y, Control type, int i)
 	case SaveButton:
 	    AddControl(x-2, y, 65, 13, 0x0080, BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD, i);
 	case Message:
+	default:
 	    break;
     }
 
@@ -521,8 +530,8 @@ CreateDialogTemplate(int *layoutList, int nr, ChessProgramState *cps)
     // add butons at the bottom of dialog window
     y += 13*(nr>>1)+5;
 
-    AddControl(x+275, y+18*(buttonRows-1), 25, 15, 0x0080, BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD, IDOK-2000);
-    AddControl(x+235, y+18*(buttonRows-1), 35, 15, 0x0080, BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD, IDCANCEL-2000);
+    AddControl(x+225, y+18*(buttonRows-1), 30, 15, 0x0080, BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD, IDOK-2000);
+    AddControl(x+260, y+18*(buttonRows-1), 40, 15, 0x0080, BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD, IDCANCEL-2000);
     for(i=0; i<buttons; i++) {
 	AddControl(x+70*(i%4)+5, y+18*(i/4), 65, 15, 0x0080, BS_PUSHBUTTON | WS_VISIBLE | WS_CHILD, 2*(nr+i));
 	layoutList[nr+i] = buttonList[i];