aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Interfaces/English.lproj/DBView.xib54
-rw-r--r--Interfaces/English.lproj/IndexesView.xib349
-rw-r--r--Resources/English.lproj/DBView.stringsbin100620 -> 100436 bytes
-rw-r--r--Resources/English.lproj/IndexesView.stringsbin6390 -> 6592 bytes
-rw-r--r--Resources/English.lproj/Localizable.stringsbin211058 -> 211178 bytes
-rw-r--r--Source/SPConstants.h10
-rw-r--r--Source/SPIndexesController.m57
-rw-r--r--Source/SPTableStructure.m14
-rw-r--r--Source/SPTableStructureDelegate.m3
9 files changed, 337 insertions, 150 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index 1b6dd208..9227aa32 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -23,7 +23,6 @@
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="27"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -47,7 +46,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="632807581">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -553,7 +552,6 @@
</object>
<string key="NSFrame">{{1, 1}, {218, 38}}</string>
<reference key="NSSuperview" ref="607475905"/>
- <reference key="NSNextKeyView" ref="970881282"/>
<reference key="NSDocView" ref="970881282"/>
<object class="NSColor" key="NSBGColor" id="1024678221">
<int key="NSColorSpace">6</int>
@@ -585,7 +583,6 @@
</object>
<string key="NSFrame">{{-1, -13}, {220, 40}}</string>
<reference key="NSSuperview" ref="801427893"/>
- <reference key="NSNextKeyView" ref="494991824"/>
<int key="NSsFlags">2</int>
<reference key="NSVScroller" ref="196112633"/>
<reference key="NSHScroller" ref="142487484"/>
@@ -683,7 +680,6 @@
</object>
<string key="NSFrameSize">{214, 352}</string>
<reference key="NSSuperview" ref="233472824"/>
- <reference key="NSNextKeyView" ref="251040077"/>
<reference key="NSDocView" ref="251040077"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -711,7 +707,6 @@
</object>
<string key="NSFrameSize">{214, 352}</string>
<reference key="NSSuperview" ref="1017775084"/>
- <reference key="NSNextKeyView" ref="73685676"/>
<int key="NSsFlags">528</int>
<reference key="NSVScroller" ref="693168867"/>
<reference key="NSHScroller" ref="656188692"/>
@@ -847,7 +842,6 @@
</object>
<string key="NSFrameSize">{216, 145}</string>
<reference key="NSSuperview" ref="561874764"/>
- <reference key="NSNextKeyView" ref="794785393"/>
<reference key="NSDocView" ref="794785393"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">6</int>
@@ -874,7 +868,6 @@
</object>
<string key="NSFrame">{{-1, 0}, {216, 145}}</string>
<reference key="NSSuperview" ref="192579410"/>
- <reference key="NSNextKeyView" ref="242523705"/>
<int key="NSsFlags">528</int>
<reference key="NSVScroller" ref="313695606"/>
<reference key="NSHScroller" ref="464071814"/>
@@ -962,7 +955,6 @@
</object>
<string key="NSFrameSize">{214, 145}</string>
<reference key="NSSuperview" ref="298226231"/>
- <reference key="NSNextKeyView" ref="347093764"/>
<reference key="NSDocView" ref="347093764"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">6</int>
@@ -990,7 +982,6 @@
</object>
<string key="NSFrameSize">{214, 145}</string>
<reference key="NSSuperview" ref="192579410"/>
- <reference key="NSNextKeyView" ref="685057119"/>
<int key="NSsFlags">512</int>
<reference key="NSVScroller" ref="245346414"/>
<reference key="NSHScroller" ref="353686052"/>
@@ -2623,7 +2614,6 @@
</object>
<string key="NSFrame">{{1, 17}, {694, 450}}</string>
<reference key="NSSuperview" ref="33038697"/>
- <reference key="NSNextKeyView" ref="22576329"/>
<reference key="NSDocView" ref="22576329"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">2</int>
@@ -2657,7 +2647,6 @@
</object>
<string key="NSFrame">{{1, 0}, {694, 17}}</string>
<reference key="NSSuperview" ref="33038697"/>
- <reference key="NSNextKeyView" ref="457166030"/>
<reference key="NSDocView" ref="457166030"/>
<reference key="NSBGColor" ref="1024678221"/>
<int key="NScvFlags">4</int>
@@ -2666,7 +2655,6 @@
</object>
<string key="NSFrame">{{6, 33}, {696, 468}}</string>
<reference key="NSSuperview" ref="1013108064"/>
- <reference key="NSNextKeyView" ref="545438501"/>
<int key="NSsFlags">562</int>
<reference key="NSVScroller" ref="398797698"/>
<reference key="NSHScroller" ref="178353583"/>
@@ -4414,7 +4402,7 @@
<object class="NSTextView" id="714539623">
<reference key="NSNextResponder" ref="572051963"/>
<int key="NSvFlags">2322</int>
- <string key="NSFrameSize">{887, 13}</string>
+ <string key="NSFrame">{{0, -1}, {887, 14}}</string>
<reference key="NSSuperview" ref="572051963"/>
<object class="NSTextContainer" key="NSTextContainer" id="322143189">
<object class="NSLayoutManager" key="NSLayoutManager">
@@ -6500,7 +6488,6 @@
</object>
</object>
<string key="NSFrameSize">{943, 549}</string>
- <reference key="NSSuperview"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSWindowTemplate" id="554105051">
@@ -7226,7 +7213,7 @@
<string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{213, 107}</string>
<object class="NSView" key="NSWindowView" id="234287744">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -7235,6 +7222,7 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{17, 74}, {272, 28}}</string>
<reference key="NSSuperview" ref="234287744"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="420541191">
<int key="NSCellFlags">67239424</int>
@@ -7252,6 +7240,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{74, 45}, {162, 22}}</string>
<reference key="NSSuperview" ref="234287744"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="1007861376">
<int key="NSCellFlags">-2076049856</int>
@@ -7296,6 +7285,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="NSOnImage" ref="450876295"/>
<reference key="NSMixedImage" ref="414351669"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">1</int>
<reference key="NSTarget" ref="1007861376"/>
</object>
<object class="NSMenuItem" id="597414827">
@@ -7307,17 +7297,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<reference key="NSOnImage" ref="450876295"/>
<reference key="NSMixedImage" ref="414351669"/>
<string key="NSAction">_popUpItemAction:</string>
- <reference key="NSTarget" ref="1007861376"/>
- </object>
- <object class="NSMenuItem" id="112475542">
- <reference key="NSMenu" ref="392618957"/>
- <string key="NSTitle">FULLTEXT</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="450876295"/>
- <reference key="NSMixedImage" ref="414351669"/>
- <string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">2</int>
<reference key="NSTarget" ref="1007861376"/>
</object>
</object>
@@ -7333,6 +7313,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{154, 17}, {84, 28}}</string>
<reference key="NSSuperview" ref="234287744"/>
+ <reference key="NSWindow"/>
<int key="NSTag">1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="827163428">
@@ -7356,6 +7337,7 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
<int key="NSvFlags">256</int>
<string key="NSFrame">{{72, 17}, {84, 28}}</string>
<reference key="NSSuperview" ref="234287744"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="125727271">
<int key="NSCellFlags">67239424</int>
@@ -7374,6 +7356,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
</object>
<string key="NSFrameSize">{306, 122}</string>
+ <reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1440, 878}}</string>
<string key="NSMinSize">{213, 129}</string>
@@ -17021,7 +17005,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<reference key="object" ref="392618957"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="112475542"/>
<reference ref="597414827"/>
<reference ref="349617515"/>
<reference ref="104344125"/>
@@ -17029,11 +17012,6 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<reference key="parent" ref="1007861376"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">417</int>
- <reference key="object" ref="112475542"/>
- <reference key="parent" ref="392618957"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">416</int>
<reference key="object" ref="597414827"/>
<reference key="parent" ref="392618957"/>
@@ -23384,12 +23362,11 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string>414.IBAttributePlaceholdersKey</string>
<string>414.IBPluginDependency</string>
<string>414.ImportedFromIB2</string>
+ <string>415.IBEditorWindowLastContentRect</string>
<string>415.IBPluginDependency</string>
<string>415.ImportedFromIB2</string>
<string>416.IBPluginDependency</string>
<string>416.ImportedFromIB2</string>
- <string>417.IBPluginDependency</string>
- <string>417.ImportedFromIB2</string>
<string>418.IBPluginDependency</string>
<string>418.ImportedFromIB2</string>
<string>419.IBPluginDependency</string>
@@ -24722,9 +24699,9 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>SPTableTextFieldCell</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{355, 517}, {306, 122}}</string>
+ <string>{{346, 345}, {306, 122}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{355, 517}, {306, 122}}</string>
+ <string>{{346, 345}, {306, 122}}</string>
<integer value="1"/>
<integer value="0"/>
<integer value="1"/>
@@ -24748,8 +24725,7 @@ bGQgTmFtZQkgID0gQAoJCQkJICBMRU5HVEgoYEBgKSA+IEA</bytes>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <integer value="1"/>
+ <string>{{409, 358}, {162, 54}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
diff --git a/Interfaces/English.lproj/IndexesView.xib b/Interfaces/English.lproj/IndexesView.xib
index 524fa1b7..2489b11c 100644
--- a/Interfaces/English.lproj/IndexesView.xib
+++ b/Interfaces/English.lproj/IndexesView.xib
@@ -2,9 +2,9 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data>
<int key="IBDocument.SystemTarget">1050</int>
- <string key="IBDocument.SystemVersion">10F569</string>
- <string key="IBDocument.InterfaceBuilderVersion">804</string>
- <string key="IBDocument.AppKitVersion">1038.29</string>
+ <string key="IBDocument.SystemVersion">10H574</string>
+ <string key="IBDocument.InterfaceBuilderVersion">788</string>
+ <string key="IBDocument.AppKitVersion">1038.35</string>
<string key="IBDocument.HIToolboxVersion">461.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -15,18 +15,17 @@
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>804</string>
+ <string>788</string>
<string>1.2.5</string>
</object>
</object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="4"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
- <string>com.brandonwalkin.BWToolkit</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string>com.brandonwalkin.BWToolkit</string>
</object>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
@@ -53,7 +52,7 @@
<object class="NSMutableString" key="NSViewClass">
<characters key="NS.bytes">View</characters>
</object>
- <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
<string key="NSWindowContentMinSize">{267, 274}</string>
<object class="NSView" key="NSWindowView" id="762677578">
<reference key="NSNextResponder"/>
@@ -65,6 +64,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{83, 233}, {167, 22}}</string>
<reference key="NSSuperview" ref="762677578"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="431781347">
<int key="NSCellFlags">-2076049856</int>
@@ -84,22 +84,23 @@
</object>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
- <object class="NSMenuItem" key="NSMenuItem" id="262306657">
+ <object class="NSMenuItem" key="NSMenuItem" id="71932948">
<reference key="NSMenu" ref="71441725"/>
- <string key="NSTitle">INDEX</string>
+ <string key="NSTitle">FULLTEXT</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
- <object class="NSCustomResource" key="NSOnImage" id="195240984">
+ <object class="NSCustomResource" key="NSOnImage" id="600203078">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSMenuCheckmark</string>
</object>
- <object class="NSCustomResource" key="NSMixedImage" id="81373676">
+ <object class="NSCustomResource" key="NSMixedImage" id="752378347">
<string key="NSClassName">NSImage</string>
<string key="NSResourceName">NSMenuMixedState</string>
</object>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">3</int>
<reference key="NSTarget" ref="431781347"/>
</object>
<bool key="NSMenuItemRespectAlignment">YES</bool>
@@ -109,31 +110,45 @@
</object>
<object class="NSMutableArray" key="NSMenuItems">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="262306657"/>
- <object class="NSMenuItem" id="453090810">
+ <object class="NSMenuItem" id="262306657">
<reference key="NSMenu" ref="71441725"/>
- <string key="NSTitle">UNIQUE</string>
+ <string key="NSTitle">PRIMARY KEY</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="195240984"/>
- <reference key="NSMixedImage" ref="81373676"/>
+ <reference key="NSOnImage" ref="600203078"/>
+ <reference key="NSMixedImage" ref="752378347"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="431781347"/>
</object>
- <object class="NSMenuItem" id="71932948">
+ <object class="NSMenuItem" id="828450159">
<reference key="NSMenu" ref="71441725"/>
- <string key="NSTitle">FULLTEXT</string>
+ <string key="NSTitle">INDEX</string>
+ <string key="NSKeyEquiv"/>
+ <int key="NSKeyEquivModMask">1048576</int>
+ <int key="NSMnemonicLoc">2147483647</int>
+ <reference key="NSOnImage" ref="600203078"/>
+ <reference key="NSMixedImage" ref="752378347"/>
+ <string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">1</int>
+ <reference key="NSTarget" ref="431781347"/>
+ </object>
+ <object class="NSMenuItem" id="453090810">
+ <reference key="NSMenu" ref="71441725"/>
+ <string key="NSTitle">UNIQUE</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="195240984"/>
- <reference key="NSMixedImage" ref="81373676"/>
+ <reference key="NSOnImage" ref="600203078"/>
+ <reference key="NSMixedImage" ref="752378347"/>
<string key="NSAction">_popUpItemAction:</string>
+ <int key="NSTag">2</int>
<reference key="NSTarget" ref="431781347"/>
</object>
+ <reference ref="71932948"/>
</object>
</object>
+ <int key="NSSelectedIndex">3</int>
<int key="NSPreferredEdge">3</int>
<bool key="NSUsesItemFromMenu">YES</bool>
<bool key="NSAltersState">YES</bool>
@@ -145,6 +160,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{86, 211}, {161, 19}}</string>
<reference key="NSSuperview" ref="762677578"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="1000744513">
<int key="NSCellFlags">-1267597759</int>
@@ -179,6 +195,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 213}, {64, 14}}</string>
<reference key="NSSuperview" ref="762677578"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="568966163">
<int key="NSCellFlags">67239424</int>
@@ -192,7 +209,7 @@
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="1009303974">
<int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
+ <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="723855329">
@@ -208,6 +225,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 238}, {64, 14}}</string>
<reference key="NSSuperview" ref="762677578"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="217993475">
<int key="NSCellFlags">67239424</int>
@@ -234,12 +252,14 @@
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{267, 80}</string>
<reference key="NSSuperview" ref="726923866"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTableHeaderView" key="NSHeaderView" id="1016340205">
<reference key="NSNextResponder" ref="218049294"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{267, 17}</string>
<reference key="NSSuperview" ref="218049294"/>
+ <reference key="NSWindow"/>
<reference key="NSTableView" ref="633969417"/>
</object>
<object class="_NSCornerView" key="NSCornerView" id="310534340">
@@ -247,6 +267,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{224, 0}, {16, 17}}</string>
<reference key="NSSuperview" ref="561916229"/>
+ <reference key="NSWindow"/>
</object>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -406,6 +427,7 @@
</object>
<string key="NSFrame">{{1, 17}, {267, 80}}</string>
<reference key="NSSuperview" ref="561916229"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="633969417"/>
<reference key="NSDocView" ref="633969417"/>
<reference key="NSBGColor" ref="433719363"/>
@@ -416,6 +438,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{224, 17}, {15, 102}}</string>
<reference key="NSSuperview" ref="561916229"/>
+ <reference key="NSWindow"/>
<reference key="NSTarget" ref="561916229"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.80263155698776245</double>
@@ -425,6 +448,7 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {225, 11}}</string>
<reference key="NSSuperview" ref="561916229"/>
+ <reference key="NSWindow"/>
<int key="NSsFlags">257</int>
<reference key="NSTarget" ref="561916229"/>
<string key="NSAction">_doScroller:</string>
@@ -439,6 +463,7 @@
</object>
<string key="NSFrame">{{1, 0}, {267, 17}}</string>
<reference key="NSSuperview" ref="561916229"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1016340205"/>
<reference key="NSDocView" ref="1016340205"/>
<reference key="NSBGColor" ref="433719363"/>
@@ -448,6 +473,7 @@
</object>
<string key="NSFrame">{{-1, 97}, {269, 98}}</string>
<reference key="NSSuperview" ref="762677578"/>
+ <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="726923866"/>
<int key="NSsFlags">530</int>
<reference key="NSVScroller" ref="181568637"/>
@@ -477,6 +503,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{21, 42}, {78, 14}}</string>
<reference key="NSSuperview" ref="361997881"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="971022587">
<int key="NSCellFlags">68288064</int>
@@ -493,6 +520,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{101, 37}, {162, 22}}</string>
<reference key="NSSuperview" ref="361997881"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSPopUpButtonCell" key="NSCell" id="747441327">
<int key="NSCellFlags">-2076049856</int>
@@ -512,8 +540,8 @@
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<int key="NSState">1</int>
- <reference key="NSOnImage" ref="195240984"/>
- <reference key="NSMixedImage" ref="81373676"/>
+ <reference key="NSOnImage" ref="600203078"/>
+ <reference key="NSMixedImage" ref="752378347"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="747441327"/>
</object>
@@ -530,8 +558,8 @@
<string key="NSTitle"/>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="195240984"/>
- <reference key="NSMixedImage" ref="81373676"/>
+ <reference key="NSOnImage" ref="600203078"/>
+ <reference key="NSMixedImage" ref="752378347"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="747441327"/>
</object>
@@ -541,8 +569,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="195240984"/>
- <reference key="NSMixedImage" ref="81373676"/>
+ <reference key="NSOnImage" ref="600203078"/>
+ <reference key="NSMixedImage" ref="752378347"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="747441327"/>
</object>
@@ -552,8 +580,8 @@
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="195240984"/>
- <reference key="NSMixedImage" ref="81373676"/>
+ <reference key="NSOnImage" ref="600203078"/>
+ <reference key="NSMixedImage" ref="752378347"/>
<string key="NSAction">_popUpItemAction:</string>
<reference key="NSTarget" ref="747441327"/>
</object>
@@ -575,6 +603,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{15, 16}, {84, 14}}</string>
<reference key="NSSuperview" ref="361997881"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="408249519">
<int key="NSCellFlags">68288064</int>
@@ -591,6 +620,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{104, 14}, {63, 19}}</string>
<reference key="NSSuperview" ref="361997881"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="659211423">
<int key="NSCellFlags">-1804468671</int>
@@ -670,10 +700,12 @@
</object>
<string key="NSFrame">{{1, 1}, {278, 71}}</string>
<reference key="NSSuperview" ref="197030792"/>
+ <reference key="NSWindow"/>
</object>
</object>
<string key="NSFrame">{{-5, -4}, {280, 73}}</string>
<reference key="NSSuperview" ref="30022357"/>
+ <reference key="NSWindow"/>
<string key="NSOffsets">{0, 0}</string>
<object class="NSTextFieldCell" key="NSTitleCell">
<int key="NSCellFlags">67239424</int>
@@ -697,6 +729,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{-83, 41}, {100, 18}}</string>
<reference key="NSSuperview" ref="30022357"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="708153532">
<int key="NSCellFlags">67239424</int>
@@ -722,6 +755,7 @@
</object>
<string key="NSFrame">{{-2, -30}, {272, 67}}</string>
<reference key="NSSuperview" ref="762677578"/>
+ <reference key="NSWindow"/>
<string key="NSClassName">NSView</string>
</object>
<object class="NSButton" id="1003402112">
@@ -729,6 +763,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{0, 40}, {29, 26}}</string>
<reference key="NSSuperview" ref="762677578"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="782137189">
<int key="NSCellFlags">67239424</int>
@@ -750,6 +785,7 @@
<int key="NSvFlags">292</int>
<string key="NSFrame">{{24, 41}, {214, 22}}</string>
<reference key="NSSuperview" ref="762677578"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="958218934">
<int key="NSCellFlags">-2080244224</int>
@@ -775,6 +811,7 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{152, 13}, {100, 28}}</string>
<reference key="NSSuperview" ref="762677578"/>
+ <reference key="NSWindow"/>
<int key="NSTag">1</int>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="289434200">
@@ -801,6 +838,7 @@
<int key="NSvFlags">289</int>
<string key="NSFrame">{{54, 13}, {100, 28}}</string>
<reference key="NSSuperview" ref="762677578"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="758521208">
<int key="NSCellFlags">67239424</int>
@@ -827,6 +865,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{1, 0}, {32, 24}}</string>
<reference key="NSSuperview" ref="797179406"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="BWAnchoredButtonCell" key="NSCell" id="78847401">
<int key="NSCellFlags">67239424</int>
@@ -851,6 +890,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{32, 0}, {32, 24}}</string>
<reference key="NSSuperview" ref="797179406"/>
+ <reference key="NSWindow"/>
<bool key="NSEnabled">YES</bool>
<object class="BWAnchoredButtonCell" key="NSCell" id="88287488">
<int key="NSCellFlags">604110336</int>
@@ -873,6 +913,7 @@
</object>
<string key="NSFrame">{{-2, 74}, {270, 24}}</string>
<reference key="NSSuperview" ref="762677578"/>
+ <reference key="NSWindow"/>
<bool key="BWABBIsResizable">NO</bool>
<bool key="BWABBIsAtBottom">NO</bool>
<bool key="BWABBHandleIsRightAligned">NO</bool>
@@ -881,10 +922,11 @@
</object>
<string key="NSFrameSize">{267, 274}</string>
<reference key="NSSuperview"/>
+ <reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{267, 296}</string>
- <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
+ <string key="NSMaxSize">{1.79769e+308, 1.79769e+308}</string>
</object>
<object class="NSMenu" id="644710844">
<string key="NSTitle"/>
@@ -895,8 +937,8 @@
<string key="NSTitle">Remove Field</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="195240984"/>
- <reference key="NSMixedImage" ref="81373676"/>
+ <reference key="NSOnImage" ref="600203078"/>
+ <reference key="NSMixedImage" ref="752378347"/>
</object>
</object>
</object>
@@ -1270,6 +1312,7 @@
<reference ref="453090810"/>
<reference ref="71932948"/>
<reference ref="262306657"/>
+ <reference ref="828450159"/>
</object>
<reference key="parent" ref="431781347"/>
</object>
@@ -1615,6 +1658,11 @@
<reference key="object" ref="299133641"/>
<reference key="parent" ref="659211423"/>
</object>
+ <object class="IBObjectRecord">
+ <int key="objectID">138</int>
+ <reference key="object" ref="828450159"/>
+ <reference key="parent" ref="71441725"/>
+ </object>
</object>
</object>
<object class="NSMutableDictionary" key="flattenedProperties">
@@ -1649,6 +1697,8 @@
<string>136.IBNumberFormatterBehaviorMetadataKey</string>
<string>136.IBNumberFormatterLocalizesFormatMetadataKey</string>
<string>136.IBPluginDependency</string>
+ <string>138.IBPluginDependency</string>
+ <string>138.ImportedFromIB2</string>
<string>14.IBEditorWindowLastContentRect</string>
<string>14.IBPluginDependency</string>
<string>14.ImportedFromIB2</string>
@@ -1774,7 +1824,9 @@
<integer value="1041"/>
<boolean value="NO"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{631, 783}, {167, 54}}</string>
+ <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <integer value="1"/>
+ <string>{{683, 655}, {167, 71}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1870,7 +1922,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">137</int>
+ <int key="maxID">138</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1883,10 +1935,10 @@
</object>
</object>
<object class="IBPartialClassDescription">
- <string key="className">NSObject</string>
+ <string key="className">NSMenu</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
- <string key="minorKey">Frameworks/MCPKit/MCPFoundationKit/MCPConnection.h</string>
+ <string key="minorKey">Source/SPMenuAdditions.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
@@ -1985,7 +2037,10 @@
<string>doSelectionTitleCase:</string>
<string>doSelectionUpperCase:</string>
<string>doTranspose:</string>
+ <string>executeBundleItemForInputField:</string>
<string>insertNULLvalue:</string>
+ <string>moveSelectionLineDown:</string>
+ <string>moveSelectionLineUp:</string>
<string>selectCurrentLine:</string>
<string>selectCurrentWord:</string>
<string>selectEnclosingBrackets:</string>
@@ -2005,6 +2060,9 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@@ -2020,7 +2078,10 @@
<string>doSelectionTitleCase:</string>
<string>doSelectionUpperCase:</string>
<string>doTranspose:</string>
+ <string>executeBundleItemForInputField:</string>
<string>insertNULLvalue:</string>
+ <string>moveSelectionLineDown:</string>
+ <string>moveSelectionLineUp:</string>
<string>selectCurrentLine:</string>
<string>selectCurrentWord:</string>
<string>selectEnclosingBrackets:</string>
@@ -2064,10 +2125,22 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
+ <string key="name">executeBundleItemForInputField:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">insertNULLvalue:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
+ <string key="name">moveSelectionLineDown:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">moveSelectionLineUp:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">selectCurrentLine:</string>
<string key="candidateClassName">id</string>
</object>
@@ -2132,7 +2205,9 @@
<string>import:</string>
<string>importFromClipboard:</string>
<string>openCurrentConnectionInNewWindow:</string>
+ <string>openDatabaseInNewTab:</string>
<string>optimizeTable:</string>
+ <string>refreshTables:</string>
<string>removeDatabase:</string>
<string>renameDatabase:</string>
<string>repairTable:</string>
@@ -2149,12 +2224,6 @@
<string>toggleNavigator:</string>
<string>updateWindowTitle:</string>
<string>validateSaveConnectionAccessory:</string>
- <string>viewContent:</string>
- <string>viewQuery:</string>
- <string>viewRelations:</string>
- <string>viewStatus:</string>
- <string>viewStructure:</string>
- <string>viewTriggers:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2202,10 +2271,6 @@
<string>id</string>
<string>id</string>
<string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
- <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@@ -2237,7 +2302,9 @@
<string>import:</string>
<string>importFromClipboard:</string>
<string>openCurrentConnectionInNewWindow:</string>
+ <string>openDatabaseInNewTab:</string>
<string>optimizeTable:</string>
+ <string>refreshTables:</string>
<string>removeDatabase:</string>
<string>renameDatabase:</string>
<string>repairTable:</string>
@@ -2254,12 +2321,6 @@
<string>toggleNavigator:</string>
<string>updateWindowTitle:</string>
<string>validateSaveConnectionAccessory:</string>
- <string>viewContent:</string>
- <string>viewQuery:</string>
- <string>viewRelations:</string>
- <string>viewStatus:</string>
- <string>viewStructure:</string>
- <string>viewTriggers:</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -2364,10 +2425,18 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
+ <string key="name">openDatabaseInNewTab:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">optimizeTable:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
+ <string key="name">refreshTables:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">removeDatabase:</string>
<string key="candidateClassName">id</string>
</object>
@@ -2431,30 +2500,6 @@
<string key="name">validateSaveConnectionAccessory:</string>
<string key="candidateClassName">id</string>
</object>
- <object class="IBActionInfo">
- <string key="name">viewContent:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">viewQuery:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">viewRelations:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">viewStatus:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">viewStructure:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
- <string key="name">viewTriggers:</string>
- <string key="candidateClassName">id</string>
- </object>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
@@ -2958,6 +3003,73 @@
</object>
<object class="IBPartialClassDescription">
<string key="className">SPDatabaseDocument</string>
+ <object class="NSMutableDictionary" key="actions">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>viewContent:</string>
+ <string>viewQuery:</string>
+ <string>viewRelations:</string>
+ <string>viewStatus:</string>
+ <string>viewStructure:</string>
+ <string>viewTriggers:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ <string>id</string>
+ </object>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="NSArray" key="dict.sortedKeys">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <string>viewContent:</string>
+ <string>viewQuery:</string>
+ <string>viewRelations:</string>
+ <string>viewStatus:</string>
+ <string>viewStructure:</string>
+ <string>viewTriggers:</string>
+ </object>
+ <object class="NSMutableArray" key="dict.values">
+ <bool key="EncodedWithXMLCoder">YES</bool>
+ <object class="IBActionInfo">
+ <string key="name">viewContent:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">viewQuery:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">viewRelations:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">viewStatus:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">viewStructure:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
+ <string key="name">viewTriggers:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/SPDatabaseViewController.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SPDatabaseDocument</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">Source/SPPrintController.h</string>
@@ -3316,13 +3428,13 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addField:</string>
- <string>closeKeySheet:</string>
<string>closeSheet:</string>
<string>copyField:</string>
<string>reloadTable:</string>
<string>removeField:</string>
<string>resetAutoIncrement:</string>
<string>showOptimizedFieldType:</string>
+ <string>toggleColumnView:</string>
<string>unhideIndexesView:</string>
</object>
<object class="NSMutableArray" key="dict.values">
@@ -3343,13 +3455,13 @@
<object class="NSArray" key="dict.sortedKeys">
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addField:</string>
- <string>closeKeySheet:</string>
<string>closeSheet:</string>
<string>copyField:</string>
<string>reloadTable:</string>
<string>removeField:</string>
<string>resetAutoIncrement:</string>
<string>showOptimizedFieldType:</string>
+ <string>toggleColumnView:</string>
<string>unhideIndexesView:</string>
</object>
<object class="NSMutableArray" key="dict.values">
@@ -3359,10 +3471,6 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
- <string key="name">closeKeySheet:</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBActionInfo">
<string key="name">closeSheet:</string>
<string key="candidateClassName">id</string>
</object>
@@ -3387,6 +3495,10 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
+ <string key="name">toggleColumnView:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">unhideIndexesView:</string>
<string key="candidateClassName">id</string>
</object>
@@ -3422,6 +3534,7 @@
<string>tableSourceView</string>
<string>tablesIndexesSplitView</string>
<string>tablesListInstance</string>
+ <string>viewColumnsMenu</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3451,6 +3564,7 @@
<string>id</string>
<string>NSSplitView</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -3483,6 +3597,7 @@
<string>tableSourceView</string>
<string>tablesIndexesSplitView</string>
<string>tablesListInstance</string>
+ <string>viewColumnsMenu</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3590,6 +3705,10 @@
<string key="name">tablesListInstance</string>
<string key="candidateClassName">id</string>
</object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">viewColumnsMenu</string>
+ <string key="candidateClassName">id</string>
+ </object>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -3598,6 +3717,13 @@
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">SPTableStructure</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">Source/SPTableStructureDelegate.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">SPTablesList</string>
<string key="superclassName">NSObject</string>
<object class="NSMutableDictionary" key="actions">
@@ -3607,6 +3733,7 @@
<string>addTable:</string>
<string>closeSheet:</string>
<string>copyTable:</string>
+ <string>openTableInNewTab:</string>
<string>removeTable:</string>
<string>renameTable:</string>
<string>togglePaneCollapse:</string>
@@ -3625,6 +3752,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
@@ -3634,6 +3762,7 @@
<string>addTable:</string>
<string>closeSheet:</string>
<string>copyTable:</string>
+ <string>openTableInNewTab:</string>
<string>removeTable:</string>
<string>renameTable:</string>
<string>togglePaneCollapse:</string>
@@ -3656,6 +3785,10 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo">
+ <string key="name">openTableInNewTab:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo">
<string key="name">removeTable:</string>
<string key="candidateClassName">id</string>
</object>
@@ -3697,6 +3830,8 @@
<string>duplicateTableMenuItem</string>
<string>extendedTableInfoInstance</string>
<string>listFilterField</string>
+ <string>openTableInNewTabContextMenuItem</string>
+ <string>openTableInNewTabMenuItem</string>
<string>removeTableContextMenuItem</string>
<string>removeTableMenuItem</string>
<string>renameTableContextMenuItem</string>
@@ -3708,7 +3843,6 @@
<string>showCreateSyntaxContextMenuItem</string>
<string>showCreateSyntaxMenuItem</string>
<string>spHistoryControllerInstance</string>
- <string>tabView</string>
<string>tableContentInstance</string>
<string>tableDataInstance</string>
<string>tableDocumentInstance</string>
@@ -3728,7 +3862,7 @@
<string>toolbarAddButton</string>
<string>toolbarReloadButton</string>
<string>truncateTableButton</string>
- <string>truncateTableContextButton</string>
+ <string>truncateTableContextMenuItem</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3754,13 +3888,14 @@
<string>NSMenuItem</string>
<string>NSMenuItem</string>
<string>NSMenuItem</string>
+ <string>NSMenuItem</string>
+ <string>NSMenuItem</string>
<string>SPHistoryController</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
<string>id</string>
- <string>id</string>
<string>NSButton</string>
<string>id</string>
<string>NSSplitView</string>
@@ -3775,7 +3910,7 @@
<string>id</string>
<string>id</string>
<string>id</string>
- <string>id</string>
+ <string>NSMenuItem</string>
</object>
</object>
<object class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -3794,6 +3929,8 @@
<string>duplicateTableMenuItem</string>
<string>extendedTableInfoInstance</string>
<string>listFilterField</string>
+ <string>openTableInNewTabContextMenuItem</string>
+ <string>openTableInNewTabMenuItem</string>
<string>removeTableContextMenuItem</string>
<string>removeTableMenuItem</string>
<string>renameTableContextMenuItem</string>
@@ -3805,7 +3942,6 @@
<string>showCreateSyntaxContextMenuItem</string>
<string>showCreateSyntaxMenuItem</string>
<string>spHistoryControllerInstance</string>
- <string>tabView</string>
<string>tableContentInstance</string>
<string>tableDataInstance</string>
<string>tableDocumentInstance</string>
@@ -3825,7 +3961,7 @@
<string>toolbarAddButton</string>
<string>toolbarReloadButton</string>
<string>truncateTableButton</string>
- <string>truncateTableContextButton</string>
+ <string>truncateTableContextMenuItem</string>
</object>
<object class="NSMutableArray" key="dict.values">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -3878,6 +4014,14 @@
<string key="candidateClassName">NSSearchField</string>
</object>
<object class="IBToOneOutletInfo">
+ <string key="name">openTableInNewTabContextMenuItem</string>
+ <string key="candidateClassName">NSMenuItem</string>
+ </object>
+ <object class="IBToOneOutletInfo">
+ <string key="name">openTableInNewTabMenuItem</string>
+ <string key="candidateClassName">NSMenuItem</string>
+ </object>
+ <object class="IBToOneOutletInfo">
<string key="name">removeTableContextMenuItem</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
@@ -3922,10 +4066,6 @@
<string key="candidateClassName">SPHistoryController</string>
</object>
<object class="IBToOneOutletInfo">
- <string key="name">tabView</string>
- <string key="candidateClassName">id</string>
- </object>
- <object class="IBToOneOutletInfo">
<string key="name">tableContentInstance</string>
<string key="candidateClassName">id</string>
</object>
@@ -4002,8 +4142,8 @@
<string key="candidateClassName">id</string>
</object>
<object class="IBToOneOutletInfo">
- <string key="name">truncateTableContextButton</string>
- <string key="candidateClassName">id</string>
+ <string key="name">truncateTableContextMenuItem</string>
+ <string key="candidateClassName">NSMenuItem</string>
</object>
</object>
</object>
@@ -4451,6 +4591,27 @@
<string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">ShortcutRecorder.framework/Headers/SRRecorderControl.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
+ <string key="minorKey">ShortcutRecorder.framework/Headers/SRValidator.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">NSObject</string>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">Sparkle.framework/Headers/SUAppcast.h</string>
</object>
</object>
diff --git a/Resources/English.lproj/DBView.strings b/Resources/English.lproj/DBView.strings
index b2b0b4b9..f7096605 100644
--- a/Resources/English.lproj/DBView.strings
+++ b/Resources/English.lproj/DBView.strings
Binary files differ
diff --git a/Resources/English.lproj/IndexesView.strings b/Resources/English.lproj/IndexesView.strings
index ebbaab67..a2c1a5d7 100644
--- a/Resources/English.lproj/IndexesView.strings
+++ b/Resources/English.lproj/IndexesView.strings
Binary files differ
diff --git a/Resources/English.lproj/Localizable.strings b/Resources/English.lproj/Localizable.strings
index 18431777..345a08ee 100644
--- a/Resources/English.lproj/Localizable.strings
+++ b/Resources/English.lproj/Localizable.strings
Binary files differ
diff --git a/Source/SPConstants.h b/Source/SPConstants.h
index d3171802..f724535f 100644
--- a/Source/SPConstants.h
+++ b/Source/SPConstants.h
@@ -180,6 +180,16 @@ typedef enum
SPEncodingEUCKRKorean = 180
} SPEncodingTypes;
+// Table index type menu tags
+typedef enum
+{
+ SPPrimaryKeyMenuTag = 0,
+ SPIndexMenuTag = 1,
+ SPUniqueMenuTag = 2,
+ SPFullTextMenuTag = 3,
+ SPSpatialMenuTag = 4
+} SPTableIndexTypeTags;
+
// File compression formats
typedef enum
{
diff --git a/Source/SPIndexesController.m b/Source/SPIndexesController.m
index c26eb0c7..ad057926 100644
--- a/Source/SPIndexesController.m
+++ b/Source/SPIndexesController.m
@@ -122,18 +122,26 @@ static const NSString *SPNewIndexKeyBlockSize = @"IndexKeyBlockSize";
// Check whether a save of the current field row is required.
if (![tableStructure saveRowOnDeselect]) return;
- [indexTypePopUpButton insertItemWithTitle:@"PRIMARY KEY" atIndex:0];
+ // Reset visibility of the primary key item
+ [[[indexTypePopUpButton menu] itemWithTag:SPPrimaryKeyMenuTag] setHidden:NO];
// Set sheet defaults - key type PRIMARY, key name PRIMARY and disabled
- [indexTypePopUpButton selectItemAtIndex:0];
+ [indexTypePopUpButton selectItemWithTag:SPPrimaryKeyMenuTag];
[indexNameTextField setEnabled:NO];
[indexNameTextField setStringValue:@"PRIMARY"];
-
- // If the table is of type MyISAM and Spatial extension support is available, add the SPATIAL type
+
+ // Remove any existing SPATIAL menu item
+ if ([indexTypePopUpButton indexOfItemWithTag:SPSpatialMenuTag] != -1)
+ [indexTypePopUpButton removeItemAtIndex:[indexTypePopUpButton indexOfItemWithTag:SPSpatialMenuTag]];
+
+ // If the table is of type MyISAM and Spatial extension support is available, (re-)add the SPATIAL type
NSString *engine = [[tableData statusValues] objectForKey:@"Engine"];
if ([engine isEqualToString:@"MyISAM"] && [[dbDocument serverSupport] supportsSpatialExtensions]) {
- [indexTypePopUpButton addItemWithTitle:@"SPATIAL"];
+ NSMenuItem *spatialMenuItem = [[[NSMenuItem alloc] init] autorelease];
+ [spatialMenuItem setTitle:NSLocalizedString(@"SPATIAL", @"Spatial index menu item title")];
+ [spatialMenuItem setTag:SPSpatialMenuTag];
+ [[indexTypePopUpButton menu] addItem:spatialMenuItem];
}
// Check to see whether a primary key already exists for the table, and if so select INDEX instead
@@ -156,11 +164,11 @@ static const NSString *SPNewIndexKeyBlockSize = @"IndexKeyBlockSize";
if (isPrimaryKey || hasCompositePrimaryKey) {
- // Remove primary key option
- [indexTypePopUpButton removeItemAtIndex:0];
+ // Hide primary key option
+ [[[indexTypePopUpButton menu] itemWithTag:SPPrimaryKeyMenuTag] setHidden:YES];
// Select INDEX type
- [indexTypePopUpButton selectItemAtIndex:0];
+ [indexTypePopUpButton selectItemWithTag:SPIndexMenuTag];
[indexNameTextField setEnabled:YES];
[indexNameTextField setStringValue:@""];
@@ -188,8 +196,11 @@ static const NSString *SPNewIndexKeyBlockSize = @"IndexKeyBlockSize";
break;
}
}
+
+ // If no initial field has been selected yet - all fields are indexed - add the first field.
+ if (!initialField) initialField = [fields objectAtIndex:0];
- if (initialField) [indexedFieldNames release], indexedFieldNames = nil;
+ if (indexedFieldNames) [indexedFieldNames release], indexedFieldNames = nil;
// Reset the indexed columns
[indexedFields removeAllObjects];
@@ -275,11 +286,12 @@ static const NSString *SPNewIndexKeyBlockSize = @"IndexKeyBlockSize";
*/
- (IBAction)chooseIndexType:(id)sender
{
- NSString *indexType = [indexTypePopUpButton titleOfSelectedItem];
+ NSInteger *indexType = [[indexTypePopUpButton selectedItem] tag];
- if ([indexType isEqualToString:@"PRIMARY KEY"] ) {
+ if (indexType == SPPrimaryKeyMenuTag) {
[indexNameTextField setEnabled:NO];
[indexNameTextField setStringValue:@"PRIMARY"];
+ [indexStorageTypePopUpButton setEnabled:NO];
}
else {
[indexNameTextField setEnabled:YES];
@@ -289,7 +301,7 @@ static const NSString *SPNewIndexKeyBlockSize = @"IndexKeyBlockSize";
}
// Specifiying an index storage type (i.e. HASH or BTREE) is not permitted with SPATIAL indexes
- [indexStorageTypePopUpButton setEnabled:(![indexType isEqualToString:@"SPATIAL"])];
+ [indexStorageTypePopUpButton setEnabled:(indexType != SPSpatialMenuTag)];
}
}
@@ -301,6 +313,7 @@ static const NSString *SPNewIndexKeyBlockSize = @"IndexKeyBlockSize";
// Close the advanced options view if it's open
[indexAdvancedOptionsView setHidden:YES];
[indexAdvancedOptionsViewButton setState:NSOffState];
+ showAdvancedView = NO;
// Hide the size column
[indexSizeTableColumn setHidden:YES];
@@ -532,14 +545,30 @@ static const NSString *SPNewIndexKeyBlockSize = @"IndexKeyBlockSize";
[indexDetails setObject:indexedFields forKey:SPNewIndexIndexedColumns];
[indexDetails setObject:[indexNameTextField stringValue] forKey:SPNewIndexIndexName];
- [indexDetails setObject:[indexTypePopUpButton titleOfSelectedItem] forKey:SPNewIndexIndexType];
+ switch ([[indexTypePopUpButton selectedItem] tag]) {
+ case SPPrimaryKeyMenuTag:
+ [indexDetails setObject:@"PRIMARY KEY" forKey:SPNewIndexIndexType];
+ break;
+ case SPIndexMenuTag:
+ [indexDetails setObject:@"INDEX" forKey:SPNewIndexIndexType];
+ break;
+ case SPUniqueMenuTag:
+ [indexDetails setObject:@"UNIQUE" forKey:SPNewIndexIndexType];
+ break;
+ case SPFullTextMenuTag:
+ [indexDetails setObject:@"FULLTEXT" forKey:SPNewIndexIndexType];
+ break;
+ case SPSpatialMenuTag:
+ [indexDetails setObject:@"SPATIAL" forKey:SPNewIndexIndexType];
+ break;
+ }
// If there is a key block size set it means the database version supports it
if ([[indexKeyBlockSizeTextField stringValue] length]) {
[indexDetails setObject:[NSNumber numberWithInteger:[indexKeyBlockSizeTextField integerValue]] forKey:SPNewIndexKeyBlockSize];
}
- if (([indexStorageTypePopUpButton indexOfSelectedItem] > 0) && (![[indexTypePopUpButton titleOfSelectedItem] isEqualToString:@"SPATIAL"])) {
+ if (([[indexTypePopUpButton selectedItem] tag] != SPPrimaryKeyMenuTag) && ([[indexTypePopUpButton selectedItem] tag] != SPSpatialMenuTag)) {
[indexDetails setObject:[indexStorageTypePopUpButton titleOfSelectedItem] forKey:SPNewIndexStorageType];
}
diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m
index f57a881f..8e6b7e77 100644
--- a/Source/SPTableStructure.m
+++ b/Source/SPTableStructure.m
@@ -1219,8 +1219,18 @@
alertSheetOpened = NO;
if(contextInfo && [contextInfo isEqualToString:@"autoincrementindex"]) {
- if(returnCode) {
- autoIncrementIndex = [chooseKeyButton titleOfSelectedItem];
+ if (returnCode) {
+ switch ([[chooseKeyButton selectedItem] tag]) {
+ case SPPrimaryKeyMenuTag:
+ autoIncrementIndex = @"PRIMARY KEY";
+ break;
+ case SPIndexMenuTag:
+ autoIncrementIndex = @"INDEX";
+ break;
+ case SPUniqueMenuTag:
+ autoIncrementIndex = @"UNIQUE";
+ break;
+ }
} else {
autoIncrementIndex = nil;
if([tableSourceView selectedRow] > -1 && [extraFieldSuggestions count])
diff --git a/Source/SPTableStructureDelegate.m b/Source/SPTableStructureDelegate.m
index d63064e2..17ad817d 100644
--- a/Source/SPTableStructureDelegate.m
+++ b/Source/SPTableStructureDelegate.m
@@ -116,9 +116,10 @@
isCurrentExtraAutoIncrement = [[[anObject stringByTrimmingCharactersInSet:[NSCharacterSet whitespaceAndNewlineCharacterSet]] uppercaseString] isEqualToString:@"AUTO_INCREMENT"];
if(isCurrentExtraAutoIncrement) {
[currentRow setObject:[NSNumber numberWithInteger:0] forKey:@"null"];
+
// Asks the user to add an index to query if AUTO_INCREMENT is set and field isn't indexed
if ((![currentRow objectForKey:@"Key"] || [[currentRow objectForKey:@"Key"] isEqualToString:@""])) {
- [chooseKeyButton selectItemAtIndex:0];
+ [chooseKeyButton selectItemWithTag:SPPrimaryKeyMenuTag];
[NSApp beginSheet:keySheet
modalForWindow:[tableDocumentInstance parentWindow] modalDelegate:self
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-24 17:57:18 +0000