diff --git a/Classes/App.h b/Classes/App.h
index cf8396c..491ea09 100644
--- a/Classes/App.h
+++ b/Classes/App.h
@@ -2,12 +2,17 @@
@interface App : NSObject {
NSString *path;
+ NSString *version;
IBOutlet NSWindow *prefPanel;
IBOutlet NSTextField *textField;
+ IBOutlet NSPopUpButton *versionSelector;
}
-(IBAction)showPrefPanel:(id)sender;
-(IBAction)applyChange:(id)sender;
+-(void)populatePopUp;
+-(NSString *)applicationBundleName;
+
@end
diff --git a/Classes/App.m b/Classes/App.m
index 6110c1c..f0b009e 100644
--- a/Classes/App.m
+++ b/Classes/App.m
@@ -9,9 +9,12 @@ @implementation App
-(void)awakeFromNib {
NSUserDefaults *d = [NSUserDefaults standardUserDefaults];
path = [d objectForKey:@"path"];
+ version = [d objectForKey:@"version"];
NSAppleEventManager *appleEventManager = [NSAppleEventManager sharedAppleEventManager];
[appleEventManager setEventHandler:self andSelector:@selector(handleGetURLEvent:withReplyEvent:) forEventClass:kInternetEventClass andEventID:kAEGetURL];
+
+ [self populatePopUp];
}
-(void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSAppleEventDescriptor *)replyEvent {
@@ -39,7 +42,7 @@ -(void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSApple
[task launch];
[task release];
NSWorkspace *sharedWorkspace = [NSWorkspace sharedWorkspace];
- NSString *appPath = [sharedWorkspace fullPathForApplication:@"Sublime Text 2"];
+ NSString *appPath = [sharedWorkspace fullPathForApplication:[self applicationBundleName]];
NSString *identifier = [[NSBundle bundleWithPath:appPath] bundleIdentifier];
NSArray *selectedApps =
[NSRunningApplication runningApplicationsWithBundleIdentifier:identifier];
@@ -54,23 +57,52 @@ -(void)handleGetURLEvent:(NSAppleEventDescriptor *)event withReplyEvent:(NSApple
// }
}
+-(void)populatePopUp {
+ [versionSelector removeAllItems];
+ [versionSelector addItemsWithTitles:[NSArray arrayWithObjects:@"Sublime Text 2", @"Sublime Text 3", nil]];
+}
+
+-(NSString *)applicationBundleName {
+ NSString* appName;
+
+ if (version == nil) {
+ appName = @"Sublime Text 2";
+ } else if ([version isEqual: @"Sublime Text 3"]) {
+ appName = @"Sublime Text";
+ } else {
+ appName = version;
+ }
+
+ return appName;
+}
+
-(IBAction)showPrefPanel:(id)sender {
if (path) {
[textField setStringValue:path];
} else {
[textField setStringValue:defaultPath];
}
+
+ if (version) {
+ [versionSelector selectItemWithTitle:version];
+ }
+
[prefPanel makeKeyAndOrderFront:nil];
}
-(IBAction)applyChange:(id)sender {
+ NSUserDefaults *d = [NSUserDefaults standardUserDefaults];
path = [textField stringValue];
+ version = [[versionSelector selectedItem] title];
if (path) {
- NSUserDefaults *d = [NSUserDefaults standardUserDefaults];
[d setObject:path forKey:@"path"];
}
+ if (version) {
+ [d setObject:version forKey:@"version"];
+ }
+
[prefPanel orderOut:nil];
}
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 898f4e4..3247d69 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -1,774 +1,157 @@
-
-
-
- 1050
- 11B26
- 1617
- 1138
- 566.00
-
-
-
-
-
-
-
- 0
- IBCocoaFramework
-
-
- YES
- 3
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file