[Fuse-for-macosx-commits] SF.net SVN: fuse-for-macosx:[603] trunk/fuse/fusepb

[<fr...@us...>]

Revision: 603
          http://fuse-for-macosx.svn.sourceforge.net/fuse-for-macosx/?rev=603&view=rev
Author:   fredm
Date:     2009-07-05 08:47:36 +0000 (Sun, 05 Jul 2009)

Log Message:
-----------
Collapse Media menu hierarchy, just have Tape, Disk A, Disk B, Master, Slave,
Microdrive 1 and 2 etc.

Modified Paths:
--------------
    trunk/fuse/fusepb/controllers/FuseController.h
    trunk/fuse/fusepb/controllers/FuseController.m
    trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
    trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
    trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib

Modified: trunk/fuse/fusepb/controllers/FuseController.h
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.h	2009-06-30 12:40:55 UTC (rev 602)
+++ trunk/fuse/fusepb/controllers/FuseController.h	2009-07-05 08:47:36 UTC (rev 603)
@@ -39,44 +39,20 @@
 
 @interface FuseController : NSObject
 {
-  IBOutlet NSMenuItem *cart;
-  IBOutlet NSMenuItem *dock;
-  IBOutlet NSMenuItem *if1;
+  IBOutlet NSMenuItem *cartridge;
+  IBOutlet NSMenuItem *mdr1;
+  IBOutlet NSMenuItem *mdr2;
   IBOutlet NSMenuItem *if1Wp1;
   IBOutlet NSMenuItem *if1Wp2;
-  IBOutlet NSMenuItem *if1Wp3;
-  IBOutlet NSMenuItem *if1Wp4;
-  IBOutlet NSMenuItem *if1Wp5;
-  IBOutlet NSMenuItem *if1Wp6;
-  IBOutlet NSMenuItem *if1Wp7;
-  IBOutlet NSMenuItem *if1Wp8;
-  IBOutlet NSMenuItem *if2;
-  IBOutlet NSMenuItem *disk;
-  IBOutlet NSMenuItem *diskPlus3;
-  IBOutlet NSMenuItem *diskPlus3FlipA;
-  IBOutlet NSMenuItem *diskPlus3WpA;
-  IBOutlet NSMenuItem *diskPlus3B;
-  IBOutlet NSMenuItem *diskPlus3FlipB;
-  IBOutlet NSMenuItem *diskPlus3WpB;
-  IBOutlet NSMenuItem *diskTrDos;
-  IBOutlet NSMenuItem *diskTrDosA;
-  IBOutlet NSMenuItem *diskTrDosWpA;
-  IBOutlet NSMenuItem *diskTrDosFlipA;
-  IBOutlet NSMenuItem *diskTrDosB;
-  IBOutlet NSMenuItem *diskTrDosWpB;
-  IBOutlet NSMenuItem *diskTrDosFlipB;
-  IBOutlet NSMenuItem *diskPlusD;
-  IBOutlet NSMenuItem *diskPlusDA;
-  IBOutlet NSMenuItem *diskPlusDWpA;
-  IBOutlet NSMenuItem *diskPlusDFlipA;
-  IBOutlet NSMenuItem *diskPlusDB;
-  IBOutlet NSMenuItem *diskPlusDWpB;
-  IBOutlet NSMenuItem *diskPlusDFlipB;
-  IBOutlet NSMenuItem *ide;
-  IBOutlet NSMenuItem *divide;
+  IBOutlet NSMenuItem *diskA;
+  IBOutlet NSMenuItem *diskB;
+  IBOutlet NSMenuItem *diskFlipA;
+  IBOutlet NSMenuItem *diskWpA;
+  IBOutlet NSMenuItem *diskFlipB;
+  IBOutlet NSMenuItem *diskWpB;
+  IBOutlet NSMenuItem *ideMaster;
+  IBOutlet NSMenuItem *ideSlave;
   IBOutlet NSMenuItem *simple8Bit;
-  IBOutlet NSMenuItem *zxatasp;
-  IBOutlet NSMenuItem *zxcf;
   IBOutlet NSMenuItem *pause;
   IBOutlet NSMenuItem *tapePlay;
   IBOutlet NSMenuItem *tapeRecord;
@@ -112,6 +88,8 @@
 - (IBAction)disk_flip_b:(id)sender;
 - (IBAction)dock_eject:(id)sender;
 - (IBAction)dock_open:(id)sender;
+- (IBAction)cart_eject:(id)sender;
+- (IBAction)cart_open:(id)sender;
 - (IBAction)export_screen:(id)sender;
 - (IBAction)fullscreen:(id)sender;
 - (IBAction)hard_reset:(id)sender;
@@ -179,6 +157,10 @@
 - (void)ui_menu_activate_media_cartridge_if2:(NSNumber*)active;
 - (void)ui_menu_activate_media_cartridge_if2_eject:(NSNumber*)active;
 - (void)ui_menu_activate_media_disk:(NSNumber*)active;
+- (void)ui_menu_activate_media_disk_a_flip;
+- (void)ui_menu_activate_media_disk_a_wp_set;
+- (void)ui_menu_activate_media_disk_b_flip;
+- (void)ui_menu_activate_media_disk_b_wp_set;
 - (void)ui_menu_activate_media_disk_plus3:(NSNumber*)active;
 - (void)ui_menu_activate_media_disk_plus3_a_eject:(NSNumber*)active;
 - (void)ui_menu_activate_media_disk_plus3_a_flip:(NSNumber*)active;

Modified: trunk/fuse/fusepb/controllers/FuseController.m
===================================================================
--- trunk/fuse/fusepb/controllers/FuseController.m	2009-06-30 12:40:55 UTC (rev 602)
+++ trunk/fuse/fusepb/controllers/FuseController.m	2009-07-05 08:47:36 UTC (rev 603)
@@ -75,6 +75,18 @@
 static int diskTrdosEjectB = 0;
 static int diskPlusDEjectA = 0;
 static int diskPlusDEjectB = 0;
+static BOOL diskPlus3FlipA = NO;
+static BOOL diskPlus3FlipB = NO;
+static BOOL diskTrDosFlipA = NO;
+static BOOL diskTrDosFlipB = NO;
+static BOOL diskPlusDFlipA = NO;
+static BOOL diskPlusDFlipB = NO;
+static BOOL diskPlus3WpA = NO;
+static BOOL diskPlus3WpB = NO;
+static BOOL diskTrDosWpA = NO;
+static BOOL diskTrDosWpB = NO;
+static BOOL diskPlusDWpA = NO;
+static BOOL diskPlusDWpB = NO;
 static int record = 1;
 static int recordFromSnapshot = 1;
 static int play = 1;
@@ -311,6 +323,59 @@
   [self newDisk:SPECPLUS3_DRIVE_B];
 }
 
