--- np2/win9x/resource.h 2007/11/11 07:11:27 1.30 +++ np2/win9x/resource.h 2007/12/28 20:36:40 1.32 @@ -46,10 +46,13 @@ #define IDR_SCSIMENU 233 #define IDR_PXMENU 241 #define IDR_WAVEREC 251 -#define IDR_CPUSAVE 252 -#define IDR_TOOLWIN 301 -#define IDR_KEYDISP 302 -#define IDR_VIEW 303 +#define IDR_CPUSAVE16 252 +#define IDR_CPUSAVE32 253 +#define IDR_CLOSE 301 +#define IDR_TOOLWIN 311 +#define IDR_KEYDISP 321 +#define IDR_VIEW 331 +#define IDR_TRACE 341 #define IDC_BASECLOCK 11101 #define IDC_MULTIPLE 11102 #define IDC_CLOCKMSG 11103 @@ -252,10 +255,45 @@ #define IDC_MORE 17103 #define IDC_NP2INFO 17104 #define IDC_NP2STR 17105 -#define IDS_HDD 30001 -#define IDS_SCREENOPTION 30011 -#define IDS_SOUNDOPTION 30012 -#define IDS_SERIALOPTION 30013 +#define IDC_TOOL_HDDACC 18001 +#define IDC_TOOL_FDD1ACC 18002 +#define IDC_TOOL_FDD1LIST 18003 +#define IDC_TOOL_FDD1BROWSE 18004 +#define IDC_TOOL_FDD1EJECT 18005 +#define IDC_TOOL_FDD2ACC 18006 +#define IDC_TOOL_FDD2LIST 18007 +#define IDC_TOOL_FDD2BROWSE 18008 +#define IDC_TOOL_FDD2EJECT 18009 +#define IDC_TOOL_RESET 18010 +#define IDC_TOOL_POWER 18011 +#define IDS_APP_NAME2 30001 +#define IDS_APP_NAME21 30002 +#define IDS_FILENAME_HELP 30003 +#define IDS_FONTFACE 30011 +#define IDS_PFONTFACE 30012 +#define IDS_FONTFACE_PRIMARY 30013 +#define IDS_PFONTFACE_PRIMARY 30014 +#define IDS_FONTFACE_SECONDARY 30015 +#define IDS_PFONTFACE_SECONDARY 30016 +#define IDS_CAPTION_TOOL 30021 +#define IDS_CAPTION_KEYDISP 30022 +#define IDS_CAPTION_SOFTKEY 30023 +#define IDS_HDD 30031 +#define IDS_SCREENOPTION 30041 +#define IDS_SOUNDOPTION 30042 +#define IDS_SERIALOPTION 30043 +#define IDS_CAPTION_FDD1 30051 +#define IDS_CAPTION_FDD2 30052 +#define IDS_CAPTION_FDD3 30053 +#define IDS_CAPTION_FDD4 30054 +#define IDS_CAPTION_SEPALATOR 30055 +#define IDS_CAPTION_FRAME 30056 +#define IDS_CAPTION_CLOCK 30057 +#define IDS_ERROR_DIRECTDRAW 30061 +#define IDS_CONFIRM_RESET 30062 +#define IDS_CONFIRM_EXIT 30063 +#define IDS_CONFIRM_RESUME 30064 +#define IDS_ERROR_RESUME 30065 #define IDS_NONCONNECT 30101 #define IDS_1 30111 #define IDS_1HALF 30112 @@ -279,6 +317,8 @@ #define IDS_MIDI 30195 #define IDS_2_0MHZ 30201 #define IDS_2_5MHZ 30202 +#define IDS_CLOCKFORMAT 30203 +#define IDS_HDDSIZERANGE 30211 #define IDS_ZOOM_NONE 30301 #define IDS_ZOOM_FIXEDASPECT 30302 #define IDS_ZOOM_ADJUSTASPECT 30303 @@ -492,7 +532,14 @@ #define IDM_ABOUT 40713 #define IDM_ALTENTER 40721 #define IDM_ALTF4 40722 -#define IDM_SKIN 41001 +#define IDM_CLOSE 41001 +#define IDM_TOOL_SKIN 41101 +#define IDM_TOOL_SKINSEL 41111 +#define IDM_TOOL_SKINDEF 41112 +#define IDM_TOOL_SKINMRU 41151 +#define IDM_TOOL_SKINMRU1 41152 +#define IDM_TOOL_SKINMRU2 41153 +#define IDM_TOOL_SKINMRU3 41154 #define IDM_KDISPFM 42001 #define IDM_KDISPMIDI 42002 #define IDM_VIEWWINNEW 43001 @@ -516,6 +563,11 @@ #define IDM_BIOS 43033 #define IDM_ITF 43034 #define IDM_A20LINE 43035 +#define IDM_TRACE_TRACE 43101 +#define IDM_TRACE_VERBOSE 43102 +#define IDM_TRACE_ENABLE 43103 +#define IDM_TRACE_FILEOUT 43104 +#define IDM_TRACE_CLEAR 43105 // Next default values for new objects //