Disable File -> Load Media Menu item when is loading

liaogang · liaogang · commit 694e84ed777d · 2016-05-27T17:51:42.000+08:00
diff --git a/uPlayer/AppDelegate.mm b/uPlayer/AppDelegate.mm
@@ -40,6 +40,8 @@ @interface AppDelegate ()
 
 @property (nonatomic,strong)  NSMenu *dockMenu;
 
+@property  bool isLoadItunesMedia;
+
 @end
 
 
@@ -161,12 +163,14 @@ - (IBAction)cmdOpenDirectory:(id)sender
             
             dojobInBkgnd(
                          ^{
+                             self.isLoadItunesMedia = true;
                              postEvent(EventID_importing_tracks_begin, nil);
                              [list  addTrackInfoItems: enumAudioFiles(fileName)];
                          } ,
                          ^{
                              postEvent(EventID_importing_tracks_end, nil);
                              postEvent(EventID_to_reload_tracklist, list);
+                             self.isLoadItunesMedia = false;
                          });
             
         }
@@ -185,6 +189,7 @@ -(void)reloadiTunesMedia
 
 - (IBAction)cmdReloadiTunesMedia:(id)sender
 {
+    
     NSString *alertSuppressionKey = @"ReloadiTunesMedia";
     NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
     
@@ -202,14 +207,21 @@ - (IBAction)cmdReloadiTunesMedia:(id)sender
         [alert addButtonWithTitle:NSLocalizedString(@"Cancel",nil)];
         alert.showsSuppressionButton = YES;
         
-        if( [alert runModal] == NSAlertFirstButtonReturn)
+        NSModalResponse resp = [alert runModal];
+        
+        if(  resp == NSAlertFirstButtonReturn)
             [self reloadiTunesMedia];
         
+        
+        
         if (alert.suppressionButton.state == NSOnState)
             [defaults setBool: YES forKey: alertSuppressionKey];
+        
     }
+    
 }
 
+
 - (IBAction)cmdFind:(id)sender
 {
     WindowController *vc = [NSApplication sharedApplication].mainWindow.windowController;
@@ -394,12 +406,14 @@ -(void)loadiTunesMedia
     
     dojobInBkgnd(
                  ^{
+                     self.isLoadItunesMedia = true;
                      postEvent(EventID_importing_tracks_begin, nil);
                      [list  addTrackInfoItems: enumAudioFiles( userMusic )];
                  } ,
                  ^{
                      postEvent(EventID_importing_tracks_end, nil);
                      postEvent(EventID_to_reload_tracklist, list);
+                     self.isLoadItunesMedia = false;
                  });
 }
 
@@ -510,13 +524,15 @@ -(void)playerErrorHandler:(NSNotification*)n
     [[NSAlert alertWithError:error] runModal];
 }
 
-
--(BOOL)importDirectoryEnabled
+-(bool)isMediaItemReloadItunesEnabled
 {
-    return [player().document.playerlList getSelectedItem].type != type_temporary ;
+    // only enabled when not temp playlist, nor not loading itunes media.
+    return [player().document.playerlList getSelectedItem].type != type_temporary && self.isLoadItunesMedia == false;
 }
 
 
+
+
 - (IBAction)cmdLastFm_Love:(id)sender
 {
     postEvent(EventID_to_love_item, nil);
diff --git a/uPlayer/Base.lproj/Main.storyboard b/uPlayer/Base.lproj/Main.storyboard
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="9532" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
+<document type="com.apple.InterfaceBuilder3.Cocoa.Storyboard.XIB" version="3.0" toolsVersion="10116" systemVersion="15E65" targetRuntime="MacOSX.Cocoa" propertyAccessControl="none" useAutolayout="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="9532"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.CocoaPlugin" version="10116"/>
     </dependencies>
     <scenes>
         <!--Application-->
@@ -84,14 +84,13 @@
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="cmdOpenDirectory:" target="Voe-Tx-rLC" id="J9f-kD-myF"/>
-                                                <binding destination="Voe-Tx-rLC" name="enabled" keyPath="importDirectoryEnabled" id="1kU-cW-faQ"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem title="Reload iTunes Media" id="GuR-yr-pUc" userLabel="Open Directory...">
                                             <modifierMask key="keyEquivalentModifierMask"/>
                                             <connections>
                                                 <action selector="cmdReloadiTunesMedia:" target="Voe-Tx-rLC" id="cOd-ZG-HOB"/>
-                                                <binding destination="Voe-Tx-rLC" name="enabled" keyPath="importDirectoryEnabled" id="fbZ-7m-3gZ"/>
+                                                <binding destination="Voe-Tx-rLC" name="enabled" keyPath="isMediaItemReloadItunesEnabled" id="Yst-ha-zZ4"/>
                                             </connections>
                                         </menuItem>
                                         <menuItem isSeparatorItem="YES" id="m54-Is-iLE"/>
