X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FController.m;h=92d31a822057b045c6dd824ba4f0cd29e6d660ad;hb=4b72a63eb61a01275493c4bfb51ba02152d1c5e1;hp=371949b1d08d52516a4b30f171210ac7af042384;hpb=1c3e658fb616f84744bd5a2e4c32d9245fb6e3c9;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/macosx/Controller.m b/macosx/Controller.m
index 371949b1..92d31a82 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2093,11 +2093,11 @@ fWorkingCount = 0;
     NSMutableString * string;
     if (fPendingCount == 1)
     {
-        string = [NSMutableString stringWithFormat: NSLocalizedString( @"%d encode pending in queue", @"" ), fPendingCount];
+        string = [NSMutableString stringWithFormat: NSLocalizedString( @"%d encode pending", @"" ), fPendingCount];
     }
     else
     {
-        string = [NSMutableString stringWithFormat: NSLocalizedString( @"%d encode(s) pending in queue", @"" ), fPendingCount];
+        string = [NSMutableString stringWithFormat: NSLocalizedString( @"%d encode(s) pending", @"" ), fPendingCount];
     }
     [fQueueStatus setStringValue:string];
 }
@@ -4958,6 +4958,16 @@ the user is using "Custom" settings by determining the sender*/
 
 #pragma mark -
 
+@synthesize hasValidPresetSelected;
+
+//	This causes all audio tracks from the title to be used based on the current preset
+- (IBAction) addAllAudioTracks: (id) sender
+
+{
+	[fAudioDelegate	addAllTracksFromPreset: [fPresetsOutlineView itemAtRow:[fPresetsOutlineView selectedRow]]];
+	return;
+}
+
 - (IBAction) browseImportSrtFile: (id) sender
 {
 
@@ -5421,6 +5431,7 @@ return YES;
     
     if ([fPresetsOutlineView selectedRow] >= 0 && [[[fPresetsOutlineView itemAtRow:[fPresetsOutlineView selectedRow]] objectForKey:@"Folder"] intValue] != 1)
     {
+		[self setHasValidPresetSelected: YES];
         chosenPreset = [fPresetsOutlineView itemAtRow:[fPresetsOutlineView selectedRow]];
         [fPresetSelectedDisplay setStringValue:[chosenPreset objectForKey:@"PresetName"]];
         
@@ -5741,6 +5752,9 @@ return YES;
         [fPictureController SetTitle:fTitle];
         [self calculatePictureSizing:nil];
     }
+	else {
+		[self setHasValidPresetSelected: NO];
+	}
 }