--- np2/macos9/resource.h	2003/10/23 19:31:58	1.4
+++ np2/macos9/resource.h	2004/02/13 09:07:42	1.11
@@ -8,17 +8,23 @@
 enum {
 	IDM_APPLE			= 128,
 	IDM_EMULATE			= 129,
+	IDM_EDIT			= 130,
+	IDM_STATSAVE		= 131,
 	IDM_FDD1			= 132,
 	IDM_FDD2			= 133,
 	IDM_HARDDISK		= 134,
 	IDM_SASI1			= 135,
 	IDM_SASI2			= 136,
-	IDM_SCREEN			= 137,
-	IDM_DEVICE			= 138,
-	IDM_KEYBOARD		= 139,
-	IDM_SOUND			= 140,
-	IDM_MEMORY			= 141,
-	IDM_OTHER			= 142,
+	IDM_SCSI0			= 137,
+	IDM_SCSI1			= 138,
+	IDM_SCSI2			= 139,
+	IDM_SCSI3			= 140,
+	IDM_SCREEN			= 141,
+	IDM_DEVICE			= 142,
+	IDM_KEYBOARD		= 143,
+	IDM_SOUND			= 144,
+	IDM_MEMORY			= 145,
+	IDM_OTHER			= 146,
 
 	IDM_ABOUT			= MAKE_MENUID(IDM_APPLE, 1),
 
@@ -40,6 +46,18 @@ enum {
 	IDM_SASI2OPEN		= MAKE_MENUID(IDM_SASI2, 1),
 	IDM_SASI2REMOVE		= MAKE_MENUID(IDM_SASI2, 3),
 
+	IDM_SCSI0OPEN		= MAKE_MENUID(IDM_SCSI0, 1),
+	IDM_SCSI0REMOVE		= MAKE_MENUID(IDM_SCSI0, 3),
+
+	IDM_SCSI1OPEN		= MAKE_MENUID(IDM_SCSI1, 1),
+	IDM_SCSI1REMOVE		= MAKE_MENUID(IDM_SCSI1, 3),
+
+	IDM_SCSI2OPEN		= MAKE_MENUID(IDM_SCSI2, 1),
+	IDM_SCSI2REMOVE		= MAKE_MENUID(IDM_SCSI2, 3),
+
+	IDM_SCSI3OPEN		= MAKE_MENUID(IDM_SCSI3, 1),
+	IDM_SCSI3REMOVE		= MAKE_MENUID(IDM_SCSI3, 3),
+
 	IDM_ROLNORMAL		= MAKE_MENUID(IDM_SCREEN, 1),
 	IDM_ROLLEFT			= MAKE_MENUID(IDM_SCREEN, 2),
 	IDM_ROLRIGHT		= MAKE_MENUID(IDM_SCREEN, 3),
@@ -66,9 +84,14 @@ enum {
 	IDM_XSHIFT			= MAKE_MENUID(IDM_KEYBOARD, 6),
 	IDM_XCTRL			= MAKE_MENUID(IDM_KEYBOARD, 7),
 	IDM_XGRPH			= MAKE_MENUID(IDM_KEYBOARD, 8),
-	IDM_F12MOUSE		= MAKE_MENUID(IDM_KEYBOARD, 10),
-	IDM_F12COPY			= MAKE_MENUID(IDM_KEYBOARD, 11),
-	IDM_F12STOP			= MAKE_MENUID(IDM_KEYBOARD, 12),
+	IDM_F11KANA			= MAKE_MENUID(IDM_KEYBOARD, 10),
+	IDM_F11STOP			= MAKE_MENUID(IDM_KEYBOARD, 11),
+	IDM_F11NFER			= MAKE_MENUID(IDM_KEYBOARD, 12),
+	IDM_F11USER			= MAKE_MENUID(IDM_KEYBOARD, 13),
+	IDM_F12MOUSE		= MAKE_MENUID(IDM_KEYBOARD, 15),
+	IDM_F12COPY			= MAKE_MENUID(IDM_KEYBOARD, 16),
+	IDM_F12XFER			= MAKE_MENUID(IDM_KEYBOARD, 17),
+	IDM_F12USER			= MAKE_MENUID(IDM_KEYBOARD, 18),
 
 	IDM_BEEPOFF			= MAKE_MENUID(IDM_SOUND, 1),
 	IDM_BEEPLOW			= MAKE_MENUID(IDM_SOUND, 2),
@@ -83,7 +106,9 @@ enum {
 	IDM_PC9801_118		= MAKE_MENUID(IDM_SOUND, 12),
 	IDM_SPEAKBOARD		= MAKE_MENUID(IDM_SOUND, 13),
 	IDM_SPARKBOARD		= MAKE_MENUID(IDM_SOUND, 14),
-	IDM_SEEKSND			= MAKE_MENUID(IDM_SOUND, 16),
+	IDM_AMD98			= MAKE_MENUID(IDM_SOUND, 15),
+	IDM_JASTSND			= MAKE_MENUID(IDM_SOUND, 16),
+	IDM_SEEKSND			= MAKE_MENUID(IDM_SOUND, 18),
 
 	IDM_MEM640			= MAKE_MENUID(IDM_MEMORY, 1),
 	IDM_MEM16			= MAKE_MENUID(IDM_MEMORY, 2),
@@ -92,12 +117,13 @@ enum {
 
 	IDM_BMPSAVE			= MAKE_MENUID(IDM_OTHER, 1),
 	IDM_S98LOGGING		= MAKE_MENUID(IDM_OTHER, 2),
-	IDM_DISPCLOCK		= MAKE_MENUID(IDM_OTHER, 3),
-	IDM_DISPFLAME		= MAKE_MENUID(IDM_OTHER, 4),
-	IDM_JOYX			= MAKE_MENUID(IDM_OTHER, 5),
-	IDM_RAPID			= MAKE_MENUID(IDM_OTHER, 6),
-	IDM_MSRAPID			= MAKE_MENUID(IDM_OTHER, 7),
-	IDM_I286SAVE		= MAKE_MENUID(IDM_OTHER, 8)
+	IDM_CALENDAR		= MAKE_MENUID(IDM_OTHER, 3),
+	IDM_DISPCLOCK		= MAKE_MENUID(IDM_OTHER, 4),
+	IDM_DISPFLAME		= MAKE_MENUID(IDM_OTHER, 5),
+	IDM_JOYX			= MAKE_MENUID(IDM_OTHER, 6),
+	IDM_RAPID			= MAKE_MENUID(IDM_OTHER, 7),
+	IDM_MSRAPID			= MAKE_MENUID(IDM_OTHER, 8),
+	IDM_I286SAVE		= MAKE_MENUID(IDM_OTHER, 9)
 };
 
 
@@ -110,30 +136,68 @@ enum {
 	IDD_ABOUT			= 128,
 	IDD_VERSION			= 4,
 
-	IDD_NEWFDDDISK		= 129,
-	IDC_DISKLABEL		= 4,
-	IDC_MAKE2DD			= 6,
-	IDC_MAKE2HD			= 7,
+	IDD_RESUMEERROR		= 129,
 
-	IDD_NEWHDDDISK		= 130,
-	IDC_HDDSIZE			= 3,
+	IDD_RESUMEWARNING	= 130,
+	IDC_RESUMEEXIT		= 3,
+	IDC_RESUMEREASON	= 6,
 
 	IDD_CONFIGURE		= 131,
 	IDC_BASECLOCK20		= 4,
 	IDC_BASECLOCK25		= 5,
 	IDC_MULTIPLE		= 7,
 	IDC_CLOCKMSG		= 8,
-	IDC_RATE11			= 12,
-	IDC_RATE22			= 13,
-	IDC_RATE44			= 14,
-	IDC_SOUNDBUF		= 16,
-	IDC_RESUME			= 18,
+	IDC_MODELVM			= 11,
+	IDC_MODELVX			= 12,
+	IDC_MODELEPSON		= 13,
+	IDC_RATE11			= 16,
+	IDC_RATE22			= 17,
+	IDC_RATE44			= 18,
+	IDC_SOUNDBUF		= 20,
+	IDC_RESUME			= 22,
 
-	IDD_RESUMEERROR		= 132,
+	IDD_NEWFDDDISK		= 132,
+	IDD_NEWFDDDISK2		= 133,
+	IDC_DISKLABEL		= 4,
+	IDC_MAKE2DD			= 6,
+	IDC_MAKE2HD			= 7,
+	IDC_MAKE144			= 8,
 
-	IDD_RESUMEWARNING	= 133,
-	IDC_RESUMEEXIT		= 3,
-	IDC_RESUMEREASON	= 6
+	IDD_NEWHDDDISK		= 134,
+	IDC_HDDSIZE			= 3,
+	IDC_HDDLIMIT		= 6,
+
+	IDD_NEWSASIHDD		= 135,
+	IDC_NEWSASI5MB		= 3,
+	IDC_NEWSASI10MB		= 4,
+	IDC_NEWSASI15MB		= 5,
+	IDC_NEWSASI20MB		= 6,
+	IDC_NEWSASI30MB		= 7,
+	IDC_NEWSASI40MB		= 8,
+
+	IDD_SCREENOPT		= 136,
+	IDC_LCD				= 23,
+	IDC_LCDX			= 24,
+	IDC_SKIPLINE		= 25,
+	IDC_SKIPLIGHT		= 26,
+	IDC_GDC7220			= 4,
+	IDC_GDC72020		= 5,
+	IDC_GRCGNON			= 7,
+	IDC_GRCG			= 8,
+	IDC_GRCG2			= 9,
+	IDC_EGC				= 10,
+	IDC_PC980124		= 11,
+	IDC_TRAMWAIT		= 13,
+	IDC_VRAMWAIT		= 16,
+	IDC_GRCGWAIT		= 19,
+	IDC_REALPAL			= 22,
+
+	IDD_CALENDAR		= 137,
+	IDC_CLNDREAL		= 3,
+	IDC_CLNDVIR			= 4,
+	IDC_VIRDATE			= 5,
+	IDC_VIRTIME			= 6,
+	IDC_SETNOW			= 7
 };