aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax <post@wickenrode.com>2015-11-10 16:13:43 +0100
committerMax <post@wickenrode.com>2015-11-10 16:13:43 +0100
commit2059dfa31eb3d9b629a9734c316984bd8afb3915 (patch)
treebd92065eb9156c572558cf3c6756e179abe048c4
parentfdef91b45a56b2f94aa477041b8f4185a2e7e7e2 (diff)
downloadsequelpro-2059dfa31eb3d9b629a9734c316984bd8afb3915.tar.gz
sequelpro-2059dfa31eb3d9b629a9734c316984bd8afb3915.tar.bz2
sequelpro-2059dfa31eb3d9b629a9734c316984bd8afb3915.zip
Add a "tooltip" when picking a column type in structure view, explaining basic properties of the type (part of #1090)
This is mostly to help users understand what "Length" actually does for *INT types.
Diffstat
-rw-r--r--Interfaces/English.lproj/DBView.xib399
-rw-r--r--Source/SPCategoryAdditions.h1
-rw-r--r--Source/SPComboBoxCell.h73
-rw-r--r--Source/SPComboBoxCell.m137
-rw-r--r--Source/SPScreenAdditions.h44
-rw-r--r--Source/SPScreenAdditions.m54
-rw-r--r--Source/SPTableStructure.h19
-rw-r--r--Source/SPTableStructure.m328
-rw-r--r--Source/SPTableStructureDelegate.m102
-rw-r--r--Source/SPTooltip.m11
-rw-r--r--sequel-pro.xcodeproj/project.pbxproj12
11 files changed, 1107 insertions, 73 deletions
diff --git a/Interfaces/English.lproj/DBView.xib b/Interfaces/English.lproj/DBView.xib
index e42e67e3..465b72fa 100644
--- a/Interfaces/English.lproj/DBView.xib
+++ b/Interfaces/English.lproj/DBView.xib
@@ -68,7 +68,7 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="173438986">
- <reference key="NSNextResponder"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSSplitView" id="310278688">
@@ -218,7 +218,6 @@
</array>
<string key="NSFrame">{{1, 1}, {218, 38}}</string>
<reference key="NSSuperview" ref="45537637"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="778694607"/>
<reference key="NSDocView" ref="778694607"/>
<int key="NScvFlags">2</int>
@@ -228,7 +227,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {15, 8}}</string>
<reference key="NSSuperview" ref="45537637"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="510684108"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="45537637"/>
@@ -239,7 +237,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {223, 15}}</string>
<reference key="NSSuperview" ref="45537637"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="828528612"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
@@ -249,7 +246,6 @@
</array>
<string key="NSFrame">{{-1, -13}, {220, 40}}</string>
<reference key="NSSuperview" ref="695889527"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="36449649"/>
<int key="NSsFlags">133122</int>
<reference key="NSVScroller" ref="36449649"/>
@@ -414,7 +410,6 @@
</array>
<string key="NSFrameSize">{214, 334}</string>
<reference key="NSSuperview" ref="737277163"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="720354614"/>
<reference key="NSDocView" ref="720354614"/>
</object>
@@ -423,7 +418,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{197, 0}, {15, 292}}</string>
<reference key="NSSuperview" ref="737277163"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="1061162984"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="737277163"/>
@@ -435,7 +429,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {141, 11}}</string>
<reference key="NSSuperview" ref="737277163"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="385210161"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">257</int>
@@ -445,7 +438,6 @@
</array>
<string key="NSFrameSize">{214, 334}</string>
<reference key="NSSuperview" ref="217761928"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="769186993"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="710239831"/>
@@ -459,21 +451,18 @@
</array>
<string key="NSFrame">{{0, 25}, {214, 334}}</string>
<reference key="NSSuperview" ref="152099238"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="737277163"/>
<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
</object>
</array>
<string key="NSFrameSize">{214, 359}</string>
<reference key="NSSuperview" ref="315394535"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="695889527"/>
<int key="NSDividerStyle">2</int>
</object>
</array>
<string key="NSFrameSize">{214, 359}</string>
<reference key="NSSuperview" ref="220052404"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="152099238"/>
<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
</object>
@@ -560,7 +549,6 @@
</array>
<string key="NSFrameSize">{216, 166}</string>
<reference key="NSSuperview" ref="883675819"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="828624540"/>
<reference key="NSDocView" ref="828624540"/>
<int key="NScvFlags">2</int>
@@ -570,7 +558,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {15, 20}}</string>
<reference key="NSSuperview" ref="883675819"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="321115393"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="883675819"/>
@@ -581,7 +568,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {141, 11}}</string>
<reference key="NSSuperview" ref="883675819"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="5721858"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">257</int>
@@ -591,7 +577,6 @@
</array>
<string key="NSFrame">{{-1, 0}, {216, 166}}</string>
<reference key="NSSuperview" ref="1061162984"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="29986399"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="29986399"/>
@@ -681,7 +666,6 @@
</array>
<string key="NSFrameSize">{214, 166}</string>
<reference key="NSSuperview" ref="980722778"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="366652030"/>
<reference key="NSDocView" ref="366652030"/>
<int key="NScvFlags">2</int>
@@ -691,7 +675,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {15, 20}}</string>
<reference key="NSSuperview" ref="980722778"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="562900810"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="980722778"/>
@@ -703,7 +686,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {141, 11}}</string>
<reference key="NSSuperview" ref="980722778"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="725874926"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">257</int>
@@ -713,7 +695,6 @@
</array>
<string key="NSFrameSize">{214, 166}</string>
<reference key="NSSuperview" ref="1061162984"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="735507568"/>
<int key="NSsFlags">133632</int>
<reference key="NSVScroller" ref="735507568"/>
@@ -727,14 +708,12 @@
</array>
<string key="NSFrame">{{0, 360}, {214, 166}}</string>
<reference key="NSSuperview" ref="220052404"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="883675819"/>
<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
</object>
</array>
<string key="NSFrame">{{0, 23}, {214, 526}}</string>
<reference key="NSSuperview" ref="841205379"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="315394535"/>
<int key="NSDividerStyle">2</int>
</object>
@@ -1127,7 +1106,6 @@
</array>
<string key="NSFrameSize">{214, 549}</string>
<reference key="NSSuperview" ref="310278688"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="99671504"/>
<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
</object>
@@ -1140,13 +1118,12 @@
<int key="NSvFlags">274</int>
<string key="NSFrame">{{-7, -10}, {741, 564}}</string>
<reference key="NSSuperview" ref="630926746"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="278510490"/>
+ <reference key="NSNextKeyView" ref="113573997"/>
<array class="NSMutableArray" key="NSTabViewItems">
<object class="NSTabViewItem" id="449203689">
<string key="NSIdentifier">source</string>
<object class="NSView" key="NSView" id="113573997">
- <nil key="NSNextResponder"/>
+ <reference key="NSNextResponder" ref="280187924"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSSplitView" id="204281121">
@@ -1196,7 +1173,7 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{694, 288}</string>
<reference key="NSSuperview" ref="971612446"/>
- <reference key="NSNextKeyView" ref="829483012"/>
+ <reference key="NSNextKeyView" ref="1057730379"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -1820,7 +1797,7 @@
</array>
<string key="NSFrame">{{-1, 22}, {696, 306}}</string>
<reference key="NSSuperview" ref="981492694"/>
- <reference key="NSNextKeyView" ref="971612446"/>
+ <reference key="NSNextKeyView" ref="829483012"/>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="346829497"/>
<reference key="NSHScroller" ref="1057730379"/>
@@ -2186,7 +2163,7 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{694, 141}</string>
<reference key="NSSuperview" ref="472300297"/>
- <reference key="NSNextKeyView" ref="542930762"/>
+ <reference key="NSNextKeyView" ref="673560219"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -2506,7 +2483,7 @@
</array>
<string key="NSFrame">{{-1, 22}, {696, 159}}</string>
<reference key="NSSuperview" ref="162304252"/>
- <reference key="NSNextKeyView" ref="472300297"/>
+ <reference key="NSNextKeyView" ref="542930762"/>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="673560219"/>
<reference key="NSHScroller" ref="230182748"/>
@@ -2600,7 +2577,6 @@
</set>
<string key="NSFrame">{{93, 0}, {602, 23}}</string>
<reference key="NSSuperview" ref="162304252"/>
- <reference key="NSNextKeyView" ref="280187924"/>
<bool key="NSEnabled">YES</bool>
<object class="NSImageCell" key="NSCell" id="153461887">
<int key="NSCellFlags">0</int>
@@ -2629,6 +2605,7 @@
</object>
</array>
<string key="NSFrame">{{10, 7}, {706, 544}}</string>
+ <reference key="NSSuperview" ref="280187924"/>
<reference key="NSNextKeyView" ref="204281121"/>
</object>
<string key="NSLabel">Structure</string>
@@ -3732,7 +3709,7 @@
<int key="NSvFlags">6418</int>
<string key="NSFrameSize">{694, 141}</string>
<reference key="NSSuperview" ref="814502469"/>
- <reference key="NSNextKeyView" ref="1058351455"/>
+ <reference key="NSNextKeyView" ref="103288676"/>
<object class="NSTextContainer" key="NSTextContainer" id="104432314">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -3824,7 +3801,7 @@
</array>
<string key="NSFrame">{{0, 1}, {696, 143}}</string>
<reference key="NSSuperview" ref="154150014"/>
- <reference key="NSNextKeyView" ref="103288676"/>
+ <reference key="NSNextKeyView" ref="814502469"/>
<int key="NSsFlags">133650</int>
<reference key="NSVScroller" ref="1058351455"/>
<reference key="NSHScroller" ref="103288676"/>
@@ -3950,7 +3927,7 @@
<int key="NSvFlags">4352</int>
<string key="NSFrameSize">{694, 197}</string>
<reference key="NSSuperview" ref="620500575"/>
- <reference key="NSNextKeyView" ref="1031686395"/>
+ <reference key="NSNextKeyView" ref="621197929"/>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<bool key="NSControlAllowsExpansionToolTips">YES</bool>
@@ -4061,13 +4038,12 @@
</array>
<string key="NSFrame">{{0, -1}, {696, 215}}</string>
<reference key="NSSuperview" ref="1045056406"/>
- <reference key="NSNextKeyView" ref="621197929"/>
+ <reference key="NSNextKeyView" ref="620500575"/>
<int key="NSsFlags">133682</int>
<reference key="NSVScroller" ref="556042083"/>
<reference key="NSHScroller" ref="1031686395"/>
<reference key="NSContentView" ref="620500575"/>
<reference key="NSHeaderClipView" ref="730166708"/>
- <reference key="NSCornerView" ref="621197929"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBkAAAQZAAAA</bytes>
<double key="NSMinMagnification">0.25</double>
<double key="NSMaxMagnification">4</double>
@@ -4683,7 +4659,7 @@
<int key="NSvFlags">2322</int>
<string key="NSFrameSize">{672, 72}</string>
<reference key="NSSuperview" ref="724030266"/>
- <reference key="NSNextKeyView" ref="622087604"/>
+ <reference key="NSNextKeyView" ref="865629592"/>
<object class="NSTextContainer" key="NSTextContainer" id="545876225">
<object class="NSLayoutManager" key="NSLayoutManager">
<object class="NSTextStorage" key="NSTextStorage">
@@ -4759,7 +4735,7 @@
</array>
<string key="NSFrame">{{12, 12}, {672, 72}}</string>
<reference key="NSSuperview" ref="105597532"/>
- <reference key="NSNextKeyView" ref="865629592"/>
+ <reference key="NSNextKeyView" ref="724030266"/>
<int key="NSsFlags">133648</int>
<reference key="NSVScroller" ref="622087604"/>
<reference key="NSHScroller" ref="865629592"/>
@@ -4810,7 +4786,7 @@
<object class="NSTabViewItem" id="618922025">
<string key="NSIdentifier">status</string>
<object class="NSView" key="NSView" id="278510490">
- <reference key="NSNextResponder" ref="280187924"/>
+ <nil key="NSNextResponder"/>
<int key="NSvFlags">274</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSSplitView" id="420718918">
@@ -4899,7 +4875,6 @@
</array>
<string key="NSFrame">{{1, 1}, {541, 70}}</string>
<reference key="NSSuperview" ref="834551573"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="902567272"/>
<reference key="NSDocView" ref="902567272"/>
<reference key="NSBGColor" ref="457906098"/>
@@ -4911,7 +4886,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="834551573"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="378663488"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
@@ -4924,7 +4898,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{542, 1}, {11, 70}}</string>
<reference key="NSSuperview" ref="834551573"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="807082629"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">256</int>
@@ -4934,7 +4907,6 @@
</array>
<string key="NSFrame">{{109, 0}, {554, 72}}</string>
<reference key="NSSuperview" ref="697228900"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="301562599"/>
<int key="NSsFlags">133138</int>
<reference key="NSVScroller" ref="582113763"/>
@@ -4949,7 +4921,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{4, 58}, {100, 14}}</string>
<reference key="NSSuperview" ref="697228900"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="834551573"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="191751479">
@@ -5035,7 +5006,6 @@
</array>
<string key="NSFrame">{{1, 1}, {541, 197}}</string>
<reference key="NSSuperview" ref="866412611"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="804444600"/>
<reference key="NSDocView" ref="804444600"/>
<reference key="NSBGColor" ref="457906098"/>
@@ -5047,7 +5017,6 @@
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{-100, -100}, {87, 18}}</string>
<reference key="NSSuperview" ref="866412611"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="121595321"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
@@ -5060,8 +5029,6 @@
<int key="NSvFlags">256</int>
<string key="NSFrame">{{542, 1}, {11, 197}}</string>
<reference key="NSSuperview" ref="866412611"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">256</int>
<reference key="NSTarget" ref="866412611"/>
@@ -5070,7 +5037,6 @@
</array>
<string key="NSFrame">{{109, 0}, {554, 199}}</string>
<reference key="NSSuperview" ref="807082629"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="492861350"/>
<int key="NSsFlags">133138</int>
<reference key="NSVScroller" ref="486433207"/>
@@ -5085,7 +5051,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{3, 185}, {101, 14}}</string>
<reference key="NSSuperview" ref="807082629"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="866412611"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="456332788">
@@ -5103,7 +5068,6 @@
</array>
<string key="NSFrame">{{0, 81}, {663, 199}}</string>
<reference key="NSSuperview" ref="420718918"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="473337782"/>
<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
<string key="NSClassName">NSView</string>
@@ -5111,7 +5075,6 @@
</array>
<string key="NSFrame">{{12, 30}, {663, 280}}</string>
<reference key="NSSuperview" ref="278510490"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="697228900"/>
<string key="NSAutosaveName">TableInfoSplitter</string>
</object>
@@ -5120,7 +5083,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{22, 501}, {91, 14}}</string>
<reference key="NSSuperview" ref="278510490"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="830707723"/>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="46798413">
@@ -5878,8 +5840,6 @@
</object>
</array>
<string key="NSFrame">{{10, 7}, {706, 544}}</string>
- <reference key="NSSuperview" ref="280187924"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="592029739"/>
</object>
<string key="NSLabel">Status</string>
@@ -6734,26 +6694,24 @@
<reference key="NSTabView" ref="280187924"/>
</object>
</array>
- <reference key="NSSelectedTabViewItem" ref="618922025"/>
+ <reference key="NSSelectedTabViewItem" ref="449203689"/>
<reference key="NSFont" ref="26"/>
<int key="NSTvFlags">134217731</int>
<bool key="NSAllowTruncatedLabels">YES</bool>
<bool key="NSDrawsBackground">YES</bool>
<array class="NSMutableArray" key="NSSubviews">
- <reference ref="278510490"/>
+ <reference ref="113573997"/>
</array>
</object>
</array>
<string key="NSFrame">{{215, 0}, {728, 549}}</string>
<reference key="NSSuperview" ref="310278688"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="280187924"/>
<bool key="NSDoNotTranslateAutoresizingMask">YES</bool>
</object>
</array>
<string key="NSFrameSize">{943, 549}</string>
<reference key="NSSuperview" ref="173438986"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="841205379"/>
<bool key="NSIsVertical">YES</bool>
<int key="NSDividerStyle">2</int>
@@ -6761,8 +6719,6 @@
</object>
</array>
<string key="NSFrameSize">{943, 549}</string>
- <reference key="NSSuperview"/>
- <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="310278688"/>
<string key="NSClassName">NSView</string>
</object>
@@ -12597,7 +12553,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
</array>
</array>
- <object class="NSColor" key="NSColor">
+ <object class="NSColor" key="NSColor" id="114175458">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MCAwAA</bytes>
</object>
@@ -12672,6 +12628,161 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string>
</object>
+ <object class="NSWindowTemplate" id="746008569">
+ <int key="NSWindowStyleMask">145</int>
+ <int key="NSWindowBacking">2</int>
+ <string key="NSWindowRect">{{196, 132}, {410, 165}}</string>
+ <int key="NSWTFlags">-461896704</int>
+ <string key="NSWindowTitle">Type Info</string>
+ <string key="NSWindowClass">NSPanel</string>
+ <nil key="NSViewClass"/>
+ <nil key="NSUserInterfaceItemIdentifier"/>
+ <object class="NSView" key="NSWindowView" id="343760123">
+ <nil key="NSNextResponder"/>
+ <int key="NSvFlags">256</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSScrollView" id="417749005">
+ <reference key="NSNextResponder" ref="343760123"/>
+ <int key="NSvFlags">274</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSClipView" id="863539615">
+ <reference key="NSNextResponder" ref="417749005"/>
+ <int key="NSvFlags">2322</int>
+ <array class="NSMutableArray" key="NSSubviews">
+ <object class="NSTextView" id="81696073">
+ <reference key="NSNextResponder" ref="863539615"/>
+ <int key="NSvFlags">2322</int>
+ <string key="NSFrameSize">{384, 152}</string>
+ <reference key="NSSuperview" ref="863539615"/>
+ <reference key="NSNextKeyView" ref="21184185"/>
+ <string key="NSReuseIdentifierKey">_NS:13</string>
+ <object class="NSTextContainer" key="NSTextContainer" id="453813367">
+ <object class="NSLayoutManager" key="NSLayoutManager">
+ <object class="NSTextStorage" key="NSTextStorage">
+ <object class="NSMutableString" key="NSString">
+ <characters key="NS.bytes">Help dummy text</characters>
+ </object>
+ <dictionary key="NSAttributes">
+ <object class="NSFont" key="NSFont">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">12</double>
+ <int key="NSfFlags">16</int>
+ </object>
+ <object class="NSMutableParagraphStyle" key="NSParagraphStyle">
+ <nil key="NSTabStops"/>
+ </object>
+ </dictionary>
+ <nil key="NSDelegate"/>
+ </object>
+ <array class="NSMutableArray" key="NSTextContainers">
+ <reference ref="453813367"/>
+ </array>
+ <int key="NSLMFlags">166</int>
+ <nil key="NSDelegate"/>
+ </object>
+ <reference key="NSTextView" ref="81696073"/>
+ <double key="NSWidth">384</double>
+ <int key="NSTCFlags">1</int>
+ </object>
+ <object class="NSTextViewSharedData" key="NSSharedData">
+ <int key="NSFlags">10273</int>
+ <int key="NSTextCheckingTypes">0</int>
+ <nil key="NSMarkedAttributes"/>
+ <reference key="NSBackgroundColor" ref="457906098"/>
+ <dictionary key="NSSelectedAttributes">
+ <reference key="NSBackgroundColor" ref="695342849"/>
+ <reference key="NSColor" ref="294465151"/>
+ </dictionary>
+ <reference key="NSInsertionColor" ref="667308713"/>
+ <dictionary key="NSLinkAttributes">
+ <reference key="NSColor" ref="618433734"/>
+ <reference key="NSCursor" ref="113216199"/>
+ <integer value="1" key="NSUnderline"/>
+ </dictionary>
+ <nil key="NSDefaultParagraphStyle"/>
+ <nil key="NSTextFinder"/>
+ <int key="NSPreferredTextFinderStyle">1</int>
+ </object>
+ <int key="NSTVFlags">6</int>
+ <string key="NSMaxSize">{463, 10000000}</string>
+ <nil key="NSDelegate"/>
+ </object>
+ </array>
+ <string key="NSFrameSize">{384, 152}</string>
+ <reference key="NSSuperview" ref="417749005"/>
+ <reference key="NSNextKeyView" ref="81696073"/>
+ <string key="NSReuseIdentifierKey">_NS:11</string>
+ <reference key="NSDocView" ref="81696073"/>
+ <reference key="NSBGColor" ref="457906098"/>
+ <object class="NSCursor" key="NSCursor">
+ <string key="NSHotSpot">{4, 5}</string>
+ <object class="NSImage" key="NSImage">
+ <int key="NSImageFlags">12582912</int>
+ <array class="NSMutableArray" key="NSReps">
+ <array>
+ <integer value="0"/>
+ <object class="NSBitmapImageRep">
+ <object class="NSData" key="NSTIFFRepresentation">
+ <bytes key="NS.bytes">TU0AKgAAAHCAFUqgBVKsAAAAwdVQUqwaEQeIRGJRGFlYqwWLQ+JxuOQpVRmEx2RROKwOQyOUQSPyaUym
+SxqWyKXyeYxyZzWbSuJTScRCbz2Nz+gRKhUOfTqeUai0OSxiWTiBQSHSGFquGwekxyAgAAAOAQAAAwAA
+AAEAEAAAAQEAAwAAAAEAEAAAAQIAAwAAAAIACAAIAQMAAwAAAAEABQAAAQYAAwAAAAEAAQAAAREABAAA
+AAEAAAAIARIAAwAAAAEAAQAAARUAAwAAAAEAAgAAARYAAwAAAAEAEAAAARcABAAAAAEAAABnARwAAwAA
+AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
+ </object>
+ </object>
+ </array>
+ </array>
+ <reference key="NSColor" ref="114175458"/>
+ </object>
+ </object>
+ <int key="NScvFlags">2</int>
+ </object>
+ <object class="NSScroller" id="1022049165">
+ <reference key="NSNextResponder" ref="417749005"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-100, -100}, {15, 133}}</string>
+ <reference key="NSSuperview" ref="417749005"/>
+ <string key="NSReuseIdentifierKey">_NS:85</string>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <reference key="NSTarget" ref="417749005"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSCurValue">1</double>
+ <double key="NSPercent">0.85256409645080566</double>
+ </object>
+ <object class="NSScroller" id="21184185">
+ <reference key="NSNextResponder" ref="417749005"/>
+ <int key="NSvFlags">-2147483392</int>
+ <string key="NSFrame">{{-100, -100}, {87, 18}}</string>
+ <reference key="NSSuperview" ref="417749005"/>
+ <reference key="NSNextKeyView" ref="863539615"/>
+ <string key="NSReuseIdentifierKey">_NS:33</string>
+ <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
+ <int key="NSsFlags">1</int>
+ <reference key="NSTarget" ref="417749005"/>
+ <string key="NSAction">_doScroller:</string>
+ <double key="NSCurValue">1</double>
+ <double key="NSPercent">0.94565218687057495</double>
+ </object>
+ </array>
+ <string key="NSFrame">{{13, 6}, {384, 152}}</string>
+ <reference key="NSSuperview" ref="343760123"/>
+ <reference key="NSNextKeyView" ref="863539615"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <int key="NSsFlags">153600</int>
+ <reference key="NSVScroller" ref="1022049165"/>
+ <reference key="NSHScroller" ref="21184185"/>
+ <reference key="NSContentView" ref="863539615"/>
+ <double key="NSMinMagnification">0.25</double>
+ <double key="NSMaxMagnification">4</double>
+ <double key="NSMagnification">1</double>
+ </object>
+ </array>
+ <string key="NSFrameSize">{410, 165}</string>
+ <string key="NSReuseIdentifierKey">_NS:21</string>
+ </object>
+ <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string>
+ <bool key="NSWindowIsRestorable">YES</bool>
+ </object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<bool key="usesAutoincrementingIDs">NO</bool>
@@ -14869,6 +14980,22 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="id">7087</string>
</object>
<object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">structureHelpPanel</string>
+ <reference key="source" ref="239767357"/>
+ <reference key="destination" ref="746008569"/>
+ </object>
+ <string key="id">bLb-Jh-Jm1</string>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">structureHelpText</string>
+ <reference key="source" ref="239767357"/>
+ <reference key="destination" ref="81696073"/>
+ </object>
+ <string key="id">0cG-kD-PJR</string>
+ </object>
+ <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">gearMenuItemSelected:</string>
<reference key="source" ref="227061690"/>
@@ -16014,6 +16141,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
+ <string key="label">spDelegate</string>
+ <reference key="source" ref="381357793"/>
+ <reference key="destination" ref="239767357"/>
+ </object>
+ <string key="id">bLE-2M-Nym</string>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
<string key="label">menu</string>
<reference key="source" ref="594274975"/>
<reference key="destination" ref="142860202"/>
@@ -24288,6 +24423,48 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<reference key="object" ref="120319413"/>
<reference key="parent" ref="999783710"/>
</object>
+ <object class="IBObjectRecord">
+ <string key="id">NkY-EN-Fxn</string>
+ <reference key="object" ref="746008569"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="343760123"/>
+ </array>
+ <reference key="parent" ref="0"/>
+ <string key="objectName">Structure Type Help</string>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">h2r-1x-8ZD</string>
+ <reference key="object" ref="343760123"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="417749005"/>
+ </array>
+ <reference key="parent" ref="746008569"/>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">VTe-1x-Phd</string>
+ <reference key="object" ref="417749005"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="81696073"/>
+ <reference ref="21184185"/>
+ <reference ref="1022049165"/>
+ </array>
+ <reference key="parent" ref="343760123"/>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">Bfr-0R-dqh</string>
+ <reference key="object" ref="81696073"/>
+ <reference key="parent" ref="417749005"/>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">mBC-nL-nLZ</string>
+ <reference key="object" ref="21184185"/>
+ <reference key="parent" ref="417749005"/>
+ </object>
+ <object class="IBObjectRecord">
+ <string key="id">INC-ms-oeO</string>
+ <reference key="object" ref="1022049165"/>
+ <reference key="parent" ref="417749005"/>
+ </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -24313,6 +24490,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="1246.userInterfaceItemIdentifier">StatusTabView</string>
<string key="1277.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="1277.showNotes"/>
+ <string key="1304.CustomClassName">SPComboBoxCell</string>
<string key="1304.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="1304.showNotes"/>
<string key="1309.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -27110,6 +27288,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="AjX-OA-b5u.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference key="AjX-OA-b5u.IBUserGuides" ref="0"/>
<boolean value="NO" key="AjX-OA-b5u.showNotes"/>
+ <string key="Bfr-0R-dqh.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="CIQ-tc-1Fn.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference key="CIQ-tc-1Fn.IBUserGuides" ref="0"/>
<boolean value="NO" key="CIQ-tc-1Fn.showNotes"/>
@@ -27117,7 +27296,11 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<reference key="FF9-z2-9od.IBUserGuides" ref="0"/>
<boolean value="NO" key="FF9-z2-9od.showNotes"/>
<string key="GVI-VY-JuM.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="INC-ms-oeO.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="KYo-IU-iIw.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="NkY-EN-Fxn.IBPersistedLastKnownCanvasPosition">{98, 659.5}</string>
+ <string key="NkY-EN-Fxn.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="NkY-EN-Fxn.NSWindowTemplate.visibleAtLaunch"/>
<string key="SPm-RJ-YgI.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="TRD-dk-r1Q.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="Ts3-iA-OpO.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -27125,6 +27308,7 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<reference key="VCn-3k-MdI.IBNSViewMetadataGestureRecognizers" ref="0"/>
<string key="VCn-3k-MdI.IBPersistedLastKnownCanvasPosition">{-318.5, -215.5}</string>
<string key="VCn-3k-MdI.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="VTe-1x-Phd.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="dIO-Od-K6g.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference key="dIO-Od-K6g.IBUserGuides" ref="0"/>
<boolean value="NO" key="dIO-Od-K6g.showNotes"/>
@@ -27134,11 +27318,13 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="gTZ-sd-Ef7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference key="gTZ-sd-Ef7.IBUserGuides" ref="0"/>
<boolean value="NO" key="gTZ-sd-Ef7.showNotes"/>
+ <string key="h2r-1x-8ZD.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="j3N-dd-SyM.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="khN-PI-iEA.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="khN-PI-iEA.showNotes"/>
<string key="ki9-Po-bdr.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="ki9-Po-bdr.showNotes"/>
+ <string key="mBC-nL-nLZ.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="mRm-ts-hRV.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="n3P-gU-pX8.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="n5n-Ef-ROd.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -27168,6 +27354,24 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">NSComboBoxCell</string>
+ <object class="NSMutableDictionary" key="actions">
+ <string key="NS.key.0">popUp:</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="actionInfosByName">
+ <string key="NS.key.0">popUp:</string>
+ <object class="IBActionInfo" key="NS.object.0">
+ <string key="name">popUp:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Source/SPComboBoxCell.m</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">NSTextView</string>
<dictionary class="NSMutableDictionary" key="actions">
<string key="doDecomposedStringWithCanonicalMapping:">id</string>
@@ -27350,6 +27554,25 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">SPComboBoxCell</string>
+ <string key="superclassName">NSComboBoxCell</string>
+ <object class="NSMutableDictionary" key="outlets">
+ <string key="NS.key.0">spDelegate</string>
+ <string key="NS.object.0">id</string>
+ </object>
+ <object class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <string key="NS.key.0">spDelegate</string>
+ <object class="IBToOneOutletInfo" key="NS.object.0">
+ <string key="name">spDelegate</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </object>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Source/SPComboBoxCell.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">SPComboPopupButton</string>
<string key="superclassName">NSPopUpButton</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier" id="514582401">
@@ -29594,6 +29817,48 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
</object>
</object>
<object class="IBPartialClassDescription">
+ <string key="className">SPExportController</string>
+ <dictionary class="NSMutableDictionary" key="actions">
+ <string key="exportCurrentSettings:">id</string>
+ <string key="importCurrentSettings:">id</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="exportCurrentSettings:">
+ <string key="name">exportCurrentSettings:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="importCurrentSettings:">
+ <string key="name">importCurrentSettings:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Source/SPExportSettingsPersistence.h</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
+ <string key="className">SPExportController</string>
+ <dictionary class="NSMutableDictionary" key="actions">
+ <string key="exportCurrentSettings:">id</string>
+ <string key="importCurrentSettings:">id</string>
+ </dictionary>
+ <dictionary class="NSMutableDictionary" key="actionInfosByName">
+ <object class="IBActionInfo" key="exportCurrentSettings:">
+ <string key="name">exportCurrentSettings:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ <object class="IBActionInfo" key="importCurrentSettings:">
+ <string key="name">importCurrentSettings:</string>
+ <string key="candidateClassName">id</string>
+ </object>
+ </dictionary>
+ <object class="IBClassDescriptionSource" key="sourceIdentifier">
+ <string key="majorKey">IBProjectSource</string>
+ <string key="minorKey">../Source/SPExportSettingsPersistence.m</string>
+ </object>
+ </object>
+ <object class="IBPartialClassDescription">
<string key="className">SPExtendedTableInfo</string>
<string key="superclassName">NSObject</string>
<dictionary class="NSMutableDictionary" key="actions">
@@ -31376,6 +31641,8 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="resetAutoIncrementSheet">id</string>
<string key="resetAutoIncrementValue">id</string>
<string key="structureGrabber">id</string>
+ <string key="structureHelpPanel">NSPanel</string>
+ <string key="structureHelpText">NSTextView</string>
<string key="tableDataInstance">SPTableData</string>
<string key="tableDocumentInstance">SPDatabaseDocument</string>
<string key="tableInfoInstance">SPTableInfo</string>
@@ -31465,6 +31732,14 @@ AAEAAQAAAT0AAwAAAAEAAgAAAVIAAwAAAAEAAQAAAVMAAwAAAAIAAQABAAAAAA</bytes>
<string key="name">structureGrabber</string>
<string key="candidateClassName">id</string>
</object>
+ <object class="IBToOneOutletInfo" key="structureHelpPanel">
+ <string key="name">structureHelpPanel</string>
+ <string key="candidateClassName">NSPanel</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="structureHelpText">
+ <string key="name">structureHelpText</string>
+ <string key="candidateClassName">NSTextView</string>
+ </object>
<object class="IBToOneOutletInfo" key="tableDataInstance">
<string key="name">tableDataInstance</string>
<string key="candidateClassName">SPTableData</string>
diff --git a/Source/SPCategoryAdditions.h b/Source/SPCategoryAdditions.h
index 58c40d80..991cb60c 100644
--- a/Source/SPCategoryAdditions.h
+++ b/Source/SPCategoryAdditions.h
@@ -48,6 +48,7 @@
#import "SPColorAdditions.h"
#import "SPFileManagerAdditions.h"
#import "SPDateAdditions.h"
+#import "SPScreenAdditions.h"
#import "NSNotificationCenterThreadingAdditions.h"
#import "NSMutableArray-MultipleSort.h"
diff --git a/Source/SPComboBoxCell.h b/Source/SPComboBoxCell.h
new file mode 100644
index 00000000..39c8f505
--- /dev/null
+++ b/Source/SPComboBoxCell.h
@@ -0,0 +1,73 @@
+//
+// SPComboBoxCell.h
+// sequel-pro
+//
+// Created by Max Lohrmann on 08.11.15.
+// Copyright (c) 2015 Max Lohrmann. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+// More info at <https://github.com/sequelpro/sequelpro>
+
+#import <Cocoa/Cocoa.h>
+
+@class SPComboBoxCell;
+
+@protocol SPComboBoxCellDelegate <NSObject>
+
+@optional
+- (void)comboBoxCell:(SPComboBoxCell *)cell willPopUpWindow:(NSWindow *)win;
+- (void)comboBoxCell:(SPComboBoxCell *)cell willDismissWindow:(NSWindow *)win;
+- (void)comboBoxCellSelectionDidChange:(SPComboBoxCell *)cell;
+
+@end
+
+/**
+ * See this class as a kind of "rapid prototype".
+ * It heavily relies on the inner workings of the NSComboBoxCell to implement
+ * the additional features we want (namely the option to show a tooltip
+ * window beside the popup list).
+ *
+ * App Store-wise it would probably we better to implement this from scratch,
+ * but NSComboBoxCell uses some quite difficult logic inside -filterEvents:
+ * which is the core method of the selection process.
+ *
+ * We could somewhat work around the private interface by relying on notification
+ * NSComboBoxCellWillPopUpNotification
+ * and overriding -[NSWindow addChildWindow:] / -[NSWindow removeChildWindow:]
+ * but NSTableView foils that as it will copy the cell right before the notification
+ * is sent, so we don't know what object to observe.
+ */
+@interface SPComboBoxCell : NSComboBoxCell {
+ id<SPComboBoxCellDelegate> spDelegate;
+}
+
+@property (assign) IBOutlet id<SPComboBoxCellDelegate> spDelegate; // NSComboBoxCell already has a delegate property
+
+/**
+ * The popUp window that contains the item list.
+ * Will return nil if the implementation changes and the underlying ivar
+ * is removed or no longer a NSWindow.
+ */
+- (NSWindow *)spPopUpWindow;
+
+@end
diff --git a/Source/SPComboBoxCell.m b/Source/SPComboBoxCell.m
new file mode 100644
index 00000000..15ddc1db
--- /dev/null
+++ b/Source/SPComboBoxCell.m
@@ -0,0 +1,137 @@
+//
+// SPComboBoxCell.m
+// sequel-pro
+//
+// Created by Max Lohrmann on 08.11.15.
+// Copyright (c) 2015 Max Lohrmann. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+// More info at <https://github.com/sequelpro/sequelpro>
+
+#import "SPComboBoxCell.h"
+#import <objc/runtime.h>
+
+static NSString *_CellSelectionDidChangeNotification = @"NSComboBoxCellSelectionDidChangeNotification";
+static NSString *_CellWillPopUpNotification = @"NSComboBoxCellWillPopUpNotification";
+static NSString *_CellWillDismissNotification = @"NSComboBoxCellWillDismissNotification";
+
+@interface NSComboBoxCell (Apple_Private)
+- (IBAction)popUp:(id)sender;
+@end
+
+@interface SPComboBoxCell ()
+
+- (void)sp_selectionDidChange:(NSNotification *)notification;
+- (void)sp_cellWillPopUp:(NSNotification *)notification;
+- (void)sp_cellWillDismiss:(NSNotification *)notification;
+@end
+
+@implementation SPComboBoxCell
+
+@synthesize spDelegate;
+
+- (id)copyWithZone:(NSZone *)zone
+{
+ SPComboBoxCell *cpy = [super copyWithZone:zone];
+
+ cpy->spDelegate = [self spDelegate];
+
+ return cpy;
+}
+
+- (void)dealloc
+{
+ [self setSpDelegate:nil];
+ [super dealloc];
+}
+
+- (NSWindow *)spPopUpWindow
+{
+ NSWindow *popUp;
+ Ivar popUpVar = object_getInstanceVariable(self,"_popUp",(void **)&popUp);
+ if(popUpVar) {
+ const char *typeEnc = ivar_getTypeEncoding(popUpVar);
+ if(typeEnc[0] == '@' && [popUp isKindOfClass:[NSWindow class]]) { // it is an object and of class NSWindow
+ return popUp;
+ }
+ }
+ return nil;
+}
+
+- (void)popUp:(id)sender
+{
+ // this notification will be sent after the popup window is resized and moved to the correct position
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(sp_cellWillPopUp:)
+ name:_CellWillPopUpNotification
+ object:self];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(sp_cellWillDismiss:)
+ name:_CellWillDismissNotification
+ object:self];
+
+ [[NSNotificationCenter defaultCenter] addObserver:self
+ selector:@selector(sp_selectionDidChange:)
+ name:_CellSelectionDidChangeNotification
+ object:self];
+
+ [super popUp:sender]; // this method won't return until the window is closed again
+
+ [[NSNotificationCenter defaultCenter] removeObserver:self
+ name:_CellSelectionDidChangeNotification
+ object:self];
+
+ [[NSNotificationCenter defaultCenter] removeObserver:self
+ name:_CellWillPopUpNotification
+ object:self];
+
+ [[NSNotificationCenter defaultCenter] removeObserver:self
+ name:_CellWillDismissNotification
+ object:self];
+}
+
+- (void)sp_selectionDidChange:(NSNotification *)notification
+{
+ if([[self spDelegate] respondsToSelector:@selector(comboBoxCellSelectionDidChange:)]) {
+ [[self spDelegate] comboBoxCellSelectionDidChange:self];
+ }
+}
+
+- (void)sp_cellWillPopUp:(NSNotification *)notification
+{
+ NSWindow *popUp = [self spPopUpWindow];
+ if(popUp && [[self spDelegate] respondsToSelector:@selector(comboBoxCell:willPopUpWindow:)]) {
+ [[self spDelegate] comboBoxCell:self willPopUpWindow:popUp];
+ }
+}
+
+- (void)sp_cellWillDismiss:(NSNotification *)notification
+{
+ NSWindow *popUp = [self spPopUpWindow];
+ if(popUp && [[self spDelegate] respondsToSelector:@selector(comboBoxCell:willDismissWindow:)]) {
+ [[self spDelegate] comboBoxCell:self willDismissWindow:popUp];
+ }
+}
+
+@end
diff --git a/Source/SPScreenAdditions.h b/Source/SPScreenAdditions.h
new file mode 100644
index 00000000..7720ce78
--- /dev/null
+++ b/Source/SPScreenAdditions.h
@@ -0,0 +1,44 @@
+//
+// SPScreenAdditions.h
+// sequel-pro
+//
+// Created by Max Lohrmann on 09.11.15.
+// Copyright (c) 2015 Max Lohrmann. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+// More info at <https://github.com/sequelpro/sequelpro>
+
+#import <Cocoa/Cocoa.h>
+
+@interface NSScreen (SPScreenAdditions)
+
++ (NSScreen *)screenAtPoint:(NSPoint)p;
+
+/**
+ * Use this method instead of [[NSScreen screenAtPoint:p] frame] as the
+ * return value of [nil frame] is not neccesarily reliable.
+ * This method will return NSZeroRect if no screen is found.
+ */
++ (NSRect)rectOfScreenAtPoint:(NSPoint)p;
+
+@end
diff --git a/Source/SPScreenAdditions.m b/Source/SPScreenAdditions.m
new file mode 100644
index 00000000..edac0d68
--- /dev/null
+++ b/Source/SPScreenAdditions.m
@@ -0,0 +1,54 @@
+//
+// SPScreenAdditions.m
+// sequel-pro
+//
+// Created by Max Lohrmann on 09.11.15.
+// Copyright (c) 2015 Max Lohrmann. All rights reserved.
+//
+// Permission is hereby granted, free of charge, to any person
+// obtaining a copy of this software and associated documentation
+// files (the "Software"), to deal in the Software without
+// restriction, including without limitation the rights to use,
+// copy, modify, merge, publish, distribute, sublicense, and/or sell
+// copies of the Software, and to permit persons to whom the
+// Software is furnished to do so, subject to the following
+// conditions:
+//
+// The above copyright notice and this permission notice shall be
+// included in all copies or substantial portions of the Software.
+//
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+// HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+// WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+// OTHER DEALINGS IN THE SOFTWARE.
+//
+// More info at <https://github.com/sequelpro/sequelpro>
+
+#import "SPScreenAdditions.h"
+
+@implementation NSScreen (SPScreenAdditions)
+
++ (NSScreen *)screenAtPoint:(NSPoint)p
+{
+ for(NSScreen* candidate in [NSScreen screens])
+ {
+ NSRect cf = [candidate frame];
+ if(NSPointInRect(p,cf)) {
+ return candidate;
+ }
+ }
+ return nil;
+}
+
++ (NSRect)rectOfScreenAtPoint:(NSPoint)p
+{
+ NSScreen *s = [NSScreen screenAtPoint:p];
+
+ return (s? [s frame] : NSZeroRect);
+}
+
+@end
diff --git a/Source/SPTableStructure.h b/Source/SPTableStructure.h
index 781717f8..c8b0ec0a 100644
--- a/Source/SPTableStructure.h
+++ b/Source/SPTableStructure.h
@@ -41,6 +41,18 @@
@class SPExtendedTableInfo;
@class SPTableInfo;
+@interface SPFieldTypeHelp : NSObject {
+ NSString *typeName;
+ NSString *typeDefinition;
+ NSString *typeRange;
+ NSString *typeDescription;
+}
+@property(readonly) NSString *typeName;
+@property(readonly) NSString *typeDefinition;
+@property(readonly) NSString *typeRange;
+@property(readonly) NSString *typeDescription;
+@end
+
@interface SPTableStructure : NSObject
#ifdef SP_CODA
<NSTableViewDelegate, NSTableViewDataSource, NSComboBoxCellDataSource>
@@ -55,7 +67,10 @@
#endif
IBOutlet SPIndexesController *indexesController;
IBOutlet SPDatabaseData *databaseDataInstance;
-
+
+ IBOutlet NSPanel *structureHelpPanel;
+ IBOutlet NSTextView *structureHelpText;
+
#ifndef SP_CODA /* ivars */
IBOutlet id keySheet;
IBOutlet id resetAutoIncrementSheet;
@@ -158,4 +173,6 @@
// Split view interaction
- (IBAction)unhideIndexesView:(id)sender;
++ (SPFieldTypeHelp *)helpForFieldType:(NSString *)typeName;
+
@end
diff --git a/Source/SPTableStructure.m b/Source/SPTableStructure.m
index d242ae88..81d0c531 100644
--- a/Source/SPTableStructure.m
+++ b/Source/SPTableStructure.m
@@ -53,6 +53,42 @@
static NSString *SPRemoveField = @"SPRemoveField";
static NSString *SPRemoveFieldAndForeignKey = @"SPRemoveFieldAndForeignKey";
+@interface SPFieldTypeHelp ()
+@property(copy,readwrite) NSString *typeName;
+@property(copy,readwrite) NSString *typeDefinition;
+@property(copy,readwrite) NSString *typeRange;
+@property(copy,readwrite) NSString *typeDescription;
+@end
+
+@implementation SPFieldTypeHelp
+
+@synthesize typeName;
+@synthesize typeDefinition;
+@synthesize typeRange;
+@synthesize typeDescription;
+
+- (void)dealloc
+{
+ [self setTypeName:nil];
+ [self setTypeDefinition:nil];
+ [self setTypeRange:nil];
+ [self setTypeDescription:nil];
+ [super dealloc];
+}
+
+@end
+
+static inline SPFieldTypeHelp *MakeFieldTypeHelp(NSString *typeName,NSString *typeDefinition,NSString *typeRange,NSString *typeDescription) {
+ SPFieldTypeHelp *obj = [[SPFieldTypeHelp alloc] init];
+
+ [obj setTypeName: typeName];
+ [obj setTypeDefinition: typeDefinition];
+ [obj setTypeRange: typeRange];
+ [obj setTypeDescription:typeDescription];
+
+ return [obj autorelease];
+}
+
@interface SPTableStructure (PrivateAPI)
- (void)_removeFieldAndForeignKey:(NSNumber *)removeForeignKey;
@@ -1495,4 +1531,296 @@ static NSString *SPRemoveFieldAndForeignKey = @"SPRemoveFieldAndForeignKey";
[super dealloc];
}
++ (SPFieldTypeHelp *)helpForFieldType:(NSString *)typeName
+{
+ static dispatch_once_t token;
+ static NSArray *list;
+ dispatch_once(&token, ^{
+ // NSString *FN(NSNumber *): format a number using the user locale (to make large numbers more legible)
+#define FN(x) [NSNumberFormatter localizedStringFromNumber:x numberStyle:NSNumberFormatterDecimalStyle]
+ NSString *intRangeTpl = NSLocalizedString(@"Signed: %@ to %@\nUnsigned: %@ to %@",@"range of integer types");
+ // NSString *INTR(NSNumber *sMin, NSNumber *sMax, NSNumber *uMin, NSNumber *uMax): return formatted string for integer types (signed min/max, unsigned min/max)
+#define INTR(sMin,sMax,uMin,uMax) [NSString stringWithFormat:intRangeTpl,FN(sMin),FN(sMax),FN(uMin),FN(uMax)]
+ list = [@[
+ MakeFieldTypeHelp(
+ SPMySQLTinyIntType,
+ @"TINYINT[(M)] [UNSIGNED] [ZEROFILL]",
+ INTR(@(-128),@127,@0,@255),
+ NSLocalizedString(@"The smallest integer type, requires 1 byte storage space. M is the optional display width and does not affect the possible value range.",@"description of tinyint")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLSmallIntType,
+ @"SMALLINT[(M)] [UNSIGNED] [ZEROFILL]",
+ INTR(@(-32768), @32767, @0, @65535),
+ NSLocalizedString(@"Requires 2 bytes storage space. M is the optional display width and does not affect the possible value range.",@"description of smallint")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLMediumIntType,
+ @"MEDIUMINT[(M)] [UNSIGNED] [ZEROFILL]",
+ INTR(@(-8388608), @8388607, @0, @16777215),
+ NSLocalizedString(@"Requires 3 bytes storage space. M is the optional display width and does not affect the possible value range.",@"description of mediumint")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLIntType,
+ @"INT[(M)] [UNSIGNED] [ZEROFILL]",
+ INTR(@(-2147483648), @2147483647, @0, @4294967295),
+ NSLocalizedString(@"Requires 4 bytes storage space. M is the optional display width and does not affect the possible value range. INTEGER is an alias to this type.",@"description of int")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLBigIntType,
+ @"BIGINT[(M)] [UNSIGNED] [ZEROFILL]",
+ INTR([NSDecimalNumber decimalNumberWithString:@"-9223372036854775808"], [NSDecimalNumber decimalNumberWithString:@"9223372036854775807"], @0, [NSDecimalNumber decimalNumberWithString:@"18446744073709551615"]),
+ NSLocalizedString(@"Requires 8 bytes storage space. M is the optional display width and does not affect the possible value range. Note: Arithmetic operations might fail for large numbers.",@"description of bigint")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLFloatType,
+ @"FLOAT[(M,D)] [UNSIGNED] [ZEROFILL]",
+ NSLocalizedString(@"Accurate to approx. 7 decimal places", @"range of float"),
+ NSLocalizedString(@"IEEE 754 single-precision floating-point value. M is the maxium number of digits, of which D may be after the decimal point. Note: Many decimal numbers can only be approximated by floating-point values. See DECIMAL if you require exact results.",@"description of float")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLDoubleType,
+ @"DOUBLE[(M,D)] [UNSIGNED] [ZEROFILL]",
+ NSLocalizedString(@"Accurate to approx. 15 decimal places", @"range of double"),
+ NSLocalizedString(@"IEEE 754 double-precision floating-point value. M is the maxium number of digits, of which D may be after the decimal point. Note: Many decimal numbers can only be approximated by floating-point values. See DECIMAL if you require exact results.",@"description of double")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLDoublePrecisionType,
+ @"DOUBLE PRECISION[(M,D)] [UNSIGNED] [ZEROFILL]",
+ @"",
+ NSLocalizedString(@"This is an alias for DOUBLE.",@"description of double precision")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLRealType,
+ @"REAL[(M,D)] [UNSIGNED] [ZEROFILL]",
+ @"",
+ NSLocalizedString(@"This is an alias for DOUBLE, unless REAL_AS_FLOAT is configured.",@"description of double real")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLDecimalType,
+ @"DECIMAL[(M[,D])] [UNSIGNED] [ZEROFILL]",
+ NSLocalizedString(@"M (precision): Up to 65 digits\nD (scale): 0 to 30 digits", @"range of decimal"),
+ NSLocalizedString(@"A fixed-point, exact decimal value. M is the maxium number of digits, of which D may be after the decimal point. When rounding, 0-4 is always rounded down, 5-9 up (“round towards nearest”).",@"description of decimal")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLSerialType,
+ @"SERIAL",
+ [NSString stringWithFormat:NSLocalizedString(@"Range: %@ to %@", @"range for serial type"),FN(@0),FN([NSDecimalNumber decimalNumberWithString:@"18446744073709551615"])],
+ NSLocalizedString(@"This is an alias for BIGINT UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE.",@"description of serial")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLBitType,
+ @"BIT[(M)]",
+ NSLocalizedString(@"M: 1 (default) to 64", @"range for bit type"),
+ NSLocalizedString(@"A bit-field type. M specifies the number of bits. If shorter values are inserted, they will be aligned on the least significant bit. See the SET type if you want to explicitly name each bit.",@"description of bit")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLBoolType,
+ @"BOOL",
+ @"",
+ NSLocalizedString(@"This is an alias for TINYINT(1).",@"description of bool")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLBoolean,
+ @"BOOLEAN",
+ @"",
+ NSLocalizedString(@"This is an alias for TINYINT(1).",@"description of boolean")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLDecType,
+ @"DEC[(M[,D])] [UNSIGNED] [ZEROFILL]",
+ @"",
+ NSLocalizedString(@"This is an alias for DECIMAL.",@"description of dec")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLFixedType,
+ @"FIXED[(M[,D])] [UNSIGNED] [ZEROFILL]",
+ @"",
+ NSLocalizedString(@"This is an alias for DECIMAL.",@"description of fixed")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLNumericType,
+ @"NUMERIC[(M[,D])] [UNSIGNED] [ZEROFILL]",
+ @"",
+ NSLocalizedString(@"This is an alias for DECIMAL.",@"description of numeric")
+ ),
+ // ----------------------------------------------------------------------------------
+ MakeFieldTypeHelp(
+ SPMySQLCharType,
+ @"CHAR(M)",
+ NSLocalizedString(@"M: 0 to 255 characters", @"range for char type"),
+ NSLocalizedString(@"A character string that will require M×w bytes per row, independent of the actual content length. w is the maximum number of bytes a single character can occupy in the given encoding.",@"description of char")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLVarCharType,
+ @"VARCHAR(M)",
+ [NSString stringWithFormat:NSLocalizedString(@"M: %@ to %@ characters", @"range for varchar type"),FN(@0),FN(@(65535))],
+ NSLocalizedString(@"A character string that can store up to M bytes, but requires less space for shorter values. The actual number of characters is further limited by the used encoding and the values of other fields in the row.",@"description of varchar")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLTinyTextType,
+ @"TINYTEXT",
+ NSLocalizedString(@"Up to 255 characters", @"range for tinytext type"),
+ NSLocalizedString(@"A character string that can store up to 255 bytes, but requires less space for shorter values. The actual number of characters is further limited by the used encoding. Unlike VARCHAR this type does not count towards the maximum row length.",@"description of tinytext")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLTextType,
+ @"TEXT[(M)]",
+ [NSString stringWithFormat:NSLocalizedString(@"M: %@ to %@ characters", @"range for text type"),FN(@0),FN(@(65535))],
+ NSLocalizedString(@"A character string that can store up to M bytes, but requires less space for shorter values. The actual number of characters is further limited by the used encoding. Unlike VARCHAR this type does not count towards the maximum row length.",@"description of text")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLMediumTextType,
+ @"MEDIUMTEXT",
+ [NSString stringWithFormat:NSLocalizedString(@"Up to %@ characters (16 MiB)", @"range for mediumtext type"),FN(@16777215)],
+ NSLocalizedString(@"A character string with variable length. The actual number of characters is further limited by the used encoding. Unlike VARCHAR this type does not count towards the maximum row length.",@"description of mediumtext")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLLongTextType,
+ @"LONGTEXT",
+ [NSString stringWithFormat:NSLocalizedString(@"M: %@ to %@ characters (4 GiB)", @"range for longtext type"),FN(@0),FN(@4294967295)],
+ NSLocalizedString(@"A character string with variable length. The actual number of characters is further limited by the used encoding. Unlike VARCHAR this type does not count towards the maximum row length.",@"description of longtext")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLTinyBlobType,
+ @"TINYBLOB",
+ NSLocalizedString(@"Up to 255 bytes", @"range for tinyblob type"),
+ NSLocalizedString(@"A byte array with variable length. Unlike VARBINARY this type does not count towards the maximum row length.",@"description of tinyblob")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLMediumBlobType,
+ @"MEDIUMBLOB",
+ [NSString stringWithFormat:NSLocalizedString(@"Up to %@ bytes (16 MiB)", @"range for mediumblob type"),FN(@16777215)],
+ NSLocalizedString(@"A byte array with variable length. Unlike VARBINARY this type does not count towards the maximum row length.",@"description of mediumblob")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLBlobType,
+ @"BLOB[(M)]",
+ [NSString stringWithFormat:NSLocalizedString(@"M: %@ to %@ bytes", @"range for blob type"),FN(@0),FN(@65535)],
+ NSLocalizedString(@"A byte array with variable length. Unlike VARBINARY this type does not count towards the maximum row length.",@"description of blob")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLLongBlobType,
+ @"LONGBLOB",
+ [NSString stringWithFormat:NSLocalizedString(@"Up to %@ bytes (4 GiB)", @"range for longblob type"),FN(@4294967295)],
+ NSLocalizedString(@"A byte array with variable length. Unlike VARBINARY this type does not count towards the maximum row length.",@"description of longblob")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLBinaryType,
+ @"BINARY(M)",
+ NSLocalizedString(@"M: 0 to 255 bytes", @"range for binary type"),
+ NSLocalizedString(@"A byte array with fixed length. Shorter values will always be padded to the right with 0x00 until they fit M.",@"description of binary")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLVarBinaryType,
+ @"VARBINARY(M)",
+ [NSString stringWithFormat:NSLocalizedString(@"M: %@ to %@ bytes", @"range for varbinary type"),FN(@0),FN(@(65535))],
+ NSLocalizedString(@"A byte array with variable length. The actual number of bytes is further limited by the values of other fields in the row.",@"description of varbinary")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLEnumType,
+ @"ENUM('member',...)",
+ [NSString stringWithFormat:NSLocalizedString(@"Up to %@ distinct members (<%@ in practice)\n1-2 bytes storage", @"range for enum type"),FN(@(65535)),FN(@3000)],
+ NSLocalizedString(@"Defines a list of members, of which every field can use at most one. Values are sorted by their index number (starting at 0 for the first member).",@"description of enum")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLSetType,
+ @"SET('member',...)",
+ NSLocalizedString(@"Range: 1 to 64 members\n1, 2, 3, 4 or 8 bytes storage", @"range for set type"),
+ NSLocalizedString(@"A SET can define up to 64 members (as strings) of which a field can use one or more using a comma-separated list. Upon insertion the order of members is automatically normalized and duplicate members will be eliminated. Assignment of numbers is supported using the same semantics as for BIT types.",@"description of set")
+ ),
+ // --------------------------------------------------------------------------
+ MakeFieldTypeHelp(
+ SPMySQLDateType,
+ @"DATE",
+ NSLocalizedString(@"Range: 1000-01-01 to 9999-12-31", @"range for date type"),
+ NSLocalizedString(@"Stores a date without time information. The representation is YYYY-MM-DD. Invalid values are converted to 0000-00-00.",@"description of date")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLDatetimeType,
+ @"DATETIME[(F)]",
+ NSLocalizedString(@"Range: 1000-01-01 00:00:00.0 to 9999-12-31 23:59:59.999999\nF (precision): 0 (1s) to 6 (1µs)", @"range for datetime type"),
+ NSLocalizedString(@"Stores a date and time of day. The representation is YYYY-MM-DD HH:MM:SS[.I*], I being fractional seconds. Invalid values are converted to 0000-00-00 00:00:00.0. Fractional seconds were added in MySQL 5.6.4 with a precision down to microseconds (6), specified by F.",@"description of datetime")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLTimestampType,
+ @"TIMETSTAMP[(F)]",
+ NSLocalizedString(@"Range: 1970-01-01 00:00:01.0 to 2038-01-19 03:14:07.999999\nF (precision): 0 (1s) to 6 (1µs)", @"range for timestamp type"),
+ NSLocalizedString(@"Stores a date and time of day as seconds since the beginning of the UNIX epoch (1970-01-01 00:00:00). The representation is the same as for DATETIME. Invalid values, as well as \"second zero\", are converted to 0000-00-00 00:00:00.0. Fractional seconds were added in MySQL 5.6.4 with a precision down to microseconds (6), specified by F. Some additional rules may apply.",@"description of timestamp")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLTimeType,
+ @"TIME[(F)]",
+ NSLocalizedString(@"Range: -838:59:59.0 to 838:59:59.0\nF (precision): 0 (1s) to 6 (1µs)", @"range for time type"),
+ NSLocalizedString(@"Stores a time of day, duration or time interval. The representation is HH:MM:SS[.I*], I being fractional seconds.Invalid values are converted to 00:00:00. Fractional seconds were added in MySQL 5.6.4 with a precision down to microseconds (6), specified by F.",@"description of time")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLYearType,
+ @"YEAR(4)",
+ NSLocalizedString(@"Range: 0000, 1901 to 2155", @"range for year type"),
+ NSLocalizedString(@"Represents a 4 digit year value, stored as 1 byte. Invalid values are converted to 0000 and two digit values 0 to 69 will be converted to years 2000 to 2069, resp. 70 to 99 to years 1970 to 1999.\nThe YEAR(2) type was removed in MySQL 5.7.5.",@"description of year")
+ ),
+ // --------------------------------------------------------------------------
+ MakeFieldTypeHelp(
+ SPMySQLGeometryType,
+ @"GEOMETRY",
+ @"",
+ NSLocalizedString(@"Can store a single spatial value of types POINT, LINESTRING or POLYGON. Spatial support in MySQL is based on the OpenGIS Geometry Model.",@"description of geometry")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLPointType,
+ @"POINT",
+ @"",
+ NSLocalizedString(@"Represents a single location in coordinate space using X and Y coordinates. The point is zero-dimensional.",@"description of point")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLLineStringType,
+ @"LINESTRING",
+ @"",
+ NSLocalizedString(@"Represents an ordered set of coordinates where each consecutive pair of two points is connected by a straight line.",@"description of linestring")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLPolygonType,
+ @"POLYGON",
+ @"",
+ NSLocalizedString(@"Creates a surface by combining one LinearRing (ie. a LineString that is closed and simple) as the outside boundary with zero or more inner LinearRings acting as \"holes\".",@"description of polygon")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLMultiPointType,
+ @"MULTIPOINT",
+ @"",
+ NSLocalizedString(@"Represents a set of Points without specifying any kind of relation and/or order between them.",@"description of multipoint")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLMultiLineStringType,
+ @"MULTILINESTRING",
+ @"",
+ NSLocalizedString(@"Represents a collection of LineStrings.",@"description of multilinestring")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLMultiPolygonType,
+ @"MULTIPOLYGON",
+ @"",
+ NSLocalizedString(@"Represents a collection of Polygons. The Polygons making up the MultiPolygon must not intersect.",@"description of multipolygon")
+ ),
+ MakeFieldTypeHelp(
+ SPMySQLGeometryCollectionType,
+ @"GEOMETRYCOLLECTION",
+ @"",
+ NSLocalizedString(@"Represents a collection of objects of any other single- or multi-valued spatial type. The only restriction being, that all objects must share a common coordinate system.",@"description of geometrycollection")
+ ),
+ ] retain];
+#undef FN
+#undef INTR
+ });
+
+ for (SPFieldTypeHelp *item in list) {
+ if ([[item typeName] isEqualToString:typeName]) {
+ return item;
+ }
+ }
+
+ return nil;
+}
+
@end
diff --git a/Source/SPTableStructureDelegate.m b/Source/SPTableStructureDelegate.m
index 6b2249dc..45ec320d 100644
--- a/Source/SPTableStructureDelegate.m
+++ b/Source/SPTableStructureDelegate.m
@@ -40,6 +40,7 @@
#import "SPTablesList.h"
#import "SPPillAttachmentCell.h"
#import "SPIdMenu.h"
+#import "SPComboBoxCell.h"
#import <SPMySQL/SPMySQL.h>
@@ -65,6 +66,8 @@ static void _BuildMenuWithPills(NSMenu *menu,struct _cmpMap *map,size_t mapEntri
- (void)sheetDidEnd:(id)sheet returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo;
- (NSString *)_buildPartialColumnDefinitionString:(NSDictionary *)theRow;
+- (void)_displayFieldTypeHelpIfPossible:(SPComboBoxCell *)cell;
+
@end
@implementation SPTableStructure (SPTableStructureDelegate)
@@ -650,6 +653,105 @@ static void _BuildMenuWithPills(NSMenu *menu,struct _cmpMap *map,size_t mapEntri
return @"";
}
+- (void)comboBoxCell:(SPComboBoxCell *)cell willPopUpWindow:(NSWindow *)win
+{
+ // the selected item in the popup list is independent of the displayed text, we have to explicitly set it, too
+ NSInteger pos = [typeSuggestions indexOfObject:[cell stringValue]];
+ if(pos != NSNotFound) {
+ [cell selectItemAtIndex:pos];
+ }
+
+ //set up the help window to the right position
+ NSRect listFrame = [win frame];
+ NSRect helpFrame = [structureHelpPanel frame];
+ helpFrame.origin.y = listFrame.origin.y;
+ helpFrame.size.height = listFrame.size.height;
+ [structureHelpPanel setFrame:helpFrame display:YES];
+
+ [self _displayFieldTypeHelpIfPossible:cell];
+}
+
+- (void)comboBoxCell:(SPComboBoxCell *)cell willDismissWindow:(NSWindow *)win
+{
+ //hide the window if it is still visible
+ [structureHelpPanel orderOut:nil];
+}
+
+- (void)comboBoxCellSelectionDidChange:(SPComboBoxCell *)cell
+{
+ [self _displayFieldTypeHelpIfPossible:cell];
+}
+
+- (void)_displayFieldTypeHelpIfPossible:(SPComboBoxCell *)cell
+{
+ NSString *selected = [typeSuggestions objectOrNilAtIndex:[cell indexOfSelectedItem]];
+
+ const SPFieldTypeHelp *help = [[self class] helpForFieldType:selected];
+
+ if(help) {
+ NSMutableAttributedString *as = [[NSMutableAttributedString alloc] init];
+
+ //title
+ {
+ NSDictionary *titleAttr = @{NSFontAttributeName: [NSFont boldSystemFontOfSize:[NSFont systemFontSize]]};
+ NSAttributedString *title = [[NSAttributedString alloc] initWithString:[help typeDefinition] attributes:titleAttr];
+ [as appendAttributedString:[title autorelease]];
+ [[as mutableString] appendString:@"\n"];
+ }
+
+ //range
+ if([[help typeRange] length]) {
+ NSDictionary *rangeAttr = @{NSFontAttributeName: [NSFont systemFontOfSize:[NSFont smallSystemFontSize]]};
+ NSAttributedString *range = [[NSAttributedString alloc] initWithString:[help typeRange] attributes:rangeAttr];
+ [as appendAttributedString:[range autorelease]];
+ [[as mutableString] appendString:@"\n"];
+ }
+
+ [[as mutableString] appendString:@"\n"];
+
+ //description
+ {
+ NSDictionary *descAttr = @{NSFontAttributeName: [NSFont systemFontOfSize:[NSFont systemFontSize]]};
+ NSAttributedString *desc = [[NSAttributedString alloc] initWithString:[help typeDescription] attributes:descAttr];
+ [as appendAttributedString:[desc autorelease]];
+ }
+
+ [as addAttribute:NSParagraphStyleAttributeName value:[NSParagraphStyle defaultParagraphStyle] range:NSMakeRange(0, [as length])];
+
+ [[structureHelpText textStorage] setAttributedString:[as autorelease]];
+
+ CGRect rect = [as boundingRectWithSize:CGSizeMake([structureHelpText frame].size.width-2, CGFLOAT_MAX) options:NSStringDrawingUsesFontLeading|NSStringDrawingUsesLineFragmentOrigin];
+
+ NSRect winRect = [structureHelpPanel frame];
+
+ CGFloat winAddonSize = (winRect.size.height - [[structureHelpPanel contentView] frame].size.height) + (6*2);
+
+ NSRect popUpFrame = [[cell spPopUpWindow] frame];
+
+ //determine the side on which to add our window based on the space left on screen
+ NSPoint topRightCorner = NSMakePoint(popUpFrame.origin.x, NSMaxY(popUpFrame));
+ NSRect screenRect = [NSScreen rectOfScreenAtPoint:topRightCorner];
+
+ if(NSMaxX(popUpFrame)+10+winRect.size.width > NSMaxX(screenRect)-10) {
+ // exceeds right border, display on the left
+ winRect.origin.x = popUpFrame.origin.x - 10 - winRect.size.width;
+ }
+ else {
+ // display on the right
+ winRect.origin.x = NSMaxX(popUpFrame)+10;
+ }
+
+ winRect.size.height = rect.size.height + winAddonSize;
+ winRect.origin.y = NSMaxY(popUpFrame) - winRect.size.height;
+ [structureHelpPanel setFrame:winRect display:YES];
+
+ [structureHelpPanel orderFront:nil];
+ }
+ else {
+ [structureHelpPanel orderOut:nil];
+ }
+}
+
#pragma mark -
#pragma mark Menu delegate methods (encoding/collation dropdown menu)
diff --git a/Source/SPTooltip.m b/Source/SPTooltip.m
index eefa7520..54a997f6 100644
--- a/Source/SPTooltip.m
+++ b/Source/SPTooltip.m
@@ -317,16 +317,7 @@ static CGFloat slow_in_out (CGFloat t)
NSPoint pos = NSMakePoint([self frame].origin.x, [self frame].origin.y + [self frame].size.height);
// Find the screen which we are displaying on
- NSRect screenFrame = [[NSScreen mainScreen] frame];
- NSScreen* candidate;
- for(candidate in [NSScreen screens])
- {
- NSRect cf = [candidate frame];
- if(NSPointInRect(pos,cf)) {
- screenFrame = cf;
- break;
- }
- }
+ NSRect screenFrame = [NSScreen rectOfScreenAtPoint:pos];
// is contentView a webView calculate actual rendered size via JavaScript
if([[[[self contentView] class] description] isEqualToString:@"WebView"]) {
diff --git a/sequel-pro.xcodeproj/project.pbxproj b/sequel-pro.xcodeproj/project.pbxproj
index 7abb7567..143aa9dd 100644
--- a/sequel-pro.xcodeproj/project.pbxproj
+++ b/sequel-pro.xcodeproj/project.pbxproj
@@ -179,6 +179,8 @@
4DECC3370EC2A170008D359E /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4DECC3340EC2A170008D359E /* Growl.framework */; };
4DECC48F0EC2B436008D359E /* Sparkle.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 4DECC3320EC2A170008D359E /* Sparkle.framework */; };
4DECC4910EC2B436008D359E /* Growl.framework in Copy Frameworks */ = {isa = PBXBuildFile; fileRef = 4DECC3340EC2A170008D359E /* Growl.framework */; };
+ 500DA4B71BEFF877000773FE /* SPComboBoxCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 500DA4B61BEFF877000773FE /* SPComboBoxCell.m */; };
+ 500DA4BC1BF0CD57000773FE /* SPScreenAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 500DA4BB1BF0CD57000773FE /* SPScreenAdditions.m */; };
501B1D181728A3DA0017C92E /* SPCharsetCollationHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 501B1D171728A3DA0017C92E /* SPCharsetCollationHelper.m */; };
502D21F61BA50710000D4CE7 /* SPDataAdditionsTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 502D21F51BA50710000D4CE7 /* SPDataAdditionsTests.m */; };
502D21F81BA50966000D4CE7 /* SPDataAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = BC2C16D30FEBEDF10003993B /* SPDataAdditions.m */; };
@@ -903,6 +905,10 @@
4D90B7A1101E0D1500D116A1 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/UserManagerView.xib; sourceTree = "<group>"; };
4DECC3320EC2A170008D359E /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Frameworks/Sparkle.framework; sourceTree = "<group>"; };
4DECC3340EC2A170008D359E /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = Frameworks/Growl.framework; sourceTree = "<group>"; };
+ 500DA4B51BEFF877000773FE /* SPComboBoxCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPComboBoxCell.h; sourceTree = "<group>"; };
+ 500DA4B61BEFF877000773FE /* SPComboBoxCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPComboBoxCell.m; sourceTree = "<group>"; };
+ 500DA4BA1BF0CD57000773FE /* SPScreenAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPScreenAdditions.h; sourceTree = "<group>"; };
+ 500DA4BB1BF0CD57000773FE /* SPScreenAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPScreenAdditions.m; sourceTree = "<group>"; };
501B1D161728A3DA0017C92E /* SPCharsetCollationHelper.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SPCharsetCollationHelper.h; sourceTree = "<group>"; };
501B1D171728A3DA0017C92E /* SPCharsetCollationHelper.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPCharsetCollationHelper.m; sourceTree = "<group>"; };
502D21F51BA50710000D4CE7 /* SPDataAdditionsTests.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SPDataAdditionsTests.m; sourceTree = "<group>"; };
@@ -1449,6 +1455,8 @@
BC5750D312A6233900911BA2 /* SPActivityTextFieldCell.m */,
1A56463D14569A0B56EE8BAC /* SPPillAttachmentCell.m */,
1A564C0C0FFB444D2E5CA447 /* SPPillAttachmentCell.h */,
+ 500DA4B51BEFF877000773FE /* SPComboBoxCell.h */,
+ 500DA4B61BEFF877000773FE /* SPComboBoxCell.m */,
);
name = Cells;
sourceTree = "<group>";
@@ -2641,6 +2649,8 @@
1798F19715501838004B0AB8 /* SPMutableArrayAdditions.m */,
584D899B15162CBE00F24774 /* SPDataBase64EncodingAdditions.h */,
584D899C15162CBE00F24774 /* SPDataBase64EncodingAdditions.m */,
+ 500DA4BA1BF0CD57000773FE /* SPScreenAdditions.h */,
+ 500DA4BB1BF0CD57000773FE /* SPScreenAdditions.m */,
);
name = "Category Additions";
sourceTree = "<group>";
@@ -3304,6 +3314,7 @@
1785EB60127DD5A800F468C8 /* SPNotificationsPreferencePane.m in Sources */,
1785EB63127DD5DE00F468C8 /* SPAutoUpdatePreferencePane.m in Sources */,
1785EB66127DD5EA00F468C8 /* SPNetworkPreferencePane.m in Sources */,
+ 500DA4B71BEFF877000773FE /* SPComboBoxCell.m in Sources */,
1785EB6A127DD79300F468C8 /* SPEditorPreferencePane.m in Sources */,
17FDB04C1280778B00DBBBC2 /* SPFontPreviewTextField.m in Sources */,
17D3DC201281816E002A163A /* SPDatabaseViewController.m in Sources */,
@@ -3323,6 +3334,7 @@
583CA21512EC8B2200C9E763 /* SPWindow.m in Sources */,
582F02311370B52600B30621 /* SPExportFileNameTokenObject.m in Sources */,
1713C740140D8AEF00CFD461 /* SPQueryDocumentsController.m in Sources */,
+ 500DA4BC1BF0CD57000773FE /* SPScreenAdditions.m in Sources */,
1713C75F140D8D5900CFD461 /* SPQueryConsoleDataSource.m in Sources */,
17902612141025BB005F677F /* SPQueryControllerInitializer.m in Sources */,
584D878B15140FEB00F24774 /* SPObjectAdditions.m in Sources */,
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-02 14:06:13 +0000