--- np2/macosx/resource.h	2003/11/08 17:54:26	1.7
+++ np2/macosx/resource.h	2004/07/13 17:10:06	1.16
@@ -11,15 +11,20 @@ enum {
     IDM_EDIT			= 131,
 	IDM_FDD1			= 132,
 	IDM_FDD2			= 133,
-	IDM_HARDDISK		= 134,
+	IDM_HDD				= 134,
 	IDM_SASI1			= 135,
 	IDM_SASI2			= 136,
+	IDM_SCSI0			= 145,
+	IDM_SCSI1			= 146,
+	IDM_SCSI2			= 147,
+	IDM_SCSI3			= 148,
 	IDM_SCREEN			= 137,
 	IDM_DEVICE			= 138,
 	IDM_KEYBOARD		= 139,
 	IDM_SOUND			= 140,
 	IDM_MEMORY			= 141,
 	IDM_OTHER			= 142,
+	IDM_HELP			= 143,
 
 	IDM_ABOUT			= MAKE_MENUID(IDM_APPLE, 1),
 
@@ -41,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_FULLSCREEN		= MAKE_MENUID(IDM_SCREEN, 1),
 	IDM_ROLNORMAL		= MAKE_MENUID(IDM_SCREEN, 1+2),
 	IDM_ROLLEFT			= MAKE_MENUID(IDM_SCREEN, 2+2),
@@ -68,11 +85,16 @@ 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_F12EQU			= MAKE_MENUID(IDM_KEYBOARD, 13),
-	IDM_F12COMMA		= MAKE_MENUID(IDM_KEYBOARD, 14),
+	IDM_F11KANA			= MAKE_MENUID(IDM_KEYBOARD, 10),
+	IDM_F11STOP			= MAKE_MENUID(IDM_KEYBOARD, 11),
+	IDM_F11EQU			= MAKE_MENUID(IDM_KEYBOARD, 12),
+	IDM_F11NFER			= MAKE_MENUID(IDM_KEYBOARD, 13),
+	IDM_F11USER			= MAKE_MENUID(IDM_KEYBOARD, 14),
+	IDM_F12MOUSE		= MAKE_MENUID(IDM_KEYBOARD, 16),
+	IDM_F12COPY			= MAKE_MENUID(IDM_KEYBOARD, 17),
+	IDM_F12COMMA		= MAKE_MENUID(IDM_KEYBOARD, 18),
+	IDM_F12XFER			= MAKE_MENUID(IDM_KEYBOARD, 19),
+	IDM_F12USER			= MAKE_MENUID(IDM_KEYBOARD, 20),
 
 	IDM_BEEPOFF			= MAKE_MENUID(IDM_SOUND, 1),
 	IDM_BEEPLOW			= MAKE_MENUID(IDM_SOUND, 2),
@@ -88,22 +110,30 @@ enum {
 	IDM_SPEAKBOARD		= MAKE_MENUID(IDM_SOUND, 13),
 	IDM_SPARKBOARD		= MAKE_MENUID(IDM_SOUND, 14),
 	IDM_AMD98			= MAKE_MENUID(IDM_SOUND, 15),
-	IDM_SEEKSND			= MAKE_MENUID(IDM_SOUND, 17),
+	IDM_JASTSOUND		= 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),
 	IDM_MEM36			= MAKE_MENUID(IDM_MEMORY, 3),
 	IDM_MEM76			= MAKE_MENUID(IDM_MEMORY, 4),
+	IDM_MEM116			= MAKE_MENUID(IDM_MEMORY, 5),
+	IDM_MEM136			= MAKE_MENUID(IDM_MEMORY, 6),
 
 	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_RECORDING		= MAKE_MENUID(IDM_OTHER, 10)
+	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_RECORDING		= MAKE_MENUID(IDM_OTHER, 10),
+	IDM_KEYDISP			= MAKE_MENUID(IDM_OTHER, 11),
+	IDM_SOFTKBD			= MAKE_MENUID(IDM_OTHER, 12),
+	IDM_I286SAVE		= MAKE_MENUID(IDM_OTHER, 13),
+	
+	IDM_NP2HELP			= MAKE_MENUID(IDM_HELP, 1),
 };
 
 // -------------------------------------------------------------------- dialog