--- trunk/xvidcore/vfw/src/resource.rc 2004/07/18 12:45:57 1510 +++ trunk/xvidcore/vfw/src/resource.rc 2004/11/22 10:40:03 1562 @@ -7,14 +7,10 @@ // // Generated from the TEXTINCLUDE 2 resource. // -#ifdef _MSC_VER -#include "afxres.h" -#else #include #ifndef IDC_STATIC #define IDC_STATIC (-1) #endif -#endif ///////////////////////////////////////////////////////////////////////////// #undef APSTUDIO_READONLY_SYMBOLS @@ -498,9 +494,10 @@ CONTROL "IDB_LOGO",IDC_STATIC,"Static",SS_BITMAP,24,56,15,13 CTEXT "XviD MPEG4 video codec",IDC_STATIC,8,16,176,12 GROUPBOX "About",IDC_STATIC,4,4,184,132 - DEFPUSHBUTTON "OK",IDOK,56,144,80,12 + DEFPUSHBUTTON "OK",IDOK,102,144,80,14 CTEXT "CORE",IDC_CORE,8,40,176,8,SS_CENTERIMAGE CTEXT "( SPECIAL BUILD )",IDC_SPECIAL_BUILD,5,102,181,8 + PUSHBUTTON "View License...",IDC_LICENSE,10,144,80,14 END IDD_RC_CBR DIALOG DISCARDABLE 0, 0, 212, 212 @@ -540,7 +537,8 @@ CONTROL "Global Motion Compensation",IDC_GMC,"Button", BS_AUTOCHECKBOX | WS_TABSTOP,16,92,103,8 CONTROL "Reduced Resolution",IDC_REDUCED,"Button", - BS_AUTOCHECKBOX | WS_TABSTOP,16,106,100,8 + BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,16,106,100, + 8 CONTROL "B-VOPs",IDC_BVOP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP, 16,120,40,8 LTEXT "Max consecutive BVOPs:",IDC_MAXBFRAMES_S,16,136,96,8 @@ -595,26 +593,27 @@ BEGIN COMBOBOX IDC_LEVEL_PROFILE,84,8,116,76,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_LEVEL_WIDTH,88,39,28,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_HEIGHT,128,39,28,12,ES_AUTOHSCROLL | + EDITTEXT IDC_LEVEL_WIDTH,88,43,28,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_LEVEL_HEIGHT,128,43,28,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_FPS,168,39,28,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_VMV,156,57,40,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_VCV,156,73,40,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_VBV,156,89,40,12,ES_AUTOHSCROLL | ES_READONLY - EDITTEXT IDC_LEVEL_BITRATE,156,105,40,12,ES_AUTOHSCROLL | + EDITTEXT IDC_LEVEL_FPS,168,43,28,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_LEVEL_VMV,156,60,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_LEVEL_VCV,156,77,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_LEVEL_VBV,156,115,40,12,ES_AUTOHSCROLL | ES_READONLY + EDITTEXT IDC_LEVEL_BITRATE,156,131,40,12,ES_AUTOHSCROLL | ES_READONLY LTEXT "Profile @ Level:",IDC_STATIC,8,10,52,8 - GROUPBOX "Level",IDC_STATIC,8,28,196,96 - LTEXT "Suggested:",IDC_STATIC,16,41,48,8 - LTEXT "x",IDC_STATIC,120,41,8,8 - LTEXT "Max bitrate (kbps)",IDC_STATIC,16,105,108,8 - LTEXT "Max buffer size (bits):",IDC_STATIC,16,89,108,8 - LTEXT "Max processing rate (mbs/sec)",IDC_STATIC,16,73,108,8 - LTEXT "Max frame size (mbs):",IDC_STATIC,16,57,108,8 - LTEXT "x",IDC_STATIC,160,41,8,8 - CTEXT "\n\nThis is informative only.\n\nXviD's ratecontrol will not respect these values.", - IDC_STATIC,8,128,196,80 + GROUPBOX "Level - XviD will not force you to respect these", + IDC_STATIC,8,28,196,66 + LTEXT "Suggested:",IDC_STATIC,16,45,48,8 + LTEXT "x",IDC_STATIC,120,45,8,8 + LTEXT "Max bitrate (kbps)",IDC_STATIC,16,133,108,8 + LTEXT "Max buffer size (bits):",IDC_STATIC,16,117,108,8 + LTEXT "Max processing rate (mbs/sec)",IDC_STATIC,16,79,108,8 + LTEXT "Max frame size (macroblocks):",IDC_STATIC,16,63,108,8 + LTEXT "x",IDC_STATIC,160,45,8,8 + GROUPBOX "Video Buffer Verifier - used in Two-Pass mode", + IDC_STATIC,8,100,196,49 END IDD_DEC DIALOG DISCARDABLE 0, 0, 212, 212 @@ -854,6 +853,16 @@ SS_CENTERIMAGE END +IDD_LICENSE DIALOG DISCARDABLE 0, 0, 430, 234 +STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU +CAPTION "GNU General Public License" +FONT 8, "MS Sans Serif" +BEGIN + PUSHBUTTON "Dismiss",IDOK,172,218,84,14 + EDITTEXT IDC_LICENSE_TEXT,2,2,426,212,ES_MULTILINE | + ES_AUTOHSCROLL | ES_READONLY | WS_VSCROLL +END + ///////////////////////////////////////////////////////////////////////////// // @@ -873,6 +882,42 @@ ///////////////////////////////////////////////////////////////////////////// // +// TEXT +// + +IDR_GPL TEXT DISCARDABLE "../../LICENSE" + +#ifdef APSTUDIO_INVOKED +///////////////////////////////////////////////////////////////////////////// +// +// TEXTINCLUDE +// + +1 TEXTINCLUDE DISCARDABLE +BEGIN + "resource.h\0" +END + +2 TEXTINCLUDE DISCARDABLE +BEGIN + "#include \r\n" + "#ifndef IDC_STATIC\r\n" + "#define IDC_STATIC (-1)\r\n" + "#endif\r\n" + "\0" +END + +3 TEXTINCLUDE DISCARDABLE +BEGIN + "\r\n" + "\0" +END + +#endif // APSTUDIO_INVOKED + + +///////////////////////////////////////////////////////////////////////////// +// // String Table // @@ -1018,44 +1063,6 @@ ///////////////////////////////////////////////////////////////////////////// -///////////////////////////////////////////////////////////////////////////// -// Englisch (Australien) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENA) -#ifdef _WIN32 -LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_AUS -#pragma code_page(1252) -#endif //_WIN32 - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE DISCARDABLE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE DISCARDABLE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE DISCARDABLE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // Englisch (Australien) resources -///////////////////////////////////////////////////////////////////////////// - - #ifndef APSTUDIO_INVOKED /////////////////////////////////////////////////////////////////////////////