/*
* Engine output (PV)
*
- * Author: Alessandro Scotti
+ * Author: Alessandro Scotti (Dec 2005)
*
* ------------------------------------------------------------------------
* This program is free software; you can redistribute it and/or modify
VOID EngineOutputPopDown();
BOOL EngineOutputIsUp();
+#define SHOW_PONDERING
+
/* Imports from backend.c */
char * SavePart(char *str);
#define LABEL_V_DISTANCE 1 /* Distance between label and memo */
#define SPLITTER_SIZE 4 /* Distance between first memo and second label */
+#define ICON_SIZE 14
+
+#define STATE_UNKNOWN -1
+#define STATE_THINKING 0
+#define STATE_IDLE 1
+#define STATE_PONDERING 2
+
static int windowMode = 1;
+static BOOL needInit = TRUE;
+
+static HICON hiColorBlack = NULL;
+static HICON hiColorWhite = NULL;
+static HICON hiColorUnknown = NULL;
+static HICON hiClear = NULL;
+static HICON hiPondering = NULL;
+static HICON hiThinking = NULL;
+
static int lastDepth[2] = { -1, -1 };
+static int lastForwardMostMove[2] = { -1, -1 };
+static int engineState[2] = { -1, -1 };
+
+typedef struct {
+ int which;
+ HWND hColorIcon;
+ HWND hLabel;
+ HWND hStateIcon;
+ HWND hStateData;
+ HWND hLabelNPS;
+ HWND hMemo;
+ char * name;
+ int depth;
+ unsigned long nodes;
+ int score;
+ int time;
+ char * pv;
+ char * hint;
+} EngineOutputData;
+
+static HICON LoadIconEx( int id )
+{
+ return LoadImage( hInst, MAKEINTRESOURCE(id), IMAGE_ICON, ICON_SIZE, ICON_SIZE, 0 );
+}
+
+static VOID InitializeEngineOutput()
+{
+ if( needInit ) {
+ hiColorBlack = LoadIconEx( IDI_BLACK_14 );
+ hiColorWhite = LoadIconEx( IDI_WHITE_14 );
+ hiColorUnknown = LoadIconEx( IDI_UNKNOWN_14 );
+ hiClear = LoadIconEx( IDI_TRANS_14 );
+ hiPondering = LoadIconEx( IDI_PONDER_14 );
+ hiThinking = LoadIconEx( IDI_CLOCK_14 );
+ needInit = FALSE;
+ }
+}
static VOID SetControlPos( HWND hDlg, int id, int x, int y, int width, int height )
{
SetWindowPos( hControl, HWND_TOP, x, y, width, height, SWP_NOZORDER );
}
+#define HIDDEN_X 20000
+#define HIDDEN_Y 20000
+
static VOID HideControl( HWND hDlg, int id )
{
- /* TODO: we should also hide/disable it!!! what about tab stops?!?! */
+ HWND hControl = GetDlgItem( hDlg, id );
+ RECT rc;
+
+ GetWindowRect( hControl, &rc );
+
+ /*
+ Avoid hiding an already hidden control, because that causes many
+ unnecessary WM_ERASEBKGND messages!
+ */
+ if( rc.left != HIDDEN_X || rc.top != HIDDEN_Y ) {
SetControlPos( hDlg, id, 20000, 20000, 100, 100 );
+ }
}
static int GetControlWidth( HWND hDlg, int id )
{
RECT rc;
- GetWindowRect( GetDlgItem( hDlg, IDC_EngineLabel1 ), &rc );
+ GetWindowRect( GetDlgItem( hDlg, id ), &rc );
return rc.right - rc.left;
}
+static int GetControlHeight( HWND hDlg, int id )
+{
+ RECT rc;
+
+ GetWindowRect( GetDlgItem( hDlg, id ), &rc );
+
+ return rc.bottom - rc.top;
+}
+
+static int GetHeaderHeight()
+{
+ int result = GetControlHeight( engineOutputDialog, IDC_EngineLabel1 );
+
+ if( result < ICON_SIZE ) result = ICON_SIZE;
+
+ return result;
+}
+
+#define ENGINE_COLOR_WHITE 'w'
+#define ENGINE_COLOR_BLACK 'b'
+#define ENGINE_COLOR_UNKNOWN ' '
+
+char GetEngineColor( int which )
+{
+ char result = ENGINE_COLOR_UNKNOWN;
+
+ if( which == 0 || which == 1 ) {
+ ChessProgramState * cps;
+
+ switch (gameMode) {
+ case MachinePlaysBlack:
+ case IcsPlayingBlack:
+ result = ENGINE_COLOR_BLACK;
+ break;
+ case MachinePlaysWhite:
+ case IcsPlayingWhite:
+ result = ENGINE_COLOR_WHITE;
+ break;
+ case AnalyzeMode:
+ case AnalyzeFile:
+ result = WhiteOnMove(forwardMostMove) ? ENGINE_COLOR_WHITE : ENGINE_COLOR_BLACK;
+ break;
+ case TwoMachinesPlay:
+ cps = (which == 0) ? &first : &second;
+ result = cps->twoMachinesColor[0];
+ result = result == 'w' ? ENGINE_COLOR_WHITE : ENGINE_COLOR_BLACK;
+ break;
+ }
+ }
+
+ return result;
+}
+
+char GetActiveEngineColor()
+{
+ char result = ENGINE_COLOR_UNKNOWN;
+
+ if( gameMode == TwoMachinesPlay ) {
+ result = WhiteOnMove(forwardMostMove) ? ENGINE_COLOR_WHITE : ENGINE_COLOR_BLACK;
+ }
+
+ return result;
+}
+
+static VOID PositionControlSet( HWND hDlg, int x, int y, int clientWidth, int memoHeight, int idColor, int idEngineLabel, int idNPS, int idMemo, int idStateIcon, int idStateData )
+{
+ int label_x = x + ICON_SIZE + H_MARGIN;
+ int label_h = GetControlHeight( hDlg, IDC_EngineLabel1 );
+ int label_y = y + ICON_SIZE - label_h;
+ int nps_w = GetControlWidth( hDlg, IDC_Engine1_NPS );
+ int nps_x = clientWidth - H_MARGIN - nps_w;
+ int state_data_w = GetControlWidth( hDlg, IDC_StateData1 );
+ int state_data_x = nps_x - H_MARGIN - state_data_w;
+ int state_icon_x = state_data_x - ICON_SIZE - 2;
+ int max_w = clientWidth - 2*H_MARGIN;
+ int memo_y = y + ICON_SIZE + LABEL_V_DISTANCE;
+
+ SetControlPos( hDlg, idColor, x, y, ICON_SIZE, ICON_SIZE );
+ SetControlPos( hDlg, idEngineLabel, label_x, label_y, max_w / 2, label_h );
+ SetControlPos( hDlg, idStateIcon, state_icon_x, y, ICON_SIZE, ICON_SIZE );
+ SetControlPos( hDlg, idStateData, state_data_x, label_y, state_data_w, label_h );
+ SetControlPos( hDlg, idNPS, nps_x, label_y, nps_w, label_h );
+ SetControlPos( hDlg, idMemo, x, memo_y, max_w, memoHeight );
+}
+
static VOID ResizeWindowControls( HWND hDlg, int mode )
{
RECT rc;
- int labelHeight;
+ int headerHeight = GetHeaderHeight();
+ int labelHeight = GetControlHeight( hDlg, IDC_EngineLabel1 );
+ int labelOffset = H_MARGIN + ICON_SIZE + H_MARGIN;
+ int labelDeltaY = ICON_SIZE - labelHeight;
int clientWidth;
int clientHeight;
int maxControlWidth;
int npsWidth;
/* Initialize variables */
- GetWindowRect( GetDlgItem( hDlg, IDC_EngineLabel1 ), &rc );
-
- labelHeight = rc.bottom - rc.top;
-
GetClientRect( hDlg, &rc );
clientWidth = rc.right - rc.left;
/* Resize controls */
if( mode == 0 ) {
/* One engine */
- int memo_y = V_MARGIN + labelHeight + LABEL_V_DISTANCE;
- int memo_h = clientHeight - memo_y - V_MARGIN;
-
- SetControlPos( hDlg, IDC_EngineLabel1, H_MARGIN, V_MARGIN, maxControlWidth / 2, labelHeight );
- SetControlPos( hDlg, IDC_EngineMemo1, H_MARGIN, memo_y, maxControlWidth, memo_h );
+ PositionControlSet( hDlg, H_MARGIN, V_MARGIN,
+ clientWidth,
+ clientHeight - V_MARGIN - LABEL_V_DISTANCE - headerHeight- V_MARGIN,
+ IDC_Color1, IDC_EngineLabel1, IDC_Engine1_NPS, IDC_EngineMemo1, IDC_StateIcon1, IDC_StateData1 );
/* Hide controls for the second engine */
+ HideControl( hDlg, IDC_Color2 );
HideControl( hDlg, IDC_EngineLabel2 );
+ HideControl( hDlg, IDC_StateIcon2 );
+ HideControl( hDlg, IDC_StateData2 );
HideControl( hDlg, IDC_Engine2_NPS );
HideControl( hDlg, IDC_EngineMemo2 );
+ SendDlgItemMessage( hDlg, IDC_EngineMemo2, WM_SETTEXT, 0, (LPARAM) "" );
/* TODO: we should also hide/disable them!!! what about tab stops?!?! */
}
else {
/* Two engines */
- int memo1_y = V_MARGIN + labelHeight + LABEL_V_DISTANCE;
- int memo_h = (clientHeight - memo1_y - V_MARGIN - labelHeight - LABEL_V_DISTANCE - SPLITTER_SIZE) / 2;
- int label2_y = memo1_y + memo_h + SPLITTER_SIZE;
- int memo2_y = label2_y + labelHeight + LABEL_V_DISTANCE;
- int nps_x = clientWidth - H_MARGIN - npsWidth;
-
- SetControlPos( hDlg, IDC_EngineLabel1, H_MARGIN, V_MARGIN, maxControlWidth / 2, labelHeight );
- SetControlPos( hDlg, IDC_Engine1_NPS, nps_x, V_MARGIN, npsWidth, labelHeight );
- SetControlPos( hDlg, IDC_EngineMemo1, H_MARGIN, memo1_y, maxControlWidth, memo_h );
-
- SetControlPos( hDlg, IDC_EngineLabel2, H_MARGIN, label2_y, maxControlWidth / 2, labelHeight );
- SetControlPos( hDlg, IDC_Engine2_NPS, nps_x, label2_y, npsWidth, labelHeight );
- SetControlPos( hDlg, IDC_EngineMemo2, H_MARGIN, memo2_y, maxControlWidth, memo_h );
+ int memo_h = (clientHeight - headerHeight*2 - V_MARGIN*2 - LABEL_V_DISTANCE*2 - SPLITTER_SIZE) / 2;
+ int header1_y = V_MARGIN;
+ int header2_y = V_MARGIN + headerHeight + LABEL_V_DISTANCE + memo_h + SPLITTER_SIZE;
+
+ PositionControlSet( hDlg, H_MARGIN, header1_y, clientWidth, memo_h,
+ IDC_Color1, IDC_EngineLabel1, IDC_Engine1_NPS, IDC_EngineMemo1, IDC_StateIcon1, IDC_StateData1 );
+
+ PositionControlSet( hDlg, H_MARGIN, header2_y, clientWidth, memo_h,
+ IDC_Color2, IDC_EngineLabel2, IDC_Engine2_NPS, IDC_EngineMemo2, IDC_StateIcon2, IDC_StateData2 );
}
InvalidateRect( GetDlgItem(hDlg,IDC_EngineMemo1), NULL, FALSE );
case AnalyzeFile:
case MachinePlaysWhite:
case MachinePlaysBlack:
+ case IcsPlayingWhite:
+ case IcsPlayingBlack:
mode = 0;
break;
case TwoMachinesPlay:
SendMessage( hMemo, EM_REPLACESEL, (WPARAM) FALSE, (LPARAM) text );
}
+static VOID SetIcon( HWND hControl, HICON hIcon )
+{
+ if( hIcon != NULL ) {
+ SendMessage( hControl, STM_SETICON, (WPARAM) hIcon, 0 );
+ }
+}
+
+static VOID SetEngineColorIcon( HWND hControl, int which )
+{
+ char color = GetEngineColor(which);
+ HICON hicon = NULL;
+
+ if( color == ENGINE_COLOR_BLACK )
+ hicon = hiColorBlack;
+ else if( color == ENGINE_COLOR_WHITE )
+ hicon = hiColorWhite;
+ else
+ hicon = hiColorUnknown;
+
+ SetIcon( hControl, hicon );
+}
+
+static SetEngineState( int which, int state, char * state_data )
+{
+ int x_which = 1 - which;
+ HWND hStateIcon = GetDlgItem( engineOutputDialog, which == 0 ? IDC_StateIcon1 : IDC_StateIcon2 );
+ HWND hStateData = GetDlgItem( engineOutputDialog, which == 0 ? IDC_StateData1 : IDC_StateData2 );
+
+ if( engineState[ which ] != state ) {
+ engineState[ which ] = state;
+
+ switch( state ) {
+ case STATE_THINKING:
+ SetIcon( hStateIcon, hiThinking );
+ if( engineState[ x_which ] == STATE_THINKING ) {
+ SetEngineState( x_which, STATE_IDLE, "" );
+ }
+ break;
+ case STATE_PONDERING:
+ SetIcon( hStateIcon, hiPondering );
+ break;
+ default:
+ SetIcon( hStateIcon, hiClear );
+ break;
+ }
+ }
+
+ if( state_data != 0 ) {
+ SetWindowText( hStateData, state_data );
+ }
+}
+
#define MAX_NAME_LENGTH 32
-static VOID UpdateControls( HWND hLabel, HWND hLabelNPS, HWND hMemo, char * name, int depth, unsigned long nodes, int score, int time, char * pv )
+static VOID UpdateControls( EngineOutputData * ed )
{
- char s_label[MAX_NAME_LENGTH + 64];
+ char s_label[MAX_NAME_LENGTH + 32];
+
+ char * name = ed->name;
/* Label */
if( name == 0 || *name == '\0' ) {
strncpy( s_label, name, MAX_NAME_LENGTH );
s_label[ MAX_NAME_LENGTH-1 ] = '\0';
- SetWindowText( hLabel, s_label );
+#ifdef SHOW_PONDERING
+ if( GetActiveEngineColor() != ENGINE_COLOR_UNKNOWN ) {
+ if( GetEngineColor(ed->which) != GetActiveEngineColor() ) {
+ char buf[8];
+
+ buf[0] = '\0';
+
+ if( ed->hint != 0 && *ed->hint != '\0' ) {
+ strncpy( buf, ed->hint, sizeof(buf) );
+ buf[sizeof(buf)-1] = '\0';
+ }
+ else if( ed->pv != 0 && *ed->pv != '\0' ) {
+ char * sep = strchr( ed->pv, ' ' );
+ int buflen = sizeof(buf);
+
+ if( sep != NULL ) {
+ buflen = sep - ed->pv + 1;
+ if( buflen > sizeof(buf) ) buflen = sizeof(buf);
+ }
+
+ strncpy( buf, ed->pv, buflen );
+ buf[ buflen-1 ] = '\0';
+ }
+
+ SetEngineState( ed->which, STATE_PONDERING, buf );
+ }
+ else {
+ SetEngineState( ed->which, STATE_THINKING, "" );
+ }
+ }
+ else {
+ SetEngineState( ed->which, STATE_IDLE, "" );
+ }
+#endif
+
+ SetWindowText( ed->hLabel, s_label );
s_label[0] = '\0';
- if( time > 0 && nodes > 0 ) {
- unsigned long nps_100 = nodes / time;
+ if( ed->time > 0 && ed->nodes > 0 ) {
+ unsigned long nps_100 = ed->nodes / ed->time;
if( nps_100 < 100000 ) {
sprintf( s_label, "NPS: %lu", nps_100 * 100 );
}
}
- SetWindowText( hLabelNPS, s_label );
+ SetWindowText( ed->hLabelNPS, s_label );
/* Memo */
- if( pv != 0 && *pv != '\0' ) {
+ if( ed->pv != 0 && *ed->pv != '\0' ) {
char s_nodes[24];
char s_score[16];
char s_time[24];
char buf[256];
int buflen;
- int time_secs = time / 100;
- int time_cent = time % 100;
+ int time_secs = ed->time / 100;
+ int time_cent = ed->time % 100;
/* Nodes */
- if( nodes < 1000000 ) {
- sprintf( s_nodes, "%lu", nodes );
+ if( ed->nodes < 1000000 ) {
+ sprintf( s_nodes, "%lu", ed->nodes );
}
else {
- sprintf( s_nodes, "%.1fM", nodes / 1000000.0 );
+ sprintf( s_nodes, "%.1fM", ed->nodes / 1000000.0 );
}
/* Score */
- if( score > 0 ) {
- sprintf( s_score, "+%.2f", score / 100.0 );
+ if( ed->score > 0 ) {
+ sprintf( s_score, "+%.2f", ed->score / 100.0 );
}
else {
- sprintf( s_score, "%.2f", score / 100.0 );
+ sprintf( s_score, "%.2f", ed->score / 100.0 );
}
/* Time */
sprintf( s_time, "%d:%02d.%02d", time_secs / 60, time_secs % 60, time_cent );
/* Put all together... */
- sprintf( buf, "%3d\t%s\t%s\t%s\t", depth, s_score, s_nodes, s_time );
+ sprintf( buf, "%3d\t%s\t%s\t%s\t", ed->depth, s_score, s_nodes, s_time );
/* Add PV */
buflen = strlen(buf);
- strncpy( buf + buflen, pv, sizeof(buf) - buflen );
+ strncpy( buf + buflen, ed->pv, sizeof(buf) - buflen );
buf[ sizeof(buf) - 3 ] = '\0';
strcat( buf + buflen, "\r\n" );
/* Update memo */
- InsertIntoMemo( hMemo, buf );
+ InsertIntoMemo( ed->hMemo, buf );
}
+
+ /* Colors */
+ SetEngineColorIcon( ed->hColorIcon, ed->which );
}
LRESULT CALLBACK EngineOutputProc( HWND hDlg, UINT message, WPARAM wParam, LPARAM lParam )
RestoreWindowPlacement( hDlg, &wpEngineOutput ); /* Restore window placement */
ResizeWindowControls( hDlg, windowMode );
+
+ SetEngineState( 0, STATE_IDLE, "" );
+ SetEngineState( 1, STATE_IDLE, "" );
}
return FALSE;
{
FARPROC lpProc;
+ if( needInit ) {
+ InitializeEngineOutput();
+ }
+
CheckMenuItem(GetMenu(hwndMain), IDM_ShowEngineOutput, MF_CHECKED);
if( engineOutputDialog ) {
return engineOutputDialogUp;
}
-VOID EngineOutputUpdate( int which, int depth, unsigned long nodes, int score, int time, char * pv )
+VOID EngineOutputUpdate( int which, int depth, unsigned long nodes, int score, int time, char * pv, char * hint )
{
- HWND hLabel;
- HWND hLabelNPS;
- HWND hMemo;
- char * name;
+ EngineOutputData ed;
+ BOOL clearMemo = FALSE;
if( which < 0 || which > 1 || depth < 0 || time < 0 || pv == 0 || *pv == '\0' ) {
return;
VerifyDisplayMode();
+ ed.which = which;
+ ed.depth = depth;
+ ed.nodes = nodes;
+ ed.score = score;
+ ed.time = time;
+ ed.pv = pv;
+ ed.hint = hint;
+
/* Get target control */
if( which == 0 ) {
- hLabel = GetDlgItem( engineOutputDialog, IDC_EngineLabel1 );
- hLabelNPS = GetDlgItem( engineOutputDialog, IDC_Engine1_NPS );
- hMemo = GetDlgItem( engineOutputDialog, IDC_EngineMemo1 );
- name = first.tidy;
+ ed.hColorIcon = GetDlgItem( engineOutputDialog, IDC_Color1 );
+ ed.hLabel = GetDlgItem( engineOutputDialog, IDC_EngineLabel1 );
+ ed.hStateIcon = GetDlgItem( engineOutputDialog, IDC_StateIcon1 );
+ ed.hStateData = GetDlgItem( engineOutputDialog, IDC_StateData1 );
+ ed.hLabelNPS = GetDlgItem( engineOutputDialog, IDC_Engine1_NPS );
+ ed.hMemo = GetDlgItem( engineOutputDialog, IDC_EngineMemo1 );
+ ed.name = first.tidy;
}
else {
- hLabel = GetDlgItem( engineOutputDialog, IDC_EngineLabel2 );
- hLabelNPS = GetDlgItem( engineOutputDialog, IDC_Engine2_NPS );
- hMemo = GetDlgItem( engineOutputDialog, IDC_EngineMemo2 );
- name = second.tidy;
+ ed.hColorIcon = GetDlgItem( engineOutputDialog, IDC_Color2 );
+ ed.hLabel = GetDlgItem( engineOutputDialog, IDC_EngineLabel2 );
+ ed.hStateIcon = GetDlgItem( engineOutputDialog, IDC_StateIcon2 );
+ ed.hStateData = GetDlgItem( engineOutputDialog, IDC_StateData2 );
+ ed.hLabelNPS = GetDlgItem( engineOutputDialog, IDC_Engine2_NPS );
+ ed.hMemo = GetDlgItem( engineOutputDialog, IDC_EngineMemo2 );
+ ed.name = second.tidy;
}
/* Clear memo if needed */
if( lastDepth[which] > depth || (lastDepth[which] == depth && depth <= 1) ) {
- SendMessage( hMemo, WM_SETTEXT, 0, (LPARAM) "" );
+ clearMemo = TRUE;
+ }
+
+ if( lastForwardMostMove[which] != forwardMostMove ) {
+ clearMemo = TRUE;
+ }
+
+ if( clearMemo ) {
+ SendMessage( ed.hMemo, WM_SETTEXT, 0, (LPARAM) "" );
}
/* Update */
lastDepth[which] = depth;
+ lastForwardMostMove[which] = forwardMostMove;
if( pv[0] == ' ' ) {
if( strncmp( pv, " no PV", 6 ) == 0 ) { /* Hack on hack! :-O */
- pv = "";
+ ed.pv = "";
}
}
- UpdateControls( hLabel, hLabelNPS, hMemo, name, depth, nodes, score, time, pv );
+ UpdateControls( &ed );
}
LTEXT "(unofficial version ""X"")",IDC_STATIC,88,4,71,8
END\r
\r
-DLG_TimeControl DIALOG DISCARDABLE 6, 18, 165, 114
+DLG_TimeControl DIALOG DISCARDABLE 6, 18, 174, 98
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU\r
CAPTION "Time Control"\r
FONT 8, "MS Sans Serif"\r
BS_AUTORADIOBUTTON | WS_GROUP | WS_TABSTOP,6,6,113,10\r
CONTROL "Incremental clock",OPT_TCUseInc,"Button",\r
BS_AUTORADIOBUTTON | WS_TABSTOP,6,42,107,10\r
- EDITTEXT OPT_TCMoves,14,20,22,12,ES_AUTOHSCROLL | WS_GROUP\r
- LTEXT "moves in",OPT_TCtext1,40,22,30,8,NOT WS_GROUP\r
- EDITTEXT OPT_TCTime,74,20,50,12,ES_AUTOHSCROLL
- LTEXT "minutes",OPT_TCtext2,129,22,26,8,NOT WS_GROUP
- EDITTEXT OPT_TCTime2,14,56,32,12,ES_AUTOHSCROLL | WS_GROUP\r
- LTEXT "minutes initially,",405,51,57,73,8,NOT WS_GROUP\r
- LTEXT "plus",406,19,74,15,8,NOT WS_GROUP\r
- EDITTEXT OPT_TCInc,37,72,32,12,ES_AUTOHSCROLL\r
- LTEXT "seconds per move",408,74,74,67,8,NOT WS_GROUP\r
- PUSHBUTTON "OK",IDOK,34,95,40,14,WS_GROUP
- PUSHBUTTON "Cancel",IDCANCEL,90,95,40,14
+ EDITTEXT OPT_TCMoves,14,20,26,12,ES_AUTOHSCROLL | WS_GROUP
+ LTEXT "moves in",OPT_TCtext1,44,22,30,8,NOT WS_GROUP
+ EDITTEXT OPT_TCTime,78,20,26,12,ES_AUTOHSCROLL
+ LTEXT "minutes",OPT_TCtext2,108,22,26,8,NOT WS_GROUP
+ EDITTEXT OPT_TCTime2,14,56,26,12,ES_AUTOHSCROLL | WS_GROUP
+ LTEXT "minutes +",405,44,58,34,8,NOT WS_GROUP
+ EDITTEXT OPT_TCInc,78,56,26,12,ES_AUTOHSCROLL
+ LTEXT "seconds per move",408,108,58,62,8,NOT WS_GROUP
+ PUSHBUTTON "OK",IDOK,64,80,50,14,WS_GROUP
+ PUSHBUTTON "Cancel",IDCANCEL,120,80,50,14
END\r
\r
DLG_LoadOptions DIALOG DISCARDABLE 10, 18, 136, 55
PUSHBUTTON "Help",OPT_SerialHelp,4,60,50,14,NOT WS_VISIBLE
END\r
\r
-DLG_EditComment DIALOG DISCARDABLE 6, 18, 306, 104\r
+DLG_EditComment DIALOG DISCARDABLE 6, 18, 302, 102
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
CAPTION "Edit Comment"\r
FONT 8, "MS Sans Serif"\r
BEGIN\r
- PUSHBUTTON "OK",IDOK,61,86,40,14\r
- PUSHBUTTON "Cancel",OPT_CancelComment,109,86,40,14\r
- PUSHBUTTON "&Clear",OPT_ClearComment,157,86,40,14\r
- PUSHBUTTON "&Edit",OPT_EditComment,205,86,40,14\r
+ PUSHBUTTON "OK",IDOK,194,84,50,14
+ PUSHBUTTON "Cancel",OPT_CancelComment,250,84,50,14
CONTROL "",OPT_CommentText,"RICHEDIT",ES_MULTILINE | \r
ES_AUTOHSCROLL | ES_WANTRETURN | WS_BORDER | WS_VSCROLL | \r
- WS_HSCROLL | WS_TABSTOP,4,4,298,78\r
+ WS_HSCROLL | WS_TABSTOP,2,2,298,78
+ PUSHBUTTON "&Clear",OPT_ClearComment,2,84,50,14
+ PUSHBUTTON "&Edit",OPT_EditComment,58,84,50,14
END\r
\r
DLG_PromotionKing DIALOG DISCARDABLE 98, 90, 183, 41\r
EDITTEXT IDC_GameListFilter,178,136,78,14,ES_AUTOHSCROLL
END\r
\r
-DLG_EditTags DIALOG DISCARDABLE 6, 18, 160, 141\r
+DLG_EditTags DIALOG DISCARDABLE 6, 18, 167, 140
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME\r
CAPTION "Edit Tags"\r
FONT 8, "MS Sans Serif"\r
BEGIN\r
- PUSHBUTTON "OK",IDOK,12,123,40,14\r
- PUSHBUTTON "Cancel",OPT_TagsCancel,60,123,40,14\r
- PUSHBUTTON "&Edit",OPT_EditTags,108,123,40,14\r
+ PUSHBUTTON "OK",IDOK,58,122,50,14
+ PUSHBUTTON "Cancel",OPT_TagsCancel,114,122,50,14
CONTROL "",OPT_TagsText,"RICHEDIT",ES_MULTILINE | ES_AUTOVSCROLL | \r
ES_AUTOHSCROLL | ES_WANTRETURN | WS_BORDER | WS_VSCROLL | \r
- WS_HSCROLL | WS_TABSTOP,4,4,152,115\r
+ WS_HSCROLL | WS_TABSTOP,2,2,162,115
+ PUSHBUTTON "&Edit",OPT_EditTags,2,122,50,14
END\r
\r
WBCONSOLE DIALOG DISCARDABLE 0, 0, 335, 133\r
WS_HSCROLL | WS_TABSTOP,4,4,286,54\r
END\r
\r
-DLG_Error DIALOG DISCARDABLE 0, 0, 183, 33\r
+DLG_Error DIALOG DISCARDABLE 0, 0, 220, 66
STYLE DS_MODALFRAME | WS_POPUP | WS_VISIBLE | WS_CAPTION\r
CAPTION "Error"\r
FONT 8, "MS Sans Serif"\r
BEGIN\r
- DEFPUSHBUTTON "OK",IDOK,163,9,16,14\r
- ICON 32515,IDC_STATIC,4,6,20,20\r
- LTEXT "Sorry Charlie",OPT_ErrorText,27,4,130,25\r
+ ICON 32515,IDC_STATIC,4,4,21,20
+ LTEXT "Sorry Charlie",OPT_ErrorText,28,4,188,36
+ DEFPUSHBUTTON "OK",IDOK,84,48,50,14
END\r
\r
DLG_Colorize DIALOGEX 0, 0, 174, 61
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "ICS Interaction Colors"\r
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+FONT 8, "MS Sans Serif"
BEGIN\r
+ DEFPUSHBUTTON "OK",IDOK,64,42,50,14,WS_GROUP
+ PUSHBUTTON "Cancel",IDCANCEL,120,42,50,14
PUSHBUTTON "&Color...",OPT_ChooseColor,119,4,51,14,WS_GROUP
CONTROL "&Bold",OPT_Bold,"Button",BS_AUTOCHECKBOX | WS_GROUP | \r
WS_TABSTOP,4,24,30,10
24,45,10\r
CONTROL "&Strikeout",OPT_Strikeout,"Button",BS_AUTOCHECKBOX,128,
24,42,10
- DEFPUSHBUTTON "OK",IDOK,64,42,50,14,WS_GROUP
- PUSHBUTTON "Cancel",IDCANCEL,120,42,50,14
CONTROL "",OPT_Sample,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
ES_READONLY | WS_GROUP,4,4,106,15,WS_EX_CLIENTEDGE
END\r
PUSHBUTTON "Cancel",IDCANCEL,134,58,50,14
LTEXT "Enter a chess engine command or just type something stupid that will completely screw things up.",\r
OPT_QuestionText,30,2,153,28
- ICON 32514,IDC_STATIC,4,4,21,20
+ ICON 32514,IDC_STATIC,4,4,20,20
END\r
\r
DLG_Startup DIALOG DISCARDABLE 0, 0, 276, 127\r
EDITTEXT OPT_Move,4,4,86,13,ES_AUTOHSCROLL
END\r
\r
-DLG_Sound DIALOG DISCARDABLE 0, 0, 257, 95\r
+DLG_Sound DIALOG DISCARDABLE 0, 0, 242, 105
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Sounds"\r
FONT 8, "MS Sans Serif"\r
BEGIN\r
- DEFPUSHBUTTON "OK",IDOK,199,6,47,14\r
- PUSHBUTTON "Cancel",IDCANCEL,199,23,47,14\r
- PUSHBUTTON "Defaults",OPT_DefaultSounds,199,40,47,14\r
- COMBOBOX CBO_Sounds,52,6,128,110,CBS_DROPDOWNLIST | WS_VSCROLL | \r
+ DEFPUSHBUTTON "OK",IDOK,132,86,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,188,86,50,14
+ LTEXT "Event:",IDC_STATIC,4,7,26,9
+ COMBOBOX CBO_Sounds,30,4,208,110,CBS_DROPDOWNLIST | WS_VSCROLL |
WS_TABSTOP\r
CONTROL "No sound",OPT_NoSound,"Button",BS_AUTORADIOBUTTON | \r
- WS_GROUP | WS_TABSTOP,11,25,47,10\r
+ WS_GROUP | WS_TABSTOP,12,22,47,10
CONTROL "Default beep",OPT_DefaultBeep,"Button",\r
- BS_AUTORADIOBUTTON | WS_TABSTOP,11,42,57,10\r
+ BS_AUTORADIOBUTTON | WS_TABSTOP,12,36,57,10
CONTROL "Built-in sound:",OPT_BuiltInSound,"Button",\r
- BS_AUTORADIOBUTTON | WS_TABSTOP,11,59,60,10\r
- COMBOBOX OPT_BuiltInSoundName,78,58,103,109,CBS_DROPDOWNLIST | \r
+ BS_AUTORADIOBUTTON | WS_TABSTOP,12,51,60,10
+ COMBOBOX OPT_BuiltInSoundName,76,48,103,109,CBS_DROPDOWNLIST |
CBS_SORT | WS_VSCROLL | WS_TABSTOP\r
- PUSHBUTTON "Play",OPT_PlaySound,200,57,47,14\r
+ PUSHBUTTON "Play",OPT_PlaySound,188,47,50,14
CONTROL "WAV file:",OPT_WavFile,"Button",BS_AUTORADIOBUTTON | \r
- WS_TABSTOP,11,76,45,10\r
- EDITTEXT OPT_WavFileName,78,75,103,12,ES_AUTOHSCROLL\r
- PUSHBUTTON "Browse...",OPT_BrowseSound,200,74,47,14\r
- LTEXT "Event:",IDC_STATIC,19,9,26,9\r
+ WS_TABSTOP,12,66,45,10
+ EDITTEXT OPT_WavFileName,76,65,103,12,ES_AUTOHSCROLL
+ PUSHBUTTON "Browse...",OPT_BrowseSound,188,64,50,14
+ PUSHBUTTON "Defaults",OPT_DefaultSounds,6,86,50,14
END\r
\r
-DLG_GeneralOptions DIALOG DISCARDABLE 0, 0, 271, 162
+DLG_GeneralOptions DIALOG DISCARDABLE 0, 0, 220, 183
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "General Options"\r
FONT 8, "MS Sans Serif"\r
BEGIN\r
- DEFPUSHBUTTON "OK",IDOK,207,7,50,14\r
- PUSHBUTTON "Cancel",IDCANCEL,208,25,50,14\r
+ DEFPUSHBUTTON "OK",IDOK,110,164,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,166,164,50,14
CONTROL "Always on &Top",OPT_AlwaysOnTop,"Button",\r
BS_AUTOCHECKBOX | WS_TABSTOP,4,6,79,10
+ CONTROL "Highlight Last &Move",OPT_HighlightLastMove,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,116,6,79,10
CONTROL "Always &Queen",OPT_AlwaysQueen,"Button",BS_AUTOCHECKBOX | \r
WS_TABSTOP,4,20,79,10
+ CONTROL "Periodic &Updates",OPT_PeriodicUpdates,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,116,20,79,10
CONTROL "Animate &Dragging",OPT_AnimateDragging,"Button",\r
BS_AUTOCHECKBOX | WS_TABSTOP,4,34,79,10
+ CONTROL "Ponder &Next Move",OPT_PonderNextMove,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,116,34,79,10
CONTROL "&Animate Moving",OPT_AnimateMoving,"Button",\r
BS_AUTOCHECKBOX | WS_TABSTOP,4,48,79,10
+ CONTROL "&Popup Exit Message",OPT_PopupExitMessage,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,116,48,79,10
CONTROL "Auto &Flag",OPT_AutoFlag,"Button",BS_AUTOCHECKBOX | \r
WS_TABSTOP,4,62,79,10
+ CONTROL "Popup Move &Errors",OPT_PopupMoveErrors,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,116,62,79,10
CONTROL "Auto Flip &View",OPT_AutoFlipView,"Button",\r
BS_AUTOCHECKBOX | WS_TABSTOP,4,76,79,10
+ CONTROL "Show Butt&on Bar",OPT_ShowButtonBar,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,116,76,79,10
CONTROL "Auto &Raise Board",OPT_AutoRaiseBoard,"Button",\r
BS_AUTOCHECKBOX | WS_TABSTOP,4,90,71,10
+ CONTROL "Show &Coordinates",OPT_ShowCoordinates,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,116,90,79,10
CONTROL "&Blindfold",OPT_Blindfold,"Button",BS_AUTOCHECKBOX | \r
WS_TABSTOP,4,104,79,10
+ CONTROL "&Show Thinking",OPT_ShowThinking,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,116,104,79,10
CONTROL "&Highlight Dragging",OPT_HighlightDragging,"Button",\r
BS_AUTOCHECKBOX | WS_TABSTOP,4,118,79,10
+ CONTROL "Test &Legality",OPT_TestLegality,"Button",
+ BS_AUTOCHECKBOX | WS_TABSTOP,116,118,79,10
CONTROL "Extended PGN Info",OPT_SaveExtPGN,"Button",
BS_AUTOCHECKBOX | WS_TABSTOP,4,132,79,10
- CONTROL "Highlight Last &Move",OPT_HighlightLastMove,"Button",\r
- BS_AUTOCHECKBOX | WS_TABSTOP,109,6,79,10\r
- CONTROL "Periodic &Updates",OPT_PeriodicUpdates,"Button",\r
- BS_AUTOCHECKBOX | WS_TABSTOP,109,20,79,10\r
- CONTROL "Ponder &Next Move",OPT_PonderNextMove,"Button",\r
- BS_AUTOCHECKBOX | WS_TABSTOP,109,34,79,10\r
- CONTROL "&Popup Exit Message",OPT_PopupExitMessage,"Button",\r
- BS_AUTOCHECKBOX | WS_TABSTOP,109,48,79,10\r
- CONTROL "Popup Move &Errors",OPT_PopupMoveErrors,"Button",\r
- BS_AUTOCHECKBOX | WS_TABSTOP,109,62,79,10\r
- CONTROL "Show Butt&on Bar",OPT_ShowButtonBar,"Button",\r
- BS_AUTOCHECKBOX | WS_TABSTOP,109,76,79,10\r
- CONTROL "Show &Coordinates",OPT_ShowCoordinates,"Button",\r
- BS_AUTOCHECKBOX | WS_TABSTOP,109,90,79,10\r
- CONTROL "&Show Thinking",OPT_ShowThinking,"Button",\r
- BS_AUTOCHECKBOX | WS_TABSTOP,109,104,79,10\r
- CONTROL "Test &Legality",OPT_TestLegality,"Button",\r
- BS_AUTOCHECKBOX | WS_TABSTOP,109,118,79,10\r
CONTROL "Hide Thinking from Human",OPT_HideThinkFromHuman,"Button",
- BS_AUTOCHECKBOX | WS_TABSTOP,109,132,100,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,116,132,100,10
CONTROL "Extra Info in Move History",OPT_ExtraInfoInMoveHistory,
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,4,146,97,10
CONTROL "Highlight Move with Arrow",OPT_HighlightMoveArrow,
- "Button",BS_AUTOCHECKBOX | WS_TABSTOP,109,145,111,9
+ "Button",BS_AUTOCHECKBOX | WS_TABSTOP,116,145,100,9
END\r
\r
-DLG_IcsOptions DIALOGEX 0, 0, 302, 265
+DLG_IcsOptions DIALOGEX 0, 0, 302, 255
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "ICS Options"\r
FONT 8, "MS Sans Serif"
BEGIN\r
- DEFPUSHBUTTON "OK",IDOK,194,246,50,15
- PUSHBUTTON "Cancel",IDCANCEL,248,246,50,15
+ DEFPUSHBUTTON "OK",IDOK,194,237,50,15
+ PUSHBUTTON "Cancel",IDCANCEL,248,237,50,15
CONTROL "&Auto Comment",OPT_AutoComment,"Button",BS_AUTOCHECKBOX | \r
WS_TABSTOP,10,12,63,8
CONTROL "Auto &Observe",OPT_AutoObserve,"Button",BS_AUTOCHECKBOX | \r
WS_TABSTOP,160,72,63,10
EDITTEXT OPT_IcsAlarmTime,236,68,26,14,ES_AUTOHSCROLL
LTEXT "seconds",IDC_STATIC,264,72,28,8
- PUSHBUTTON "Choose...",OPT_ChooseShoutColor,98,101,45,15
- PUSHBUTTON "Choose...",OPT_ChooseSShoutColor,98,121,45,15
- PUSHBUTTON "Choose...",OPT_ChooseChannel1Color,98,141,45,15
- PUSHBUTTON "Choose...",OPT_ChooseChannelColor,98,161,45,15
- PUSHBUTTON "Choose...",OPT_ChooseKibitzColor,98,181,45,15
+ PUSHBUTTON "Choose...",OPT_ChooseShoutColor,97,101,45,15
+ PUSHBUTTON "Choose...",OPT_ChooseSShoutColor,97,121,45,15
+ PUSHBUTTON "Choose...",OPT_ChooseChannel1Color,97,141,45,15
+ PUSHBUTTON "Choose...",OPT_ChooseChannelColor,97,161,45,15
+ PUSHBUTTON "Choose...",OPT_ChooseKibitzColor,97,181,45,15
PUSHBUTTON "Choose...",OPT_ChooseTellColor,246,101,45,15
PUSHBUTTON "Choose...",OPT_ChooseChallengeColor,246,121,45,15
PUSHBUTTON "Choose...",OPT_ChooseRequestColor,246,141,45,15
PUSHBUTTON "Choose...",OPT_ChooseSeekColor,246,161,45,15
PUSHBUTTON "Choose...",OPT_ChooseNormalColor,246,181,45,15
- PUSHBUTTON "&Choose Background Color...",OPT_ChooseBackgroundColor,\r
- 11,204,132,16
- PUSHBUTTON "&Default ICS Colors",OPT_DefaultColors,159,204,132,16
+ PUSHBUTTON "Background...",OPT_ChooseBackgroundColor,10,208,50,16
+ PUSHBUTTON "&Defaults...",OPT_DefaultColors,68,208,50,16
CONTROL "Do ¬ colorize messages",OPT_DontColorize,"Button",\r
- BS_AUTOCHECKBOX | WS_TABSTOP,104,225,97,10
+ BS_AUTOCHECKBOX | WS_TABSTOP,192,212,97,10
CONTROL "",OPT_SampleShout,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
- ES_READONLY | WS_DISABLED | WS_GROUP,11,101,75,15,
+ ES_READONLY | WS_DISABLED | WS_GROUP,10,101,75,15,
WS_EX_CLIENTEDGE\r
CONTROL "",OPT_SampleSShout,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
- ES_READONLY | WS_DISABLED | WS_GROUP,11,121,75,15,
+ ES_READONLY | WS_DISABLED | WS_GROUP,10,121,75,15,
WS_EX_CLIENTEDGE\r
CONTROL "",OPT_SampleChannel1,"RICHEDIT",ES_CENTER | \r
- ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,11,
+ ES_MULTILINE | ES_READONLY | WS_DISABLED | WS_GROUP,10,
141,75,15,WS_EX_CLIENTEDGE\r
CONTROL "",OPT_SampleChannel,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
- ES_READONLY | WS_DISABLED | WS_GROUP,11,161,75,15,
+ ES_READONLY | WS_DISABLED | WS_GROUP,10,161,75,15,
WS_EX_CLIENTEDGE\r
CONTROL "",OPT_SampleKibitz,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
- ES_READONLY | WS_GROUP,11,181,75,15,WS_EX_CLIENTEDGE
+ ES_READONLY | WS_GROUP,10,181,75,15,WS_EX_CLIENTEDGE
CONTROL "",OPT_SampleTell,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
ES_READONLY | WS_DISABLED | WS_GROUP,159,101,75,15,
WS_EX_CLIENTEDGE\r
CONTROL "",OPT_SampleNormal,"RICHEDIT",ES_CENTER | ES_MULTILINE | \r
ES_READONLY | WS_DISABLED | WS_GROUP,159,181,75,15,
WS_EX_CLIENTEDGE\r
- GROUPBOX "Interaction Colors",IDC_STATIC,4,90,294,150
+ GROUPBOX "Interaction Colors",IDC_STATIC,4,90,294,140
GROUPBOX "Premove",IDC_STATIC,154,0,144,56
- GROUPBOX "",IDC_STATIC,4,0,146,88
+ GROUPBOX "General",IDC_STATIC,4,0,146,88
GROUPBOX "Alarm",IDC_STATIC,154,58,144,30
END\r
\r
PUSHBUTTON "Cancel",IDCANCEL,140,232,50,14
CONTROL "&Tiny",OPT_SizeTiny,"Button",BS_AUTORADIOBUTTON | \r
WS_GROUP | WS_TABSTOP,9,14,50,10
- CONTROL "T&eeny",OPT_SizeTeeny,"Button",BS_AUTORADIOBUTTON,9,25,
+ CONTROL "T&eeny",OPT_SizeTeeny,"Button",BS_AUTORADIOBUTTON,9,24,
50,10\r
CONTROL "&Dinky",OPT_SizeDinky,"Button",BS_AUTORADIOBUTTON,9,34,
50,10\r
44,50,10
CONTROL "Sl&im",OPT_SizeSlim,"Button",BS_AUTORADIOBUTTON,9,54,50,
10
- CONTROL "&Small",OPT_SizeSmall,"Button",BS_AUTORADIOBUTTON,9,65,
+ CONTROL "&Small",OPT_SizeSmall,"Button",BS_AUTORADIOBUTTON,9,64,
50,10\r
CONTROL "Medi&ocre",OPT_SizeMediocre,"Button",BS_AUTORADIOBUTTON,\r
70,14,50,10
CONTROL "&Middling",OPT_SizeMiddling,"Button",BS_AUTORADIOBUTTON,\r
- 70,25,50,10
+ 70,24,50,10
CONTROL "&Average",OPT_SizeAverage,"Button",BS_AUTORADIOBUTTON,\r
70,34,50,10
CONTROL "Mode&rate",OPT_SizeModerate,"Button",BS_AUTORADIOBUTTON,\r
70,44,50,10
CONTROL "Medi&um",OPT_SizeMedium,"Button",BS_AUTORADIOBUTTON,70,
54,50,10
- CONTROL "Bul&ky",OPT_SizeBulky,"Button",BS_AUTORADIOBUTTON,70,65,
+ CONTROL "Bul&ky",OPT_SizeBulky,"Button",BS_AUTORADIOBUTTON,70,64,
50,10\r
CONTROL "&Large",OPT_SizeLarge,"Button",BS_AUTORADIOBUTTON,134,
14,50,10
- CONTROL "&Big",OPT_SizeBig,"Button",BS_AUTORADIOBUTTON,134,25,50,
+ CONTROL "&Big",OPT_SizeBig,"Button",BS_AUTORADIOBUTTON,134,24,50,
10\r
CONTROL "&Huge",OPT_SizeHuge,"Button",BS_AUTORADIOBUTTON,134,34,
50,10\r
CONTROL "&Colossal",OPT_SizeColossal,"Button",BS_AUTORADIOBUTTON,\r
134,54,50,10
CONTROL "Tita&nic",OPT_SizeTitanic,"Button",BS_AUTORADIOBUTTON,\r
- 134,65,50,10
+ 134,64,50,10
PUSHBUTTON "...",OPT_ChooseLightSquareColor,110,94,20,15
PUSHBUTTON "...",OPT_ChooseDarkSquareColor,110,112,20,15
PUSHBUTTON "...",OPT_ChooseWhitePieceColor,110,130,20,15
PUSHBUTTON "...",OPT_ChooseBlackPieceColor,110,148,20,15
PUSHBUTTON "...",OPT_ChooseHighlightSquareColor,110,166,20,15
PUSHBUTTON "...",OPT_ChoosePremoveHighlightColor,110,184,20,15
+ CONTROL "Monochrome",OPT_Monochrome,"Button",BS_AUTOCHECKBOX |
+ WS_TABSTOP,10,210,64,10
PUSHBUTTON "Defaults",OPT_DefaultBoardColors,80,206,50,15
EDITTEXT OPT_DarkSquareColor,80,112,25,15,ES_READONLY |
WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
LTEXT "Square Highlights",IDC_STATIC,10,170,60,10
LTEXT "Premove Highlights",IDC_STATIC,10,188,70,10
GROUPBOX "Size",IDC_STATIC,4,4,185,75
- CONTROL "Monochrome",OPT_Monochrome,"Button",BS_AUTOCHECKBOX | \r
- WS_TABSTOP,10,210,64,10
EDITTEXT OPT_SampleLightSquare,144,96,39,36,ES_READONLY |
WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
EDITTEXT OPT_SampleDarkSquare,144,138,39,36,ES_READONLY |
WS_DISABLED | NOT WS_BORDER | NOT WS_TABSTOP\r
END\r
\r
-DLG_Fonts DIALOG DISCARDABLE 0, 0, 280, 231\r
+DLG_Fonts DIALOG DISCARDABLE 0, 0, 266, 226
STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU\r
CAPTION "Fonts"\r
FONT 8, "MS Sans Serif"\r
BEGIN\r
- DEFPUSHBUTTON "OK",IDOK,168,212,50,14
- PUSHBUTTON "Cancel",IDCANCEL,224,212,50,14
- PUSHBUTTON "Choose...",OPT_ChooseClockFont,221,17,45,15\r
- PUSHBUTTON "Choose...",OPT_ChooseMessageFont,221,47,45,15\r
- PUSHBUTTON "Choose...",OPT_ChooseCoordFont,221,77,45,15\r
- PUSHBUTTON "Choose...",OPT_ChooseTagFont,221,120,45,15\r
- PUSHBUTTON "Choose...",OPT_ChooseCommentsFont,221,150,45,15\r
- PUSHBUTTON "Choose...",OPT_ChooseConsoleFont,221,180,45,15\r
- PUSHBUTTON "&Revert to Defaults",OPT_DefaultFonts,6,210,80,15
+ DEFPUSHBUTTON "OK",IDOK,156,208,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,212,208,50,14
+ PUSHBUTTON "Choose...",OPT_ChooseClockFont,212,15,45,15
+ PUSHBUTTON "Choose...",OPT_ChooseMessageFont,212,45,45,15
+ PUSHBUTTON "Choose...",OPT_ChooseCoordFont,212,75,45,15
+ PUSHBUTTON "Choose...",OPT_ChooseTagFont,212,118,45,15
+ PUSHBUTTON "Choose...",OPT_ChooseCommentsFont,212,148,45,15
+ PUSHBUTTON "Choose...",OPT_ChooseConsoleFont,212,178,45,15
+ PUSHBUTTON "&Defaults",OPT_DefaultFonts,3,208,50,15
CONTROL "",OPT_SampleCoordFont,"RICHEDIT",ES_READONLY | \r
- WS_DISABLED | WS_BORDER,70,72,140,20\r
+ WS_DISABLED | WS_BORDER,67,71,140,20
CONTROL "",OPT_SampleTagFont,"RICHEDIT",ES_READONLY | \r
- WS_DISABLED | WS_BORDER,70,115,140,20\r
+ WS_DISABLED | WS_BORDER,67,114,140,20
CONTROL "",OPT_SampleCommentsFont,"RICHEDIT",ES_READONLY | \r
- WS_DISABLED | WS_BORDER,70,145,140,20\r
+ WS_DISABLED | WS_BORDER,67,144,140,20
CONTROL "",OPT_SampleConsoleFont,"RICHEDIT",ES_READONLY | \r
- WS_DISABLED | WS_BORDER,70,175,140,20\r
- LTEXT "Clocks",OPT_ClockFont,16,17,45,10,NOT WS_GROUP\r
- LTEXT "Messages",OPT_MessageFont,16,47,45,10,NOT WS_GROUP\r
- LTEXT "Coordinates",OPT_CoordFont,16,77,45,10,NOT WS_GROUP\r
- LTEXT "Tags",OPT_EditTagsFont,16,120,45,10,NOT WS_GROUP\r
- LTEXT "Comments",OPT_CommentsFont,16,150,45,10,NOT WS_GROUP\r
- LTEXT "ICS Interaction",OPT_MessageFont5,16,180,50,10,NOT \r
+ WS_DISABLED | WS_BORDER,67,174,140,20
+ LTEXT "Clocks",OPT_ClockFont,13,16,45,10,NOT WS_GROUP
+ LTEXT "Messages",OPT_MessageFont,13,46,45,10,NOT WS_GROUP
+ LTEXT "Coordinates",OPT_CoordFont,13,76,45,10,NOT WS_GROUP
+ LTEXT "Tags",OPT_EditTagsFont,13,119,45,10,NOT WS_GROUP
+ LTEXT "Comments",OPT_CommentsFont,13,149,45,10,NOT WS_GROUP
+ LTEXT "ICS Interaction",OPT_MessageFont5,13,179,50,10,NOT
WS_GROUP\r
CONTROL "",OPT_SampleClockFont,"RICHEDIT",ES_READONLY | \r
- WS_DISABLED | WS_BORDER,70,12,140,20\r
+ WS_DISABLED | WS_BORDER,67,11,140,20
CONTROL "",OPT_SampleMessageFont,"RICHEDIT",ES_READONLY | \r
- WS_DISABLED | WS_BORDER,70,42,140,20\r
- GROUPBOX "Current Board Size",IDC_STATIC,5,2,270,100\r
- GROUPBOX "All Board Sizes",IDC_STATIC,5,105,270,100\r
+ WS_DISABLED | WS_BORDER,67,41,140,20
+ GROUPBOX "Current Board Size",IDC_STATIC,3,1,259,100
+ GROUPBOX "All Board Sizes",IDC_STATIC,3,102,259,100
END\r
\r
DLG_NewGameFRC DIALOG DISCARDABLE 0, 0, 176, 47
WS_BORDER | WS_VSCROLL | WS_TABSTOP,2,2,222,128
END
-DLG_EvalGraph DIALOGEX 0, 0, 215, 75
+DLG_EvalGraph DIALOGEX 0, 0, 216, 75
STYLE WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME
EXSTYLE WS_EX_TOOLWINDOW
-CAPTION "Evaluation Graph"
-FONT 8, "MS Sans Serif", 0, 0, 0x1
+CAPTION "Evaluation Diagram"
+FONT 8, "MS Sans Serif"
BEGIN
END
CAPTION "Engine output"
FONT 8, "MS Sans Serif"
BEGIN
- LTEXT "Engine #1",IDC_EngineLabel1,2,2,152,8
- RTEXT "",IDC_Engine1_NPS,194,2,69,8
+ LTEXT "Engine #1",IDC_EngineLabel1,14,2,110,8
+ RTEXT "NPS",IDC_Engine1_NPS,206,2,57,8
CONTROL "",IDC_EngineMemo1,"RICHEDIT",ES_MULTILINE |
ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL |
- WS_HSCROLL | WS_TABSTOP,2,10,262,72
- LTEXT "Engine #2",IDC_EngineLabel2,2,84,152,8
- RTEXT "",IDC_Engine2_NPS,196,84,67,8
+ WS_HSCROLL | WS_TABSTOP,0,10,262,72
+ LTEXT "Engine #2",IDC_EngineLabel2,15,84,103,8
+ RTEXT "NPS",IDC_Engine2_NPS,210,84,55,8
CONTROL "",IDC_EngineMemo2,"RICHEDIT",ES_MULTILINE |
ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_BORDER | WS_VSCROLL |
WS_HSCROLL | WS_TABSTOP,2,92,262,74
+ ICON IDI_UNKNOWN_14,IDC_Color1,2,4,20,20,SS_REALSIZEIMAGE
+ ICON IDI_UNKNOWN_14,IDC_Color2,4,84,20,20
+ LTEXT "Static",IDC_StateData1,182,2,19,8
+ ICON IDI_TRANS_14,IDC_StateIcon1,160,2,20,20
+ LTEXT "Static",IDC_StateData2,186,84,19,8
+ ICON IDI_TRANS_14,IDC_StateIcon2,164,84,20,20
END
DLG_EnginePlayOptions DIALOG DISCARDABLE 0, 0, 208, 129
PUSHBUTTON "Cancel",IDCANCEL,154,112,50,14
END
+DLG_OptionsUCI DIALOG DISCARDABLE 0, 0, 228, 102
+STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "UCI Options"
+FONT 8, "MS Sans Serif"
+BEGIN
+ LTEXT "Polyglot Directory:",IDC_STATIC,2,8,58,8
+ EDITTEXT IDC_PolyglotDir,62,4,140,14,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_BrowseForPolyglotDir,206,4,17,14
+ LTEXT "Hash Size (MB):",IDC_STATIC,2,26,52,8
+ EDITTEXT IDC_HashSize,62,22,40,14,ES_AUTOHSCROLL
+ LTEXT "EGTB Path:",IDC_STATIC,2,44,39,8
+ EDITTEXT IDC_PathToEGTB,62,40,140,14,ES_AUTOHSCROLL
+ PUSHBUTTON "...",IDC_BrowseForEGTB,206,40,17,14
+ LTEXT "EGTB Size (MB):",IDC_STATIC,2,62,54,8
+ EDITTEXT IDC_SizeOfEGTB,62,58,40,14,ES_AUTOHSCROLL
+ DEFPUSHBUTTON "OK",IDOK,118,84,50,14
+ PUSHBUTTON "Cancel",IDCANCEL,174,84,50,14
+END
+
\r
/////////////////////////////////////////////////////////////////////////////\r
//\r
DLG_GeneralOptions, DIALOG\r
BEGIN\r
LEFTMARGIN, 7\r
- RIGHTMARGIN, 264\r
+ RIGHTMARGIN, 213
TOPMARGIN, 7\r
- BOTTOMMARGIN, 155
+ BOTTOMMARGIN, 176
END\r
\r
DLG_IcsOptions, DIALOG\r
LEFTMARGIN, 7\r
RIGHTMARGIN, 295
TOPMARGIN, 7\r
- BOTTOMMARGIN, 258
+ BOTTOMMARGIN, 248
END\r
\r
DLG_BoardOptions, DIALOG\r
DLG_Fonts, DIALOG\r
BEGIN\r
LEFTMARGIN, 7\r
- RIGHTMARGIN, 273\r
+ RIGHTMARGIN, 259
TOPMARGIN, 7\r
- BOTTOMMARGIN, 224\r
+ BOTTOMMARGIN, 219
END\r
DLG_NewGameFRC, DIALOG
DLG_EvalGraph, DIALOG
BEGIN
LEFTMARGIN, 7
- RIGHTMARGIN, 208
+ RIGHTMARGIN, 209
TOPMARGIN, 7
BOTTOMMARGIN, 68
END
TOPMARGIN, 7
BOTTOMMARGIN, 122
END
+
+ DLG_OptionsUCI, DIALOG
+ BEGIN
+ LEFTMARGIN, 7
+ RIGHTMARGIN, 221
+ TOPMARGIN, 7
+ BOTTOMMARGIN, 95
+ END
END\r
#endif // APSTUDIO_INVOKED\r
\r
\r
// Icon with lowest ID value placed first to ensure application icon\r
// remains consistent on all systems.\r
+IDI_WHITE_14 ICON DISCARDABLE "bitmaps\\white_14.ico"
ICON_BLACK ICON DISCARDABLE "bitmaps\\icon_ob.ico"\r
ICON_BOARD ICON DISCARDABLE "bitmaps\\board.ico"\r
ICON_WHITE ICON DISCARDABLE "bitmaps\\icon_whi.ico"\r
+IDI_BLACK_14 ICON DISCARDABLE "bitmaps\\black_14.ico"
+IDI_PONDER_14 ICON DISCARDABLE "bitmaps\\ponder_14.ico"
+IDI_TRANS_14 ICON DISCARDABLE "bitmaps\\trans_14.ico"
+IDI_CLOCK_14 ICON DISCARDABLE "bitmaps\\clock_14.ico"
+IDI_UNKNOWN_14 ICON DISCARDABLE "bitmaps\\unknown_14.ico"
+IDI_BALOON_14 ICON DISCARDABLE "bitmaps\\baloon_14.ico"
\r
/////////////////////////////////////////////////////////////////////////////\r
//\r
MENUITEM "&General...", IDM_GeneralOptions\r
MENUITEM "&Board...", IDM_BoardOptions\r
MENUITEM "Engines...", IDM_EnginePlayOptions
+ MENUITEM "UCI...", IDM_OptionsUCI
MENUITEM "&ICS...", IDM_IcsOptions, GRAYED\r
MENUITEM "&Fonts...", IDM_Fonts\r
MENUITEM "Soun&ds...", IDM_Sounds\r
projects / xboard.git / commitdiff