diff --git a/src/win32/zdoom.rc b/src/win32/zdoom.rc index 4c5660a48..b7c9c6acd 100644 --- a/src/win32/zdoom.rc +++ b/src/win32/zdoom.rc @@ -41,7 +41,7 @@ END 3 TEXTINCLUDE BEGIN "#ifndef NO_MANIFEST\r\n" - " CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""zdoom.exe.manifest""\r\n" + " CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST ""..\\common\\platform\\win32\\manifest.xml""\r\n" "#endif\r\n" "\r\n" "/////////////////////////////////////////////////////////////////////////////\r\n" @@ -109,47 +109,10 @@ GUIDELINES DESIGNINFO BEGIN IDD_IWADDIALOG, DIALOG BEGIN - LEFTMARGIN, 5 - RIGHTMARGIN, 223 + LEFTMARGIN, 8 + RIGHTMARGIN, 264 TOPMARGIN, 7 - BOTTOMMARGIN, 241 - END - - IDD_EAXPROPERTYLIST, DIALOG - BEGIN - LEFTMARGIN, 2 - RIGHTMARGIN, 249 - VERTGUIDE, 88 - VERTGUIDE, 122 - TOPMARGIN, 7 - BOTTOMMARGIN, 400 - END - - IDD_EAXEDIT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 273 - TOPMARGIN, 7 - BOTTOMMARGIN, 319 - HORZGUIDE, 299 - END - - IDD_NEWEAX, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 341 - TOPMARGIN, 7 - BOTTOMMARGIN, 250 - HORZGUIDE, 216 - END - - IDD_SAVEEAX, DIALOG - BEGIN - LEFTMARGIN, 6 - RIGHTMARGIN, 377 - VERTGUIDE, 370 - BOTTOMMARGIN, 88 - HORZGUIDE, 12 + BOTTOMMARGIN, 222 END IDD_CRASHDIALOG, DIALOG @@ -202,29 +165,28 @@ END // Dialog // -IDD_IWADDIALOG DIALOGEX 0, 0, 225, 248 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +IDD_IWADDIALOG DIALOGEX 0, 0, 272, 229 +STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_CAPTION EXSTYLE WS_EX_APPWINDOW CAPTION "Welcome" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 +FONT 10, "Segoe UI", 400, 0, 0x0 BEGIN - ICON IDI_ICON1,IDC_STATIC,7,7,20,20 - LTEXT "Welcome to VkDoom!",IDC_STATIC,43,8,180,8 - LTEXT "",IDC_WELCOME_VERSION,43,18,180,8 - GROUPBOX "IWAD selection",IDC_STATIC,8,32,208,117 - LTEXT "Select which game file (IWAD) to run.",IDC_STATIC,12,44,190,8 - LISTBOX IDC_IWADLIST,12,56,200,87,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - GROUPBOX "Video settings",IDC_STATIC,8,155,68,65 - CONTROL "&Fullscreen",IDC_WELCOME_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,13,206,48,10 - GROUPBOX "Extra Graphics",IDC_STATIC,159,155,59,64 - CONTROL "Disable &autoload",IDC_WELCOME_NOAUTOLOAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,86,166,65,10 - CONTROL "&Lights",IDC_WELCOME_LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,165,43,10 - CONTROL "&Brightmaps",IDC_WELCOME_BRIGHTMAPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,177,51,10 - CONTROL "&Widescreen",IDC_WELCOME_WIDESCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,164,188,48,12 - CONTROL "&Don't ask me again",IDC_DONTASKIWAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,83,190,72,10 - DEFPUSHBUTTON "&Play Game!",IDOK,8,227,90,14 - PUSHBUTTON "E&xit",IDCANCEL,166,227,50,14 - CONTROL "&Vulkan",IDC_WELCOME_VULKAN2,"Button",BS_AUTORADIOBUTTON,13,176,37,10 + ICON IDI_ICON1,IDC_STATIC,16,10,18,15 + LTEXT "Welcome to VkDoom!",IDC_STATIC,50,8,180,8 + LTEXT "",IDC_WELCOME_VERSION,50,18,180,8 + GROUPBOX "IWAD selection",IDC_STATIC,8,32,256,117 + LTEXT "Select which game file (IWAD) to run.",IDC_STATIC,16,44,190,8 + LISTBOX IDC_IWADLIST,16,56,240,86,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP + CONTROL "&Fullscreen",IDC_WELCOME_FULLSCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,165,48,10 + GROUPBOX "Extra Graphics",IDC_STATIC,139,155,125,48 + CONTROL "Disable &autoload",IDC_WELCOME_NOAUTOLOAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,177,80,10 + CONTROL "&Lights",IDC_WELCOME_LIGHTS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,165,43,10 + CONTROL "&Brightmaps",IDC_WELCOME_BRIGHTMAPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,177,51,10 + CONTROL "&Widescreen",IDC_WELCOME_WIDESCREEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,148,188,48,12 + CONTROL "&Don't ask me again",IDC_DONTASKIWAD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,188,90,10 + DEFPUSHBUTTON "&Play Game!",IDOK,8,208,60,14 + PUSHBUTTON "E&xit",IDCANCEL,204,208,60,14 + GROUPBOX "General",IDC_STATIC,8,155,125,48 END IDD_CRASHDIALOG DIALOGEX 0, 0, 415, 308 @@ -243,10 +205,10 @@ STYLE DS_SETFONT | DS_FIXEDSYS | DS_CONTROL | WS_CHILD | WS_VISIBLE FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN EDITTEXT IDC_CRASHINFO,7,126,377,90,ES_MULTILINE | ES_AUTOVSCROLL | ES_WANTRETURN | WS_VSCROLL - CONTROL "",IDC_PLEASETELLUS,"RichEdit20W",ES_MULTILINE | ES_READONLY,7,50,377,54,WS_EX_TRANSPARENT + CONTROL "",IDC_PLEASETELLUS,"RichEdit20W",0x804,7,50,377,54,WS_EX_TRANSPARENT LTEXT "(Optional) To help diagnose the cause of this error, please describe what you were doing when the error occured. If you were playing with custom wads, please also indicate where to obtain them:",IDC_STATIC,7,108,377,16,0,WS_EX_TRANSPARENT CONTROL IDB_BITMAP1,IDC_DEADGUYVIEWER,"Static",SS_BITMAP,345,7,23,26 - CONTROL "",IDC_CRASHHEADER,"RichEdit20W",ES_MULTILINE | ES_AUTOHSCROLL | ES_READONLY,18,13,306,25,WS_EX_TRANSPARENT + CONTROL "",IDC_CRASHHEADER,"RichEdit20W",0x884,18,13,306,25,WS_EX_TRANSPARENT CONTROL "",IDC_STATIC,"Static",SS_ETCHEDHORZ,0,42,407,1 GROUPBOX "Summary",IDC_STATIC,7,223,377,34 LTEXT "Static",IDC_CRASHSUMMARY,14,233,363,20 @@ -260,7 +222,7 @@ BEGIN LTEXT "The selected file contains this information:",IDC_STATIC,7,74,136,8 RTEXT "Static",IDC_CRASHFILESIZE,337,74,55,8 LISTBOX IDC_CRASHFILES,7,15,385,53,LBS_NOINTEGRALHEIGHT | WS_VSCROLL | WS_TABSTOP - CONTROL "",IDC_CRASHFILECONTENTS,"RichEdit20W",ES_MULTILINE | ES_READONLY | WS_BORDER | WS_VSCROLL | WS_TABSTOP,7,83,385,174 + CONTROL "",IDC_CRASHFILECONTENTS,"RichEdit20W",WS_BORDER | WS_VSCROLL | WS_TABSTOP | 0x804,7,83,385,174 END IDD_ERRORPANE DIALOGEX 0, 0, 190, 28 @@ -340,11 +302,11 @@ BEGIN BEGIN VALUE "Comments", "Thanks to id Software for creating DOOM and then releasing the source code. Thanks also to TeamTNT for creating BOOM, which ZDoom is partially based on. Includes code based on the Cajun Bot 0.97 by Martin Collberg." VALUE "CompanyName", " " - VALUE "FileDescription", "VkDoom " GIT_DESCRIPTION + VALUE "FileDescription", "VkDoom" GIT_DESCRIPTION VALUE "FileVersion", RC_FILEVERSION2 VALUE "InternalName", "VkDoom" - VALUE "LegalCopyright", "This isn't 1995. Typing a copyright here is silly!" - VALUE "LegalTrademarks", "Doom is a Registered Trademark of id Software, Inc." + VALUE "LegalCopyright", "Copyright 1993-1996 id Software, 1998-2010 Randy Heit, 2002-2010 Christoph Oelckers, et al." + VALUE "LegalTrademarks", "DoomR is a Registered Trademark of id Software, Inc." VALUE "OriginalFilename", "vkdoom.exe" VALUE "ProductName", "VkDoom" VALUE "ProductVersion", GIT_DESCRIPTION