--- branches/dev-api-4/xvidcore/vfw/src/resource.rc 2004/01/22 14:43:39 1319 +++ branches/dev-api-4/xvidcore/vfw/src/resource.rc 2004/01/23 11:03:48 1325 @@ -83,10 +83,10 @@ COMBOBOX IDC_MODE,88,34,92,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP PUSHBUTTON "Advanced Options...",IDC_ADVANCED,71,210,84,12 - DEFPUSHBUTTON "OK",IDOK,133,234,84,13 + DEFPUSHBUTTON "OK",IDOK,156,234,60,13 LTEXT "Encoding type:",IDC_STATIC,14,34,70,12,SS_CENTERIMAGE GROUPBOX "Main Settings",IDC_STATIC,7,3,212,246 - PUSHBUTTON "Load Defaults",IDC_DEFAULTS,9,234,84,13 + PUSHBUTTON "Load Defaults",IDC_DEFAULTS,9,234,60,13 PUSHBUTTON "more...",IDC_MODE_ADV,184,34,28,12 LTEXT "Profile @ Level:",IDC_STATIC,14,16,70,12,SS_CENTERIMAGE PUSHBUTTON "more...",IDC_PROFILE_ADV,184,16,28,12 @@ -107,6 +107,7 @@ SS_NOTIFY | SS_CENTERIMAGE,WS_EX_DLGMODALFRAME GROUPBOX "Zones",IDC_STATIC,7,98,212,107 GROUPBOX "More",IDC_STATIC,7,200,212,29 + PUSHBUTTON "Decoder Options",IDC_DECODER,82,234,60,13 END IDD_QUANT DIALOG DISCARDABLE 0, 0, 212, 212 @@ -607,125 +608,148 @@ IDC_STATIC,8,128,196,80 END -IDD_CALC DIALOG DISCARDABLE 0, 0, 212, 212 +IDD_DEC DIALOG DISCARDABLE 0, 0, 212, 212 STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Calculator" +CAPTION "Decoder Options" FONT 8, "MS Sans Serif" BEGIN - CTEXT "bitrate calculator",IDC_STATIC,4,99,202,14, - SS_CENTERIMAGE + CONTROL "Deblocking Y",IDC_DEC_DY,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,21,25,63,13 + CONTROL "Deblocking UV",IDC_DEC_DUV,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,21,42,79,13 + CONTROL "Deringing",IDC_DEC_DR,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,115,25,60,13 + CONTROL "Film Effect",IDC_DEC_FE,"Button",BS_AUTOCHECKBOX | + WS_TABSTOP,115,42,60,13 END -IDD_STATUS DIALOGEX 0, 0, 381, 236 +IDD_STATUS DIALOGEX 0, 0, 325, 220 STYLE DS_MODALFRAME | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "XviD Status" FONT 8, "MS Sans Serif" BEGIN CONTROL "",IDC_STATUS_GRAPH,"Static",SS_OWNERDRAW | SS_NOTIFY,4, - 4,372,108 - LTEXT "I-VOP",IDC_STATIC,16,144,36,8 - LTEXT "B-VOP",IDC_STATIC,16,174,36,8 - LTEXT "P-VOP",IDC_STATIC,16,160,36,8 - LTEXT "Total",IDC_STATIC,16,190,36,8 - EDITTEXT IDC_STATUS_IQ_MIN,124,144,24,12,ES_RIGHT | + 4,187,108 + LTEXT "I-VOP",IDC_STATIC,26,139,22,8 + LTEXT "B-VOP",IDC_STATIC,26,167,24,8 + LTEXT "P-VOP",IDC_STATIC,26,153,23,8 + LTEXT "Total",IDC_STATIC,26,181,21,8 + EDITTEXT IDC_STATUS_IQ_MIN,103,137,17,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_IQ_MAX,152,144,24,12,ES_RIGHT | + EDITTEXT IDC_STATUS_IQ_MAX,123,137,17,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_PQ_MIN,124,160,24,12,ES_RIGHT | + EDITTEXT IDC_STATUS_PQ_MIN,103,152,17,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_PQ_MAX,152,160,24,12,ES_RIGHT | + EDITTEXT IDC_STATUS_PQ_MAX,123,152,17,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_BQ_MIN,124,174,24,12,ES_RIGHT | + EDITTEXT IDC_STATUS_BQ_MIN,103,166,17,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_BQ_MAX,152,174,24,12,ES_RIGHT | + EDITTEXT IDC_STATUS_BQ_MAX,123,166,17,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_Q_MIN,124,190,24,12,ES_RIGHT | ES_AUTOHSCROLL | + EDITTEXT IDC_STATUS_Q_MIN,103,180,17,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_Q_MAX,152,190,24,12,ES_RIGHT | ES_AUTOHSCROLL | + EDITTEXT IDC_STATUS_Q_MAX,123,180,17,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE - CTEXT "Min",IDC_STATIC,124,132,24,8 - CTEXT "Max",IDC_STATIC,152,132,24,8 - EDITTEXT IDC_STATUS_IL_MIN,200,144,36,12,ES_RIGHT | + CTEXT "Min",IDC_STATIC,104,126,14,8 + CTEXT "Max",IDC_STATIC,123,126,16,8 + EDITTEXT IDC_STATUS_IL_MIN,174,137,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_IL_MAX,240,144,36,12,ES_RIGHT | + EDITTEXT IDC_STATUS_IL_MAX,206,137,28,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_PL_MIN,200,160,36,12,ES_RIGHT | + EDITTEXT IDC_STATUS_PL_MIN,174,152,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_PL_MAX,240,160,36,12,ES_RIGHT | + EDITTEXT IDC_STATUS_PL_MAX,206,152,28,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_BL_MIN,200,174,36,12,ES_RIGHT | + EDITTEXT IDC_STATUS_BL_MIN,174,166,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_BL_MAX,240,174,36,12,ES_RIGHT | + EDITTEXT IDC_STATUS_BL_MAX,206,166,28,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_L_MIN,200,190,36,12,ES_RIGHT | ES_AUTOHSCROLL | + EDITTEXT IDC_STATUS_L_MIN,174,180,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_L_MAX,240,190,36,12,ES_RIGHT | ES_AUTOHSCROLL | + EDITTEXT IDC_STATUS_L_MAX,206,180,28,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE - CTEXT "Min",IDC_STATIC,200,132,36,8 - CTEXT "Max",IDC_STATIC,240,132,36,8 - EDITTEXT IDC_STATUS_IL_TOT,320,144,36,12,ES_RIGHT | + CTEXT "Min",IDC_STATIC,177,125,24,8 + CTEXT "Max",IDC_STATIC,205,125,29,8 + EDITTEXT IDC_STATUS_IL_TOT,270,137,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_PL_TOT,320,160,36,12,ES_RIGHT | + EDITTEXT IDC_STATUS_PL_TOT,270,152,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_BL_TOT,320,174,36,12,ES_RIGHT | + EDITTEXT IDC_STATUS_BL_TOT,270,166,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_L_TOT,320,190,36,12,ES_RIGHT | ES_AUTOHSCROLL | + EDITTEXT IDC_STATUS_L_TOT,270,180,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE - CTEXT "Total (k)",IDC_STATIC,320,132,36,8 + CTEXT "Total (k)",IDC_STATIC,271,125,28,8 CONTROL "Auto-close window",IDC_STATUS_DESTROY,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,216,100,10 - EDITTEXT IDC_STATUS_KBPS,280,214,36,12,ES_RIGHT | ES_AUTOHSCROLL | + BS_AUTOCHECKBOX | WS_TABSTOP,13,202,100,10 + EDITTEXT IDC_STATUS_KBPS,267,199,36,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_IL_AVG,280,144,36,12,ES_RIGHT | + EDITTEXT IDC_STATUS_IL_AVG,237,137,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_PL_AVG,280,160,36,12,ES_RIGHT | + EDITTEXT IDC_STATUS_PL_AVG,237,152,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_BL_AVG,280,174,36,12,ES_RIGHT | + EDITTEXT IDC_STATUS_BL_AVG,237,166,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP,WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_L_AVG,280,190,36,12,ES_RIGHT | ES_AUTOHSCROLL | + EDITTEXT IDC_STATUS_L_AVG,237,180,29,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE - CTEXT "Average",IDC_STATIC,280,132,36,8 - EDITTEXT IDC_STATUS_I_NUM,64,142,36,12,ES_RIGHT | ES_AUTOHSCROLL | + CTEXT "Average",IDC_STATIC,237,125,30,8 + EDITTEXT IDC_STATUS_I_NUM,57,138,32,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_P_NUM,64,158,36,12,ES_RIGHT | ES_AUTOHSCROLL | + EDITTEXT IDC_STATUS_P_NUM,57,152,32,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_B_NUM,64,172,36,12,ES_RIGHT | ES_AUTOHSCROLL | + EDITTEXT IDC_STATUS_B_NUM,57,166,32,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE - EDITTEXT IDC_STATUS_NUM,64,188,36,12,ES_RIGHT | ES_AUTOHSCROLL | + EDITTEXT IDC_STATUS_NUM,57,180,32,12,ES_RIGHT | ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP, WS_EX_STATICEDGE - GROUPBOX "Frame size (bytes)",IDC_STATIC,192,122,172,86,BS_CENTER - GROUPBOX "Quant",IDC_STATIC,116,122,68,86,BS_CENTER - GROUPBOX "Frames",IDC_STATIC,56,122,52,86,BS_CENTER - LTEXT "Avg bitrate (kbps):",IDC_STATIC,204,216,72,8 + GROUPBOX "Frame size (bytes)",IDC_STATIC,170,117,133,80,BS_CENTER + GROUPBOX "Quant",IDC_STATIC,99,117,65,80,BS_CENTER + GROUPBOX "Frames",IDC_STATIC,53,117,40,80,BS_CENTER + LTEXT "Avg bitrate (kbps):",IDC_STATIC,200,201,59,8 + LISTBOX IDC_DEBUGOUTPUT,201,13,113,100,LBS_NOINTEGRALHEIGHT | + WS_TABSTOP + CONTROL "Show me the internals!",IDC_SHOWINTERNALS,"Button", + BS_AUTOCHECKBOX | BS_NOTIFY | WS_TABSTOP,201,1,87,10 + EDITTEXT IDC_STATUS_IQ_AVG,143,137,17,12,ES_RIGHT | + ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | + NOT WS_TABSTOP,WS_EX_STATICEDGE + EDITTEXT IDC_STATUS_PQ_AVG,143,152,17,12,ES_RIGHT | + ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | + NOT WS_TABSTOP,WS_EX_STATICEDGE + EDITTEXT IDC_STATUS_BQ_AVG,143,166,17,12,ES_RIGHT | + ES_AUTOHSCROLL | ES_READONLY | ES_NUMBER | NOT WS_BORDER | + NOT WS_TABSTOP,WS_EX_STATICEDGE + EDITTEXT IDC_STATUS_Q_AVG,143,180,17,12,ES_RIGHT | ES_AUTOHSCROLL | + ES_READONLY | ES_NUMBER | NOT WS_BORDER | NOT WS_TABSTOP, + WS_EX_STATICEDGE + CTEXT "Avg",IDC_STATIC,143,126,16,8 END IDD_AR DIALOGEX 0, 0, 211, 215 @@ -866,7 +890,7 @@ BOTTOMMARGIN, 214 END - IDD_CALC, DIALOG + IDD_DEC, DIALOG BEGIN LEFTMARGIN, 7 RIGHTMARGIN, 193 @@ -876,9 +900,9 @@ IDD_STATUS, DIALOG BEGIN LEFTMARGIN, 7 - RIGHTMARGIN, 374 - TOPMARGIN, 7 - BOTTOMMARGIN, 229 + RIGHTMARGIN, 318 + TOPMARGIN, 3 + BOTTOMMARGIN, 213 END IDD_AR, DIALOG