Added menu item to show the preferences window.

fortinmike · fortinmike · commit fed1b5426b29 · 2014-05-25T21:41:03.000-04:00
diff --git a/XcodeBoost/MFPluginController.m b/XcodeBoost/MFPluginController.m
@@ -8,6 +8,7 @@
 
 #import "MFPluginController.h"
 #import "NSMenu+XcodeBoost.h"
+#import "MFPreferencesWindowController.h"
 #import "DVTSourceTextView+XcodeBoost.h"
 #import "MFHighlightRegexWindowController.h"
 #import "IDEKit.h"
@@ -18,6 +19,7 @@ @implementation MFPluginController
 	NSBundle *_pluginBundle;
 	NSTextView *_activeTextView;
 	
+	MFPreferencesWindowController *_preferencesWindowController;
 	MFHighlightRegexWindowController *_highlightRegexWindowController;
 }
 
@@ -86,6 +88,8 @@ - (NSMenuItem *)createTextToolsMenuItem
 	[submenu addItem:[self createMenuItemWithTitle:@"Highlight Regex Matches" action:@selector(highlightRegexMatches_clicked:)]];
 	[submenu addItem:[self createMenuItemWithTitle:@"Remove Most Recently Added Highlight" action:@selector(removeMostRecentlyAddedHighlight_clicked:)]];
 	[submenu addItem:[self createMenuItemWithTitle:@"Remove All Highlighting" action:@selector(removeAllHighlighting_clicked:)]];
+	[submenu addItem:[NSMenuItem separatorItem]];
+	[submenu addItem:[self createMenuItemWithTitle:@"Preferences..." action:@selector(preferences_clicked:)]];
 	
 	NSMenuItem *textToolsMenuItem = [[NSMenuItem alloc] initWithTitle:@"XcodeBoost" action:NULL keyEquivalent:@""];
 	[textToolsMenuItem setSubmenu:submenu];
@@ -203,6 +207,16 @@ - (void)removeAllHighlighting_clicked:(id)sender
 	[[[self currentSourceTextView] xb_manipulator] removeAllHighlighting];
 }
 
+#pragma mark Preferences
+
+- (void)preferences_clicked:(id)sender
+{
+	if (!_preferencesWindowController)
+		_preferencesWindowController = [[MFPreferencesWindowController alloc] initWithBundle:_pluginBundle];
+	
+	[_preferencesWindowController showWindow:self];
+}
+
 #pragma mark Implementation
 
 - (IDEEditor *)currentEditor
diff --git a/XcodeBoost/MFPreferencesWindowController.h b/XcodeBoost/MFPreferencesWindowController.h
@@ -15,6 +15,12 @@
 @property (weak) IBOutlet NSColorWell *colorWell3;
 @property (weak) IBOutlet NSColorWell *colorWell4;
 
+#pragma mark Lifetime
+
+- (id)initWithBundle:(NSBundle *)bundle;
+
+#pragma mark Action Methods
+
 - (IBAction)colorChanged:(id)sender;
 
 @end
diff --git a/XcodeBoost/MFPreferencesWindowController.m b/XcodeBoost/MFPreferencesWindowController.m
@@ -15,14 +15,17 @@ @implementation MFPreferencesWindowController
 	NSUserDefaults *_defaults;
 }
 
-- (id)initWithWindow:(NSWindow *)window
+#pragma mark Lifetime
+
+- (id)initWithBundle:(NSBundle *)bundle
 {
-    self = [super initWithWindow:window];
-    if (self)
+    NSString *nibPath = [bundle pathForResource:@"PreferencesWindow" ofType:@"nib"];
+	self = [super initWithWindowNibPath:nibPath owner:self];
+	if (self)
 	{
 		_defaults = [NSUserDefaults standardUserDefaults];
-    }
-    return self;
+	}
+	return self;
 }
 
 - (void)windowDidLoad
diff --git a/XcodeBoost/PreferencesWindow.xib b/XcodeBoost/PreferencesWindow.xib
@@ -10,6 +10,7 @@
                 <outlet property="colorWell2" destination="TJd-vg-OPF" id="TMG-o4-6ih"/>
                 <outlet property="colorWell3" destination="5A6-sq-JXe" id="Gxr-QI-5h6"/>
                 <outlet property="colorWell4" destination="Nb7-V2-BBi" id="azg-RO-Kh7"/>
+                <outlet property="window" destination="QvC-M9-y7g" id="aYl-ru-0zi"/>
             </connections>
         </customObject>
         <customObject id="-1" userLabel="First Responder" customClass="FirstResponder"/>

Original file line number	Diff line number	Diff line change
`@@ -15,14 +15,17 @@ @implementation MFPreferencesWindowController`
`15`	`15`	`NSUserDefaults *_defaults;`
`16`	`16`	`}`
`17`	`17`
`18`		`-- (id)initWithWindow:(NSWindow *)window`
	`18`	`+#pragma mark Lifetime`
	`19`	`+`
	`20`	`+- (id)initWithBundle:(NSBundle *)bundle`
`19`	`21`	`{`
`20`		`- self = [super initWithWindow:window];`
`21`		`- if (self)`
	`22`	`+ NSString *nibPath = [bundle pathForResource:@"PreferencesWindow" ofType:@"nib"];`
	`23`	`+ self = [super initWithWindowNibPath:nibPath owner:self];`
	`24`	`+ if (self)`
`22`	`25`	`{`
`23`	`26`	`_defaults = [NSUserDefaults standardUserDefaults];`
`24`		`- }`
`25`		`- return self;`
	`27`	`+ }`
	`28`	`+ return self;`
`26`	`29`	`}`
`27`	`30`
`28`	`31`	`- (void)windowDidLoad`