diff --git a/makefile b/makefile index 7a54cb7f0..ed9f9c9bc 100644 --- a/makefile +++ b/makefile @@ -18,6 +18,9 @@ export # Include Unicode support UNICODE = 1 +# Use Segoe Fonts (installed by default on Windows Vista and newer) +#USE_SEGOE = 1 + # Build A68K ASM 68000 core #BUILD_A68K = 1 diff --git a/makefile.mamemingw b/makefile.mamemingw index 5dddc5e29..9cddfdab7 100644 --- a/makefile.mamemingw +++ b/makefile.mamemingw @@ -247,6 +247,10 @@ ifdef INCLUDE_CPLUSPLUS11_FILES endif endif +ifdef USE_SEGOE + DEF := $(DEF) -DUSE_SEGOE +endif + ifdef SYMBOL CFLAGS += -ggdb3 @@ -391,7 +395,11 @@ resource.o resource.d: $(app_gnuc.rc) string.rc version.rc version.h $(build_det $(license.rtf): $(srcdir)license.txt $(srcdir)dep/scripts/license2rtf.pl ifdef PERL +ifdef USE_SEGOE + @$(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf) -f 'Segoe UI' +else @$(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf) +endif else ifeq ($(MAKELEVEL),2) @echo diff --git a/makefile.mingw b/makefile.mingw index 599ca0982..4ebb195e5 100644 --- a/makefile.mingw +++ b/makefile.mingw @@ -358,6 +358,10 @@ ifdef INCLUDE_CPLUSPLUS11_FILES endif endif +ifdef USE_SEGOE + DEF := $(DEF) -DUSE_SEGOE +endif + ifdef SYMBOL CFLAGS += -ggdb3 @@ -522,7 +526,11 @@ resource.o resource.d: $(app_gnuc.rc) string.rc version.rc version.h $(build_det $(license.rtf): $(srcdir)license.txt $(srcdir)dep/scripts/license2rtf.pl ifdef PERL +ifdef USE_SEGOE + @$(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf) -f 'Segoe UI' +else @$(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf) +endif else ifeq ($(MAKELEVEL),2) @echo diff --git a/makefile.vc b/makefile.vc index fdab6b1a3..dcd473756 100644 --- a/makefile.vc +++ b/makefile.vc @@ -238,6 +238,10 @@ ifdef BUILD_VS_XP_TARGET DEF := $(DEF) /DBUILD_VS_XP_TARGET endif +ifdef USE_SEGOE + DEF := $(DEF) /DUSE_SEGOE +endif + ifdef SYMBOL CFLAGS = /nologo /Od /GF /GS /RTC1 /Zi /Zc:forScope /MTd /EHsc /Fp$(objdir)/dep/generated/ # /Wall ASFLAGS += -g @@ -378,7 +382,11 @@ resource.res resource.d: app.rc version.rc version.h $(build_details.h) $(licens $(license.rtf): $(srcdir)license.txt $(srcdir)dep/scripts/license2rtf.pl ifdef PERL +ifdef USE_SEGOE + $(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf) -f 'Segoe UI' +else $(srcdir)dep/scripts/license2rtf.pl $< -o $(srcdir)dep/generated/$(@F:.rc=.rtf) +endif else ifeq ($(MAKELEVEL),2) @echo diff --git a/src/burner/win32/app.rc b/src/burner/win32/app.rc index c0b672159..6c4225bcc 100644 --- a/src/burner/win32/app.rc +++ b/src/burner/win32/app.rc @@ -54,7 +54,11 @@ END IDD_SPLASH DIALOGEX 0, 0, 206, 141 STYLE DS_MODALFRAME | DS_CENTER | DS_FIXEDSYS | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN CONTROL BMP_SPLASH,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,1,1,9999,9999 END @@ -62,7 +66,11 @@ END IDD_INPD DIALOGEX 0, 0, 283, 244 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Map Game Inputs" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN DEFPUSHBUTTON "OK",IDCANCEL,228,225,50,14 GROUPBOX "", IDC_STATIC, 3, 0, 277, 220 @@ -83,7 +91,11 @@ END IDD_INPS DIALOGEX 0, 0, 195, 64 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select control" +#ifdef USE_SEGOE +FONT 8, "Segoe UI" +#else FONT 8, "MS Shell Dlg" +#endif BEGIN CONTROL "Grab mouse",IDC_INPS_GRABMOUSE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,5,5,50,10 PUSHBUTTON "Activate",IDC_INPS_PUSH,5,15,50,11 @@ -97,7 +109,11 @@ END IDD_INPC DIALOGEX 0, 0, 97, 26 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION CAPTION "Edit Constant" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN EDITTEXT IDC_INPC_VALUE,5,5,40,15,ES_AUTOHSCROLL PUSHBUTTON "Close",IDCANCEL,50,5,40,15 @@ -106,7 +122,11 @@ END IDD_INPCHEAT DIALOGEX 0, 0, 250, 200 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit cheat settings" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN GROUPBOX "", IDC_STATIC, 3, 0, 244, 176 CTEXT "Select a cheat to change it.", IDC_STATIC, 7, 7, 232, 15, SS_CENTERIMAGE @@ -120,7 +140,11 @@ END IDD_INPDIP DIALOGEX 0, 0, 270, 200 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit DIPswitch settings" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN GROUPBOX "", IDC_STATIC, 3, 0, 264, 176 CTEXT "Select a setting to change it.", IDC_STATIC, 7, 7, @@ -134,7 +158,11 @@ END IDD_VALUE DIALOGEX DISCARDABLE 0, 0, 140, 20 STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU +#ifdef USE_SEGOE +FONT 8, "Segoe UI" +#else FONT 8, "MS Shell Dlg" +#endif BEGIN DEFPUSHBUTTON "Close",ID_VALUE_CLOSE,86,3,50,13 EDITTEXT IDC_VALUE_EDIT,4,3,78,12,ES_AUTOHSCROLL | ES_NUMBER @@ -143,7 +171,11 @@ END IDD_WAIT DIALOGEX 0, 0, 206, 42 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN CONTROL BMP_MISC,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,2,2,9999,9999 CONTROL "Progress1",IDC_WAIT_PROG,"msctls_progress32",PBS_SMOOTH | WS_BORDER,62,5,139,11 @@ -156,7 +188,11 @@ END IDD_ROMSDIR DIALOGEX 0, 0, 242, 81 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit ROMs paths" +#ifdef USE_SEGOE +FONT 8, "Segoe UI" +#else FONT 8, "MS Shell Dlg" +#endif BEGIN CONTROL "Tab2",IDC_ROMPATH_TAB,"SysTabControl32",WS_TABSTOP,9,6,224,48 DEFPUSHBUTTON "OK",IDOK,183,57,50,14 @@ -207,7 +243,11 @@ END IDD_ABOUT DIALOGEX 0, 0, 349, 107 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW +#ifdef USE_SEGOE +FONT 8, "Segoe UI" +#else FONT 8, "MS Shell Dlg" +#endif BEGIN CONTROL BMP_ABOUT,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,3,3,100,50 CONTROL "version",IDC_FBA_VER,"Static",SS_OWNERDRAW | WS_GROUP,78,63,264,10 @@ -221,7 +261,11 @@ END IDD_FIRST DIALOGEX 0, 0, 349, 189 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP EXSTYLE WS_EX_TOOLWINDOW +#ifdef USE_SEGOE +FONT 8, "Segoe UI" +#else FONT 8, "MS Shell Dlg" +#endif BEGIN CONTROL BMP_ABOUT,IDC_STATIC,"Static",SS_BITMAP | SS_REALSIZEIMAGE | SS_SUNKEN,3,3,100,50 CONTROL "version",IDC_FBA_VER,"Static",SS_OWNERDRAW | WS_GROUP,78,63,264,10 @@ -234,7 +278,11 @@ END IDD_SELNEW DIALOGEX 0, 0, 500, 362 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU | WS_THICKFRAME CAPTION "Select Game" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN CONTROL "Tree1",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_LINESATROOT | TVS_SHOWSELALWAYS | TVS_FULLROWSELECT | TVS_NOHSCROLL | WS_TABSTOP,9,133,323,137,WS_EX_STATICEDGE CONTROL "Tree2",IDC_TREE2,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_TABSTOP | 0x8000,345,101,148,168,WS_EX_STATICEDGE @@ -281,7 +329,11 @@ END IDD_CAPTURE DIALOGEX 0, 0, 270, 90 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Shots Factory" +#ifdef USE_SEGOE +FONT 8, "Segoe UI" +#else FONT 8, "MS Shell Dlg" +#endif BEGIN DEFPUSHBUTTON "&Capture",IDCAPTURE,125,72,70,14 PUSHBUTTON "OK",IDOK,197,72,70,14 @@ -304,7 +356,11 @@ END IDD_GAMMA DIALOGEX 0, 0, 214, 59 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select desired Gamma value" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN DEFPUSHBUTTON "OK",IDOK,159,40,50,14 GROUPBOX "", IDC_STATIC, 3, 0, 208, 35 @@ -316,10 +372,14 @@ END IDD_SCANLINE DIALOGEX 0, 0, 214, 59 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select desired scanline intensity" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN DEFPUSHBUTTON "OK",IDOK,159,40,50,14 - GROUPBOX "", IDC_STATIC, 3, 0, 208, 35 + GROUPBOX "", IDC_STATIC, 3, 0, 208, 35 CONTROL "Scanline intensity",IDC_SCANLINE_SLIDER,"msctls_trackbar32", WS_TABSTOP, 5, 10, 160, 18 EDITTEXT IDC_SCANLINE_EDIT,167,10,35,14,SS_CENTERIMAGE PUSHBUTTON "Cancel",IDCANCEL,105,40,50,14 @@ -328,10 +388,14 @@ END IDD_PHOSPHOR DIALOGEX 0, 0, 214, 82 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select desired feedback intensity" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN DEFPUSHBUTTON "OK",IDOK,159,63,50,14 - GROUPBOX "", IDC_STATIC, 3, 0, 208, 58 + GROUPBOX "", IDC_STATIC, 3, 0, 208, 58 CONTROL "Feedback strength",IDC_PHOSPHOR_1_SLIDER,"msctls_trackbar32", WS_TABSTOP, 5, 10, 160, 18 EDITTEXT IDC_PHOSPHOR_1_EDIT,167,10,35,14,SS_CENTERIMAGE RTEXT "Max. Oversaturation:", IDC_STATIC, 8, 35, 75, 10, SS_CENTERIMAGE @@ -343,7 +407,11 @@ END IDD_SCREENANGLE DIALOGEX 0, 0, 234, 82 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select desired 3D projection properties" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN DEFPUSHBUTTON "OK",IDOK,179,63,50,14 GROUPBOX "", IDC_STATIC, 3, 0, 228, 58 @@ -359,32 +427,44 @@ END IDD_CHOOSERES DIALOGEX 0, 0, 134, 54 STYLE DS_MODALFRAME | DS_CENTER | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select desired resolution" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN DEFPUSHBUTTON "OK", IDOK, 79, 35, 50, 14 - GROUPBOX "", IDC_STATIC, 3, 0, 128, 30 - LTEXT "Resolution:", IDC_RESOLUTION, 8, 11, 48, 10, SS_CENTERIMAGE - COMBOBOX IDC_CHOOSE_LIST, 60, 10, 64, 128, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL + GROUPBOX "", IDC_STATIC, 3, 0, 128, 30 + LTEXT "Resolution:", IDC_RESOLUTION, 8, 11, 48, 10, SS_CENTERIMAGE + COMBOBOX IDC_CHOOSE_LIST, 60, 10, 64, 128, CBS_DROPDOWNLIST | WS_CHILD | WS_VISIBLE | WS_TABSTOP | WS_VSCROLL PUSHBUTTON "Cancel", IDCANCEL, 25, 35, 50, 14 END IDD_CPUCLOCK DIALOGEX 0, 0, 222, 59 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Adjust speed of the emulated CPU" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN DEFPUSHBUTTON "OK",IDOK,167,40,50,14 - GROUPBOX "", IDC_STATIC, 3, 0, 216, 35 + GROUPBOX "", IDC_STATIC, 3, 0, 216, 35 CONTROL "CPU speed",IDC_CPUCLOCK_SLIDER,"msctls_trackbar32", WS_TABSTOP, 5, 10, 160, 18 EDITTEXT IDC_CPUCLOCK_EDIT,167,10,35,14,SS_CENTERIMAGE - LTEXT "%", IDC_STATIC, 206, 11, 8, 10, SS_CENTERIMAGE + LTEXT "%", IDC_STATIC, 206, 11, 8, 10, SS_CENTERIMAGE PUSHBUTTON "Cancel",IDCANCEL,113,40,50,14 END IDD_EXCEPTION DIALOGEX 0, 0, 349, 69 STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "FB Alpha has encountered an unrecoverable problem and will be terminated" +#ifdef USE_SEGOE +FONT 8, "Segoe UI" +#else FONT 8, "MS Shell Dlg" +#endif BEGIN CONTROL "", IDC_SYSINFO_CODE, "Static", SS_SUNKEN | SS_CENTER | SS_CENTERIMAGE, 3,3,342,40, WS_EX_STATICEDGE DEFPUSHBUTTON "OK",IDOK,294,49,50,14 @@ -397,7 +477,11 @@ END IDD_SYSINFO DIALOGEX 0, 0, 349, 151 STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "FB Alpha system information report" +#ifdef USE_SEGOE +FONT 8, "Segoe UI" +#else FONT 8, "MS Shell Dlg" +#endif BEGIN DEFPUSHBUTTON "OK",IDOK,274,131,70,14 PUSHBUTTON "Save...",IDC_SYSINFO_LOG_SAVE,200,131,70,14 @@ -407,7 +491,11 @@ END IDD_DEBUG_LRG DIALOGEX 0, 0, 582, 442 STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "FB Alpha debugger" +#ifdef USE_SEGOE +FONT 8, "Segoe UI" +#else FONT 8, "MS Shell Dlg" +#endif BEGIN CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,3,399,523,14,WS_EX_STATICEDGE CONTROL "",IDC_DBG_COMMAND,"RICHEDIT20A",ES_LOWERCASE | ES_AUTOHSCROLL | ES_NOIME | WS_TABSTOP,4,400,521,12, ES_EX_NOCALLOLEINIT @@ -445,7 +533,11 @@ IDD_DEBUG_SML DIALOGEX 0, 0, 592, 356 STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW CAPTION "FB Alpha debugger" +#ifdef USE_SEGOE +FONT 6, "Segoe UI" +#else FONT 6, "MS Shell Dlg" +#endif BEGIN CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,3,313,532,14,WS_EX_STATICEDGE CONTROL "",IDC_DBG_COMMAND,"RICHEDIT20A",ES_LOWERCASE | ES_AUTOHSCROLL | ES_NOIME | WS_TABSTOP,4,314,530,12, ES_EX_NOCALLOLEINIT @@ -472,7 +564,11 @@ END IDD_POPUP DIALOGEX 0, 0, 45, 36 STYLE DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "FB Alpha message" +#ifdef USE_SEGOE +FONT 8, "Segoe UI" +#else FONT 8, "MS Shell Dlg" +#endif BEGIN DEFPUSHBUTTON "OK",IDOK,38,16,50,14 CONTROL "",IDC_MESSAGE_BACK,"Static",SS_WHITERECT | NOT WS_VISIBLE,0,0,0,0 @@ -484,7 +580,11 @@ END IDD_SUPPORTDIR DIALOGEX 0, 0, 242, 81 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Edit support file paths" +#ifdef USE_SEGOE +FONT 8, "Segoe UI" +#else FONT 8, "MS Shell Dlg" +#endif BEGIN CONTROL "Tab2",IDC_SPATH_TAB,"SysTabControl32",WS_TABSTOP,9,6,224,48 DEFPUSHBUTTON "OK",IDOK,183,57,50,14 @@ -541,7 +641,11 @@ END IDD_PALETTEVIEWER DIALOGEX 0, 0, 320, 240 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Palette Viewer" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN CONTROL "00000",IDC_GFX_VIEWER_VERT_1,"Static",SS_RIGHT,1,15,22,8 CONTROL "00010",IDC_GFX_VIEWER_VERT_2,"Static",SS_RIGHT,1,28,22,8 @@ -584,7 +688,11 @@ END IDD_IPS_MANAGER DIALOGEX 0, 0, 474, 318 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "IPS Patch Manager" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN CONTROL "Tree1",IDC_TREE1,"SysTreeView32",TVS_HASBUTTONS | TVS_HASLINES | TVS_LINESATROOT | TVS_SHOWSELALWAYS | WS_TABSTOP | 0x8000,8,10,250,150,WS_EX_STATICEDGE GROUPBOX "",IDC_STATIC1,2,0,470,298 @@ -601,7 +709,11 @@ END IDD_MVS_SELECT_CARTS DIALOGEX 0, 0, 369, 271 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Select cartridges to load..." +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN GROUPBOX "", IDC_STATIC, 3, 0, 362, 247 @@ -660,7 +772,11 @@ END IDD_NCD_DLG DIALOGEX 0, 0, 520, 291 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "NeoGeo CDZ Game List" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 400, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 400, 0, 0x1 +#endif BEGIN CONTROL "",IDC_NCD_LIST,"SysListView32",LVS_REPORT | LVS_SHOWSELALWAYS | LVS_ALIGNLEFT | WS_BORDER | WS_TABSTOP,7,5,348,218 DEFPUSHBUTTON "Play",IDC_NCD_PLAY_BUTTON,445,272,71,14 @@ -702,7 +818,11 @@ IDD_NCD_COVER_DLG DIALOGEX 0, 0, 397, 262 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_TOOLWINDOW CAPTION "Cover Image" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 400, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 400, 0, 0x1 +#endif BEGIN CONTROL "",IDC_NCD_COVER_PREVIEW_PIC,"Static",SS_BITMAP,3,2,312,179,WS_EX_CLIENTEDGE END @@ -710,7 +830,11 @@ END IDD_GAMEINFO DIALOGEX 0, 0, 520, 369 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Game Information" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN CONTROL "Tab1",IDC_TAB1,"SysTabControl32",TCS_SINGLELINE | WS_TABSTOP,4,76,512,270 CONTROL "",IDC_STATIC_INFOBOX,"Static",SS_WHITERECT | SS_SUNKEN,4,4,512,66 @@ -739,7 +863,11 @@ END IDD_DOWNLOAD_LOCAL DIALOGEX 0, 0, 168, 48 STYLE DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Download Localisation Template" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN GROUPBOX "",IDC_STATIC1,2,0,164,28 LTEXT "Language:", IDC_LOCAL_DOWNLOAD_LANG, 8, 10, 40, 10, SS_CENTERIMAGE @@ -751,7 +879,11 @@ END IDD_REPLAYINP DIALOGEX 0, 0, 276, 137 STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Replay input" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN DEFPUSHBUTTON "OK",IDOK,219,120,50,14 GROUPBOX "",IDC_STATIC,3,0,269,115 @@ -778,7 +910,11 @@ END IDD_RECORDINP DIALOGEX 0, 0, 276, 98 STYLE DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU CAPTION "Record input" +#ifdef USE_SEGOE +FONT 8, "Segoe UI", 0, 0, 0x1 +#else FONT 8, "MS Shell Dlg", 0, 0, 0x1 +#endif BEGIN DEFPUSHBUTTON "OK",IDOK,219,79,50,14 GROUPBOX "",-1,3,0,269,73 diff --git a/src/dep/scripts/license2rtf.pl b/src/dep/scripts/license2rtf.pl index 4e25536d1..3ff8c6d07 100644 --- a/src/dep/scripts/license2rtf.pl +++ b/src/dep/scripts/license2rtf.pl @@ -10,10 +10,6 @@ my $FontSize = 16; my $escape = 0; -my %FontFamilies = ("Tahoma", "swiss", - "Times New Roman", "roman" -); - # Process command line arguments for ( my $i = 0; $i < scalar @ARGV; $i++ ) {{ @@ -73,7 +69,7 @@ open( OUTFILE, ">$Outfile" ) or die "\nError: Couldn't open OUTPUT file $Outfile print "Generating $Outfile...\n"; -print OUTFILE "{\\rtf1\\ansi\\ansicpg1252\\deff0{\\fonttbl(\\f0\\f$FontFamilies{$Font}\\fprq2 $Font;)}{\\colortbl\\red0\\green0\\blue0;\\red255\\green0\\blue0;\\red0\\green0\\blue191;}\\deflang1033\\horzdoc\\fromtext\\pard\\plain\\f0\\fs$FontSize"; +print OUTFILE "{\\rtf1\\ansi\\ansicpg1252\\deff0{\\fonttbl(\\f0\\fnil\\fcharset0 $Font;)}{\\colortbl\\red0\\green0\\blue0;\\red255\\green0\\blue0;\\red0\\green0\\blue191;}\\deflang1033\\horzdoc\\fromtext\\pard\\plain\\f0\\fs$FontSize"; while ( my $line = ) {