aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Interfaces/English.lproj/MainMenu.xib12
-rw-r--r--Source/SPAppController.m3
-rw-r--r--Source/SPDatabaseDocument.m1
-rw-r--r--Source/SPWindowController.h1
-rw-r--r--Source/SPWindowController.m4
5 files changed, 15 insertions, 6 deletions
diff --git a/Interfaces/English.lproj/MainMenu.xib b/Interfaces/English.lproj/MainMenu.xib
index 6a0b8861..3c9a2e29 100644
--- a/Interfaces/English.lproj/MainMenu.xib
+++ b/Interfaces/English.lproj/MainMenu.xib
@@ -12,7 +12,7 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="24"/>
+ <integer value="81"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -367,7 +367,8 @@
<reference key="NSMenu" ref="709725194"/>
<bool key="NSIsHidden">YES</bool>
<string key="NSTitle">Save Session</string>
- <string key="NSKeyEquiv"/>
+ <string key="NSKeyEquiv">s</string>
+ <int key="NSKeyEquivModMask">1835008</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
@@ -377,7 +378,8 @@
<reference key="NSMenu" ref="709725194"/>
<bool key="NSIsHidden">YES</bool>
<string key="NSTitle">Save Session As…</string>
- <string key="NSKeyEquiv"/>
+ <string key="NSKeyEquiv">S</string>
+ <int key="NSKeyEquivModMask">1835008</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
@@ -4774,7 +4776,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{449, 1007}, {197, 53}}</string>
- <string>{{228, 546}, {511, 20}}</string>
+ <string>{{154, 639}, {511, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{506, 836}, {511, 20}}</string>
@@ -4909,7 +4911,7 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{334, 123}, {287, 423}}</string>
+ <string>{{260, 216}, {301, 423}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>{{180, 535}, {182, 253}}</string>
diff --git a/Source/SPAppController.m b/Source/SPAppController.m
index aa2cf3b1..85ad93a2 100644
--- a/Source/SPAppController.m
+++ b/Source/SPAppController.m
@@ -343,6 +343,9 @@
SPWindowController *newWindowController = [[SPWindowController alloc] initWithWindowNibName:@"MainWindow"];
NSWindow *newWindow = [newWindowController window];
+ if([[window objectForKey:@"tabs"] count] > 1)
+ [newWindowController setHideForSingleTab:NO];
+
// The first window should use autosaving; subsequent windows should cascade.
// So attempt to set the frame autosave name; this will succeed for the very
// first window, and fail for others.
diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m
index 60b29366..d2ba3d85 100644
--- a/Source/SPDatabaseDocument.m
+++ b/Source/SPDatabaseDocument.m
@@ -178,7 +178,6 @@
[prefs addObserver:self forKeyPath:SPConsoleEnableLogging options:NSKeyValueObservingOptionNew context:NULL];
// Register for notifications
- //register for notifications
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(willPerformQuery:)
name:@"SMySQLQueryWillBePerformed" object:self];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(hasPerformedQuery:)
diff --git a/Source/SPWindowController.h b/Source/SPWindowController.h
index 1f3945cc..33d6df49 100644
--- a/Source/SPWindowController.h
+++ b/Source/SPWindowController.h
@@ -48,5 +48,6 @@
- (IBAction)selectPreviousDocumentTab:(id)sender;
- (NSArray *)documents;
- (void)selectTabAtIndex:(NSInteger)index;
+- (void)setHideForSingleTab:(BOOL)hide;
@end
diff --git a/Source/SPWindowController.m b/Source/SPWindowController.m
index 4c25ece2..5f8e34cd 100644
--- a/Source/SPWindowController.m
+++ b/Source/SPWindowController.m
@@ -303,6 +303,10 @@
}
}
+- (void)setHideForSingleTab:(BOOL)hide
+{
+ [tabBar setHideForSingleTab:hide];
+}
#pragma mark -
#pragma mark Tab view delegate methods