From e23012ee44e26e9fd2bd43340a3fd806b084fa47 Mon Sep 17 00:00:00 2001
From: Joe Wreschnig <joe.wreschnig@gmail.com>
Date: Mon, 4 Mar 2013 16:17:59 +0100
Subject: [PATCH] Turn popover activation button 'on' when the popover is up.

---
 English.lproj/MainMenu.xib | 18 +++++++++---------
 NJMappingsController.h     |  1 +
 NJMappingsController.m     |  8 ++++++++
 3 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index e30e982..353e905 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -325,19 +325,19 @@
 							<object class="NSMutableString" key="NSToolbarItemIdentifier">
 								<characters key="NS.bytes">4AC66688-76E8-47ED-AC0A-7462220A4019</characters>
 							</object>
-							<string key="NSToolbarItemLabel">Custom View</string>
-							<string key="NSToolbarItemPaletteLabel">Custom View</string>
+							<string key="NSToolbarItemLabel">Mapping Selector</string>
+							<string key="NSToolbarItemPaletteLabel">Mapping Selector</string>
 							<nil key="NSToolbarItemToolTip"/>
 							<object class="NSButton" key="NSToolbarItemView" id="227597319">
 								<reference key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
 								<string key="NSFrame">{{0, 14}, {140, 25}}</string>
 								<reference key="NSSuperview"/>
-								<reference key="NSNextKeyView"/>
+								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSButtonCell" key="NSCell" id="850080795">
-									<int key="NSCellFlags">-2080374784</int>
+									<int key="NSCellFlags">67108864</int>
 									<int key="NSCellFlags2">134217728</int>
 									<string key="NSContents">(default)</string>
 									<object class="NSFont" key="NSSupport" id="45863614">
@@ -347,7 +347,7 @@
 									</object>
 									<string key="NSCellIdentifier">_NS:9</string>
 									<reference key="NSControlView" ref="227597319"/>
-									<int key="NSButtonFlags">-2034483200</int>
+									<int key="NSButtonFlags">918306816</int>
 									<int key="NSButtonFlags2">163</int>
 									<object class="NSCustomResource" key="NSNormalImage" id="13197350">
 										<string key="NSClassName">NSImage</string>
@@ -375,15 +375,15 @@
 							<object class="NSMutableString" key="NSToolbarItemIdentifier">
 								<characters key="NS.bytes">94389EFE-310F-4DB5-95F6-D4AEE8839979</characters>
 							</object>
-							<string key="NSToolbarItemLabel">Custom View</string>
-							<string key="NSToolbarItemPaletteLabel">Custom View</string>
+							<string key="NSToolbarItemLabel">Translation Enabled</string>
+							<string key="NSToolbarItemPaletteLabel">Translation Enabled</string>
 							<nil key="NSToolbarItemToolTip"/>
 							<object class="NSSegmentedControl" key="NSToolbarItemView" id="679083346">
 								<reference key="NSNextResponder"/>
 								<int key="NSvFlags">268</int>
-								<string key="NSFrame">{{5, 14}, {67, 25}}</string>
+								<string key="NSFrame">{{23, 14}, {67, 25}}</string>
 								<reference key="NSSuperview"/>
-								<reference key="NSNextKeyView"/>
+								<reference key="NSWindow"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSSegmentedCell" key="NSCell" id="594076765">
diff --git a/NJMappingsController.h b/NJMappingsController.h
index 4867943..f0dab4f 100644
--- a/NJMappingsController.h
+++ b/NJMappingsController.h
@@ -12,6 +12,7 @@
 @interface NJMappingsController : NSObject <NSTableViewDataSource,
                                             NSTableViewDelegate,
                                             NSOpenSavePanelDelegate,
+                                            NSPopoverDelegate,
                                             NSFastEnumeration>
 {
     IBOutlet NSButton *removeButton;
diff --git a/NJMappingsController.m b/NJMappingsController.m
index 193edfe..f1e068e 100644
--- a/NJMappingsController.m
+++ b/NJMappingsController.m
@@ -306,4 +306,12 @@
     [popover showRelativeToRect:popoverActivate.bounds ofView:popoverActivate preferredEdge:NSMinXEdge];
 }
 
+- (void)popoverWillShow:(NSNotification *)notification {
+    popoverActivate.state = NSOnState;
+}
+
+- (void)popoverWillClose:(NSNotification *)notification {
+    popoverActivate.state = NSOffState;
+}
+
 @end
-- 
2.20.1