+- (IBAction)cart_eject:(id)sender
+{
+  [[DisplayOpenGLView instance] pause];
+
+  if ( libspectrum_machine_capabilities( machine_current->machine ) &
+        LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_DOCK ) {
+    [[DisplayOpenGLView instance] dckEject];
+  } else {
+    [[DisplayOpenGLView instance] if2Eject];
+  }
+
+  [[DisplayOpenGLView instance] unpause];
+}
+
+- (IBAction)cart_open:(id)sender
+{
+  int error;
+  char *filename = NULL;
+  NSArray *fileTypes;
+  NSString *message;
+
+  [[DisplayOpenGLView instance] pause];
+
+  if ( libspectrum_machine_capabilities( machine_current->machine ) &
+        LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_DOCK ) {
+    message = @"Insert Timex dock cartridge";
+    fileTypes = dckFileTypes;
+  } else {
+    message = @"Insert Interface II cartridge";
+    fileTypes = romFileTypes;
+  }
+
+  filename = cocoaui_openpanel_get_filename( message, fileTypes );
+
+  if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
+
+  if ( libspectrum_machine_capabilities( machine_current->machine ) &
+        LIBSPECTRUM_MACHINE_CAPABILITY_TIMEX_DOCK ) {
+    error = [[DisplayOpenGLView instance] dckInsert:filename];
+  } else {
+    error = [[DisplayOpenGLView instance] if2Insert:filename];
+  }
+
+  if(error) goto error;
+
+  [self addRecentSnapshot:filename];
+
+error:
+  free( filename );
+
+  [[DisplayOpenGLView instance] unpause];
+}
+
 - (IBAction)dock_open:(id)sender
 {
   int error;
@@ -377,6 +442,7 @@
 {
   int error=0;
   char *filename = NULL;
+  libspectrum_ide_unit unit;
 
   [[DisplayOpenGLView instance] pause];
 
@@ -384,14 +450,16 @@
 
   if( !filename ) { [[DisplayOpenGLView instance] unpause]; return; }
 
-  switch( [sender tag] ) {
-  case 41: error = [[DisplayOpenGLView instance] simpleideInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
-  case 42: error = [[DisplayOpenGLView instance] simpleideInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
-  case 43: error = [[DisplayOpenGLView instance] zxataspInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
-  case 44: error = [[DisplayOpenGLView instance] zxataspInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
-  case 45: error = [[DisplayOpenGLView instance] zxcfInsert:filename]; break;
-  case 46: error = [[DisplayOpenGLView instance] divideInsert:filename inUnit:LIBSPECTRUM_IDE_MASTER]; break;
-  case 47: error = [[DisplayOpenGLView instance] divideInsert:filename inUnit:LIBSPECTRUM_IDE_SLAVE]; break;
+  unit = [sender tag] == 41 ? LIBSPECTRUM_IDE_MASTER : LIBSPECTRUM_IDE_SLAVE;
+
+  if( settings_current.divide_enabled ) {
+    error = [[DisplayOpenGLView instance] divideInsert:filename inUnit:unit];
+  } else if( settings_current.simpleide_active ) {
+    error = [[DisplayOpenGLView instance] simpleideInsert:filename inUnit:unit];
+  } else if( settings_current.zxatasp_active ) {
+    error = [[DisplayOpenGLView instance] zxataspInsert:filename inUnit:unit];
+  } else if( settings_current.zxcf_active ) {
+    error = [[DisplayOpenGLView instance] zxcfInsert:filename];
   }
 
   if(error) goto error;
@@ -406,16 +474,20 @@
 
 - (IBAction)ide_commit:(id)sender
 {
+  libspectrum_ide_unit unit;
+
   [[DisplayOpenGLView instance] pause];
 
-  switch( [sender tag] ) {
-  case 51: [[DisplayOpenGLView instance] simpleideCommit:LIBSPECTRUM_IDE_MASTER]; break;
-  case 52: [[DisplayOpenGLView instance] simpleideCommit:LIBSPECTRUM_IDE_SLAVE]; break;
-  case 53: [[DisplayOpenGLView instance] zxataspCommit:LIBSPECTRUM_IDE_MASTER]; break;
-  case 54: [[DisplayOpenGLView instance] zxataspCommit:LIBSPECTRUM_IDE_SLAVE]; break;
-  case 55: [[DisplayOpenGLView instance] zxcfCommit]; break;
-  case 56: [[DisplayOpenGLView instance] divideCommit:LIBSPECTRUM_IDE_MASTER]; break;
-  case 57: [[DisplayOpenGLView instance] divideCommit:LIBSPECTRUM_IDE_SLAVE]; break;
+  unit = [sender tag] == 51 ? LIBSPECTRUM_IDE_MASTER : LIBSPECTRUM_IDE_SLAVE;
+
+  if( settings_current.divide_enabled ) {
+    [[DisplayOpenGLView instance] divideCommit:unit];
+  } else if( settings_current.simpleide_active ) {
+    [[DisplayOpenGLView instance] simpleideCommit:unit];
+  } else if( settings_current.zxatasp_active ) {
+    [[DisplayOpenGLView instance] zxataspCommit:unit];
+  } else if( settings_current.zxcf_active ) {
+    [[DisplayOpenGLView instance] zxcfCommit];
   }
 
   [[DisplayOpenGLView instance] unpause];
@@ -423,14 +495,18 @@
 
 - (IBAction)ide_eject:(id)sender
 {
-  switch( [sender tag] ) {
-  case 61: [[DisplayOpenGLView instance] simpleideEject:LIBSPECTRUM_IDE_MASTER]; break;
-  case 62: [[DisplayOpenGLView instance] simpleideEject:LIBSPECTRUM_IDE_SLAVE]; break;
-  case 63: [[DisplayOpenGLView instance] zxataspEject:LIBSPECTRUM_IDE_MASTER]; break;
-  case 64: [[DisplayOpenGLView instance] zxataspEject:LIBSPECTRUM_IDE_SLAVE]; break;
-  case 65: [[DisplayOpenGLView instance] zxcfEject]; break;
-  case 66: [[DisplayOpenGLView instance] divideEject:LIBSPECTRUM_IDE_MASTER]; break;
-  case 67: [[DisplayOpenGLView instance] divideEject:LIBSPECTRUM_IDE_SLAVE]; break;
+  libspectrum_ide_unit unit;
+
+  unit = [sender tag] == 61 ? LIBSPECTRUM_IDE_MASTER : LIBSPECTRUM_IDE_SLAVE;
+
+  if( settings_current.divide_enabled ) {
+    [[DisplayOpenGLView instance] divideEject:unit];
+  } else if( settings_current.simpleide_active ) {
+    [[DisplayOpenGLView instance] simpleideEject:unit];
+  } else if( settings_current.zxatasp_active ) {
+    [[DisplayOpenGLView instance] zxataspEject:unit];
+  } else if( settings_current.zxcf_active ) {
+    [[DisplayOpenGLView instance] zxcfEject];
   }
 }
 
@@ -1026,23 +1102,22 @@
  *-----------------------------------------------------------------------------*/
 - (void) releaseKey:(int)keyCode
 {
-    NSEvent *event1;
-    NSPoint point;
+  NSEvent *event1;
+  NSPoint point;
 
-    event1 = [NSEvent keyEventWithType:NSKeyUp location:point modifierFlags:0
-                timestamp:0 windowNumber:0 context:nil characters:@" "
-                charactersIgnoringModifiers:@" " isARepeat:NO keyCode:keyCode];
-    [NSApp postEvent:event1 atStart:NO];
+  event1 = [NSEvent keyEventWithType:NSKeyUp location:point modifierFlags:0
+              timestamp:0 windowNumber:0 context:nil characters:@" "
+              charactersIgnoringModifiers:@" " isARepeat:NO keyCode:keyCode];
+  [NSApp postEvent:event1 atStart:NO];
 }
 
 - (void)ui_menu_activate_media_cartridge:(NSNumber*)active
 {
-  [cart setEnabled:[active boolValue]];
+  [cartridge setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_cartridge_dock:(NSNumber*)active
 {
-  [dock setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_cartridge_dock_eject:(NSNumber*)active
@@ -1052,7 +1127,6 @@
 
 - (void)ui_menu_activate_media_cartridge_if2:(NSNumber*)active
 {
-  [if2 setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_cartridge_if2_eject:(NSNumber*)active
@@ -1062,12 +1136,12 @@
 
 - (void)ui_menu_activate_media_disk:(NSNumber*)active
 {
-  [disk setEnabled:[active boolValue]];
+  [diskA setEnabled:[active boolValue]];
+  [diskB setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_disk_plus3:(NSNumber*)active
 {
-  [diskPlus3 setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_disk_plus3_a_eject:(NSNumber*)active
@@ -1075,19 +1149,86 @@
   diskPlus3EjectA = [active boolValue];
 }
 
+- (void)ui_menu_activate_media_disk_a_flip
+{
+  bool newValue = NO;
+
+  if( !machine_current ) {
+  } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
+    newValue = diskPlus3FlipA;
+  } else if( periph_beta128_active ) {
+    newValue = diskTrDosFlipA;
+  } else {
+    newValue = diskPlusDFlipA;
+  }
+
+  [diskFlipA setState:!newValue];
+}
+
+- (void)ui_menu_activate_media_disk_b_flip
+{
+  bool newValue = NO;
+
+  if( !machine_current ) {
+  } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
+    newValue = diskPlus3FlipB;
+  } else if( periph_beta128_active ) {
+    newValue = diskTrDosFlipB;
+  } else {
+    newValue = diskPlusDFlipB;
+  }
+
+  [diskFlipB setState:!newValue];
+}
+
+- (void)ui_menu_activate_media_disk_a_wp_set
+{
+  bool newValue = NO;
+
+  if( !machine_current ) {
+  } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
+    newValue = diskPlus3WpA;
+  } else if( periph_beta128_active ) {
+    newValue = diskTrDosWpA;
+  } else {
+    newValue = diskPlusDWpA;
+  }
+
+  [diskWpA setState:newValue];
+}
+
+- (void)ui_menu_activate_media_disk_b_wp_set
+{
+  bool newValue = NO;
+
+  if( !machine_current ) {
+  } else if( machine_current->machine == LIBSPECTRUM_MACHINE_PLUS3 ) {
+    newValue = diskPlus3WpB;
+  } else if( periph_beta128_active ) {
+    newValue = diskTrDosWpB;
+  } else {
+    newValue = diskPlusDWpB;
+  }
+
+  [diskWpB setState:newValue];
+}
+
 - (void)ui_menu_activate_media_disk_plus3_a_flip:(NSNumber*)active
 {
-  [diskPlus3FlipA setState:[active boolValue] == YES ? NSOffState : NSOnState];
+  diskPlus3FlipA = [active boolValue];
+
+  [self ui_menu_activate_media_disk_a_flip];
 }
 
 - (void)ui_menu_activate_media_disk_plus3_a_wp_set:(NSNumber*)active
 {
-  [diskPlus3WpA setState:[active boolValue] == YES ? NSOffState : NSOnState];
+  diskPlus3WpA = [active boolValue];
+
+  [self ui_menu_activate_media_disk_a_wp_set];
 }
 
 - (void)ui_menu_activate_media_disk_plus3_b:(NSNumber*)active
 {
-  [diskPlus3B setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_disk_plus3_b_eject:(NSNumber*)active
@@ -1097,22 +1238,24 @@
 
 - (void)ui_menu_activate_media_disk_plus3_b_flip:(NSNumber*)active
 {
-  [diskPlus3FlipB setState:[active boolValue] == YES ? NSOffState : NSOnState];
+  diskPlus3FlipB = [active boolValue];
+
+  [self ui_menu_activate_media_disk_b_flip];
 }
 
 - (void)ui_menu_activate_media_disk_plus3_b_wp_set:(NSNumber*)active
 {
-  [diskPlus3WpB setState:[active boolValue] == YES ? NSOffState : NSOnState];
+  diskPlus3WpB = [active boolValue];
+
+  [self ui_menu_activate_media_disk_b_wp_set];
 }
 
 - (void)ui_menu_activate_media_disk_beta:(NSNumber*)active
 {
-  [diskTrDos setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_disk_beta_a:(NSNumber*)active
 {
-  [diskTrDosA setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_disk_beta_a_eject:(NSNumber*)active
@@ -1122,17 +1265,19 @@
 
 - (void)ui_menu_activate_media_disk_beta_a_flip:(NSNumber*)active
 {
-  [diskTrDosFlipA setState:[active boolValue] == YES ? NSOffState : NSOnState];
+  diskTrDosFlipA = [active boolValue]; 
+  [self ui_menu_activate_media_disk_a_flip];
 }
 
 - (void)ui_menu_activate_media_disk_beta_a_wp_set:(NSNumber*)active
 {
-  [diskTrDosWpA setState:[active boolValue] == YES ? NSOffState : NSOnState];
+  diskTrDosWpA = [active boolValue];
+
+  [self ui_menu_activate_media_disk_a_wp_set];
 }
 
 - (void)ui_menu_activate_media_disk_beta_b:(NSNumber*)active
 {
-  [diskTrDosB setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_disk_beta_b_eject:(NSNumber*)active
@@ -1142,22 +1287,24 @@
 
 - (void)ui_menu_activate_media_disk_beta_b_flip:(NSNumber*)active
 {
-  [diskTrDosFlipB setState:[active boolValue] == YES ? NSOffState : NSOnState];
+  diskTrDosFlipB = [active boolValue];
+
+  [self ui_menu_activate_media_disk_b_flip];
 }
 
 - (void)ui_menu_activate_media_disk_beta_b_wp_set:(NSNumber*)active
 {
-  [diskTrDosWpB setState:[active boolValue] == YES ? NSOffState : NSOnState];
+  diskTrDosWpB = [active boolValue];
+
+  [self ui_menu_activate_media_disk_b_wp_set];
 }
 
 - (void)ui_menu_activate_media_disk_plusd:(NSNumber*)active
 {
-  [diskPlusD setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_disk_plusd_a:(NSNumber*)active
 {
-  [diskPlusDA setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_disk_plusd_a_eject:(NSNumber*)active
@@ -1167,17 +1314,20 @@
 
 - (void)ui_menu_activate_media_disk_plusd_a_flip:(NSNumber*)active
 {
-  [diskPlusDFlipA setState:[active boolValue] == YES ? NSOffState : NSOnState];
+  diskPlusDFlipA = [active boolValue];
+
+  [self ui_menu_activate_media_disk_a_flip];
 }
 
 - (void)ui_menu_activate_media_plusd_a_wp_set:(NSNumber*)active
 {
-  [diskPlusDWpA setState:[active boolValue] == YES ? NSOffState : NSOnState];
+  diskPlusDWpA = [active boolValue];
+
+  [self ui_menu_activate_media_disk_a_wp_set];
 }
 
 - (void)ui_menu_activate_media_disk_plusd_b:(NSNumber*)active
 {
-  [diskPlusDB setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_disk_plusd_b_eject:(NSNumber*)active
@@ -1187,22 +1337,26 @@
 
 - (void)ui_menu_activate_media_disk_plusd_b_flip:(NSNumber*)active
 {
-  [diskPlusDFlipB setState:[active boolValue] == YES ? NSOffState : NSOnState];
+  diskPlusDFlipB = [active boolValue];
+
+  [self ui_menu_activate_media_disk_b_flip];
 }
 
 - (void)ui_menu_activate_media_plusd_b_wp_set:(NSNumber*)active
 {
-  [diskPlusDWpB setState:[active boolValue] == YES ? NSOffState : NSOnState];
+  diskPlusDWpB = [active boolValue];
+
+  [self ui_menu_activate_media_disk_b_wp_set];
 }
 
 - (void)ui_menu_activate_media_ide:(NSNumber*)active
 {
-  [ide setEnabled:[active boolValue]];
+  [ideMaster setEnabled:[active boolValue]];
+  [ideSlave setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_ide_divide:(NSNumber*)active
 {
-  [divide setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_ide_divide_master_eject:(NSNumber*)active
@@ -1217,7 +1371,6 @@
 
 - (void)ui_menu_activate_media_ide_simple8bit:(NSNumber*)active
 {
-  [simple8Bit setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_ide_simple8bit_master_eject:(NSNumber*)active
@@ -1232,7 +1385,6 @@
 
 - (void)ui_menu_activate_media_ide_zxatasp:(NSNumber*)active
 {
-  [zxatasp setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_ide_zxatasp_master_eject:(NSNumber*)active
@@ -1247,7 +1399,6 @@
 
 - (void)ui_menu_activate_media_ide_zxcf:(NSNumber*)active
 {
-  [zxcf setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_ide_zxcf_eject:(NSNumber*)active
@@ -1257,7 +1408,8 @@
 
 - (void)ui_menu_activate_media_if1:(NSNumber*)active
 {
-  [if1 setEnabled:[active boolValue]];
+  [mdr1 setEnabled:[active boolValue]];
+  [mdr2 setEnabled:[active boolValue]];
 }
 
 - (void)ui_menu_activate_media_if1_m1_eject:(NSNumber*)active
@@ -1287,7 +1439,6 @@
 
 - (void)ui_menu_activate_media_if1_m3_wp_set:(NSNumber*)active
 {
-  [if1Wp3 setState:[active boolValue] == YES ? NSOffState : NSOnState];
 }
 
 - (void)ui_menu_activate_media_if1_m4_eject:(NSNumber*)active
@@ -1297,7 +1448,6 @@
 
 - (void)ui_menu_activate_media_if1_m4_wp_set:(NSNumber*)active
 {
-  [if1Wp4 setState:[active boolValue] == YES ? NSOffState : NSOnState];
 }
 
 - (void)ui_menu_activate_media_if1_m5_eject:(NSNumber*)active
@@ -1307,7 +1457,6 @@
 
 - (void)ui_menu_activate_media_if1_m5_wp_set:(NSNumber*)active
 {
-  [if1Wp5 setState:[active boolValue] == YES ? NSOffState : NSOnState];
 }
 
 - (void)ui_menu_activate_media_if1_m6_eject:(NSNumber*)active
@@ -1317,7 +1466,6 @@
 
 - (void)ui_menu_activate_media_if1_m6_wp_set:(NSNumber*)active
 {
-  [if1Wp6 setState:[active boolValue] == YES ? NSOffState : NSOnState];
 }
 
 - (void)ui_menu_activate_media_if1_m7_eject:(NSNumber*)active
@@ -1327,7 +1475,6 @@
 
 - (void)ui_menu_activate_media_if1_m7_wp_set:(NSNumber*)active
 {
-  [if1Wp7 setState:[active boolValue] == YES ? NSOffState : NSOnState];
 }
 
 - (void)ui_menu_activate_media_if1_m8_eject:(NSNumber*)active
@@ -1337,7 +1484,6 @@
 
 - (void)ui_menu_activate_media_if1_m8_wp_set:(NSNumber*)active
 {
-  [if1Wp8 setState:[active boolValue] == YES ? NSOffState : NSOnState];
 }
 
 - (void)ui_menu_activate_recording:(NSNumber*)active
@@ -1382,42 +1528,6 @@
   case 3:
     return stopPsg == 0 ? NO : YES;
     break;
-  case 4:
-  case 10:
-  case 28:
-  case 40:
-    return diskPlus3EjectA == 0 ? NO : YES;
-    break;
-  case 5:
-  case 11:
-  case 29:
-  case 41:
-    return diskPlus3EjectB == 0 ? NO : YES;
-    break;
-  case 13:
-  case 14:
-  case 27:
-  case 42:
-    return diskTrdosEjectA == 0 ? NO : YES;
-    break;
-  case 15:
-  case 16:
-  case 26:
-  case 43:
-    return diskTrdosEjectB == 0 ? NO : YES;
-    break;
-  case 20:
-  case 21:
-  case 24:
-  case 44:
-    return diskPlusDEjectA == 0 ? NO : YES;
-    break;
-  case 22:
-  case 23:
-  case 25:
-  case 45:
-    return diskPlusDEjectB == 0 ? NO : YES;
-    break;
   case 6:
     return record == 0 ? NO : YES;
     break;
@@ -1523,6 +1633,18 @@
   case 144:
     return if1M8Eject == 0 ? NO : YES;
     break;
+  case 150:
+  case 151:
+  case 152:
+  case 153:
+    return diskPlus3EjectA || diskTrdosEjectA || diskPlusDEjectA ? YES : NO;
+    break;
+  case 160:
+  case 161:
+  case 162:
+  case 163:
+    return diskPlus3EjectB || diskTrdosEjectB || diskPlusDEjectB ? YES : NO;
+    break;
   default:
     return YES;
   }
@@ -2272,7 +2394,6 @@
     break;
 
   case UI_MENU_ITEM_MEDIA_DISK_PLUS3:
-    method = @selector(ui_menu_activate_media_disk_plus3:);
     break;
 
   case UI_MENU_ITEM_MEDIA_DISK_PLUS3_A_EJECT:
@@ -2288,7 +2409,6 @@
     break;
 
   case UI_MENU_ITEM_MEDIA_DISK_PLUS3_B:
-    method = @selector(ui_menu_activate_media_disk_plus3_b:);
     break;
 
   case UI_MENU_ITEM_MEDIA_DISK_PLUS3_B_EJECT:

Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib
===================================================================
--- trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib	2009-06-30 12:40:55 UTC (rev 602)
+++ trunk/fuse/fusepb/nibs/MainMenu.nib/classes.nib	2009-07-05 08:47:36 UTC (rev 603)
@@ -30,6 +30,10 @@
 		<dict>
 			<key>ACTIONS</key>
 			<dict>
+				<key>cart_eject</key>
+				<string>id</string>
+				<key>cart_open</key>
+				<string>id</string>
 				<key>cocoa_break</key>
 				<string>id</string>
 				<key>disk_eject_a</key>
@@ -171,76 +175,32 @@
 			<string>ObjC</string>
 			<key>OUTLETS</key>
 			<dict>
-				<key>cart</key>
+				<key>cartridge</key>
 				<string>NSMenuItem</string>
-				<key>disk</key>
+				<key>diskA</key>
 				<string>NSMenuItem</string>
-				<key>diskPlus3</key>
+				<key>diskB</key>
 				<string>NSMenuItem</string>
-				<key>diskPlus3B</key>
+				<key>diskFlipA</key>
 				<string>NSMenuItem</string>
-				<key>diskPlus3FlipA</key>
+				<key>diskFlipB</key>
 				<string>NSMenuItem</string>
-				<key>diskPlus3FlipB</key>
+				<key>diskWpA</key>
 				<string>NSMenuItem</string>
-				<key>diskPlus3WpA</key>
+				<key>diskWpB</key>
 				<string>NSMenuItem</string>
-				<key>diskPlus3WpB</key>
+				<key>ideMaster</key>
 				<string>NSMenuItem</string>
-				<key>diskPlusD</key>
+				<key>ideSlave</key>
 				<string>NSMenuItem</string>
-				<key>diskPlusDA</key>
-				<string>NSMenuItem</string>
-				<key>diskPlusDB</key>
-				<string>NSMenuItem</string>
-				<key>diskPlusDFlipA</key>
-				<string>NSMenuItem</string>
-				<key>diskPlusDFlipB</key>
-				<string>NSMenuItem</string>
-				<key>diskPlusDWpA</key>
-				<string>NSMenuItem</string>
-				<key>diskPlusDWpB</key>
-				<string>NSMenuItem</string>
-				<key>diskTrDos</key>
-				<string>NSMenuItem</string>
-				<key>diskTrDosA</key>
-				<string>NSMenuItem</string>
-				<key>diskTrDosB</key>
-				<string>NSMenuItem</string>
-				<key>diskTrDosFlipA</key>
-				<string>NSMenuItem</string>
-				<key>diskTrDosFlipB</key>
-				<string>NSMenuItem</string>
-				<key>diskTrDosWpA</key>
-				<string>NSMenuItem</string>
-				<key>diskTrDosWpB</key>
-				<string>NSMenuItem</string>
-				<key>divide</key>
-				<string>NSMenuItem</string>
-				<key>dock</key>
-				<string>NSMenuItem</string>
-				<key>ide</key>
-				<string>NSMenuItem</string>
-				<key>if1</key>
-				<string>NSMenuItem</string>
 				<key>if1Wp1</key>
 				<string>NSMenuItem</string>
 				<key>if1Wp2</key>
 				<string>NSMenuItem</string>
-				<key>if1Wp3</key>
+				<key>mdr1</key>
 				<string>NSMenuItem</string>
-				<key>if1Wp4</key>
+				<key>mdr2</key>
 				<string>NSMenuItem</string>
-				<key>if1Wp5</key>
-				<string>NSMenuItem</string>
-				<key>if1Wp6</key>
-				<string>NSMenuItem</string>
-				<key>if1Wp7</key>
-				<string>NSMenuItem</string>
-				<key>if1Wp8</key>
-				<string>NSMenuItem</string>
-				<key>if2</key>
-				<string>NSMenuItem</string>
 				<key>pause</key>
 				<string>NSMenuItem</string>
 				<key>recentSnaps</key>
@@ -257,10 +217,6 @@
 				<string>NSMenuItem</string>
 				<key>window</key>
 				<string>NSWindow</string>
-				<key>zxatasp</key>
-				<string>NSMenuItem</string>
-				<key>zxcf</key>
-				<string>NSMenuItem</string>
 			</dict>
 			<key>SUPERCLASS</key>
 			<string>NSObject</string>

Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib
===================================================================
--- trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib	2009-06-30 12:40:55 UTC (rev 602)
+++ trunk/fuse/fusepb/nibs/MainMenu.nib/info.nib	2009-07-05 08:47:36 UTC (rev 603)
@@ -11,7 +11,7 @@
 	<key>IBOpenObjects</key>
 	<array>
 		<integer>877</integer>
-		<integer>695</integer>
+		<integer>527</integer>
 	</array>
 	<key>IBSystem Version</key>
 	<string>9J61</string>

Modified: trunk/fuse/fusepb/nibs/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.