diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 1026753..f0c62a0 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -18,8 +18,6 @@
NSPopUpButtonCell
NSScrollView
NSScroller
- NSSlider
- NSSliderCell
NSTextView
NSToolbar
NSToolbarFlexibleSpaceItem
@@ -1323,48 +1321,6 @@
1
1
-
BB31836C-C94C-4C54-B51B-8C9C9A2D1280
@@ -1378,7 +1334,6 @@
{{0, 14}, {264, 25}}
-
_NS:868
YES
-
-
- setVolume:
-
-
-
- 636
-
-
-
- value: values.volume
-
-
-
-
-
- value: values.volume
- value
- values.volume
- 2
-
-
- 639
-
@@ -3598,7 +3527,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
-
@@ -3721,30 +3649,9 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
-
- 598
-
-
-
-
-
-
-
- 596
-
-
-
-
-
-
-
- 597
-
-
-
620
-
+
@@ -3913,9 +3820,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
- com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -3950,7 +3854,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
id
id
- NSSlider
id
@@ -3962,10 +3865,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
seekForward:
id
-
- setVolume:
- NSSlider
-
speakAction:
id
@@ -4015,7 +3914,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
id
id
- NSSlider
id
@@ -4027,10 +3925,6 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
seekForward:
id
-
- setVolume:
- NSSlider
-
speakAction:
id
@@ -4047,13 +3941,11 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA
id
id
- NSSlider
id
-
diff --git a/SpeakerAppDelegate.h b/SpeakerAppDelegate.h
index 9f87f6f..159d689 100644
--- a/SpeakerAppDelegate.h
+++ b/SpeakerAppDelegate.h
@@ -28,7 +28,6 @@
-(IBAction)speakAction:(id)sender;
-(IBAction)seekForward:(id)sender;
-(IBAction)seekBack:(id)sender;
--(IBAction)setVolume:(NSSlider *)sender;
-(void)stopSpeaking;
-(void)startSpeaking;
diff --git a/SpeakerAppDelegate.m b/SpeakerAppDelegate.m
index 2687c81..5ebef55 100644
--- a/SpeakerAppDelegate.m
+++ b/SpeakerAppDelegate.m
@@ -62,6 +62,10 @@
{
NSDictionary *dict = [NSSpeechSynthesizer attributesForVoice:[voices objectAtIndex:i]];
NSString *countryString = [currentLocale displayNameForKey:NSLocaleIdentifier value:[dict objectForKey:@"VoiceLocaleIdentifier"]];
+
+ if ([countryString hasPrefix:@"English"] && ![countryString isEqualToString:@"English (United States)"]) {
+ continue;
+ }
NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:[dict objectForKey:@"VoiceName"] action:@selector(changeLanguage:) keyEquivalent:@""];
NSMenuItem *country = [self.languageMenu itemWithTitle:countryString];
@@ -177,19 +181,6 @@
}
-- (IBAction)setVolume:(NSSlider *)sender {
- BOOL restart = NO;
- if ([synth isSpeaking]) {
- restart = YES;
- [self stopSpeaking];
- }
- synth.volume = sender.floatValue / 100;
-
- if (restart) {
- [self startSpeaking];
- }
-}
-
- (void)speechSynthesizer:(NSSpeechSynthesizer *)sender willSpeakWord:(NSRange)wordToSpeak ofString:(NSString *)text {
NSRange range = NSMakeRange(oldRange.location + wordToSpeak.location, wordToSpeak.length);
[textView scrollRangeToVisible:range];
@@ -230,7 +221,9 @@
break;
}
}
- item = [[languageItem.submenu itemArray] objectAtIndex:0];
+ if (!item) {
+ item = [[languageItem.submenu itemArray] objectAtIndex:0];
+ }
}
}