diff options
| author | Bibiko <bibiko@eva.mpg.de> | 2010-03-05 15:42:28 +0000 |
|---|---|---|
| committer | Bibiko <bibiko@eva.mpg.de> | 2010-03-05 15:42:28 +0000 |
| commit | 666b48284293e8555b4604745a7abdcf5e01b22a (patch) | |
| tree | 1e243e13e45025adb7f6b3a6a06f381a778b9893 | |
| parent | d63dff9e7b9f88799b5fa753c8a3510404aa17b8 (diff) | |
| download | sequelpro-666b48284293e8555b4604745a7abdcf5e01b22a.tar.gz sequelpro-666b48284293e8555b4604745a7abdcf5e01b22a.tar.bz2 sequelpro-666b48284293e8555b4604745a7abdcf5e01b22a.zip | |
• CSV Import Field Mapper
- removed Advanced sheet, instead resize the main sheet and display these settings in it
- added advanced options LOW/HIGH_PRIORITY
- improved logic for adv. settings, disabling UPDATE if target table has less than 2 fields, etc.
- fixed URL for displaying the source file name
- removed Help text since it's too large - should be go to the general help
• CMTextView
- fixed bug if ESC Completion is invoked if caret position is 0
• fixed document URL handling to come up with the correct icons etc.
| -rw-r--r-- | Interfaces/English.lproj/DataMigrationDialog.xib | 1819 | ||||
| -rw-r--r-- | Source/CMTextView.m | 2 | ||||
| -rw-r--r-- | Source/SPFieldMapperController.h | 26 | ||||
| -rw-r--r-- | Source/SPFieldMapperController.m | 246 | ||||
| -rw-r--r-- | Source/SPQueryController.m | 2 | ||||
| -rw-r--r-- | Source/TableDocument.m | 33 | ||||
| -rw-r--r-- | Source/TableDump.m | 3 |
7 files changed, 1221 insertions, 910 deletions
diff --git a/Interfaces/English.lproj/DataMigrationDialog.xib b/Interfaces/English.lproj/DataMigrationDialog.xib index 2b2aaa35..55b85020 100644 --- a/Interfaces/English.lproj/DataMigrationDialog.xib +++ b/Interfaces/English.lproj/DataMigrationDialog.xib @@ -12,9 +12,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="12"/> - <integer value="161"/> - <integer value="225"/> + <integer value="11"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -43,20 +41,69 @@ <object class="NSWindowTemplate" id="420604405"> <int key="NSWindowStyleMask">15</int> <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{262, 345}, {522, 418}}</string> + <string key="NSWindowRect">{{366, 230}, {522, 348}}</string> <int key="NSWTFlags">1886912512</int> <string key="NSWindowTitle">CSV Field Mapping</string> <string key="NSWindowClass">NSWindow</string> <object class="NSMutableString" key="NSViewClass"> <characters key="NS.bytes">View</characters> </object> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> - <string key="NSWindowContentMinSize">{522, 418}</string> + <string key="NSWindowContentMaxSize">{10000, 500}</string> + <string key="NSWindowContentMinSize">{522, 348}</string> <object class="NSView" key="NSWindowView" id="78582513"> <reference key="NSNextResponder"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSBox" id="412235166"> + <reference key="NSNextResponder" ref="78582513"/> + <int key="NSvFlags">34</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSView" id="196610401"> + <reference key="NSNextResponder" ref="412235166"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{1, 2.5}, {544, 0}}</string> + <reference key="NSSuperview" ref="412235166"/> + </object> + </object> + <string key="NSFrame">{{-12, 53}, {546, 2}}</string> + <string key="NSBounds">{{0, 1.5}, {546, 0}}</string> + <reference key="NSSuperview" ref="78582513"/> + <string key="NSOffsets">{0, 0}</string> + <object class="NSTextFieldCell" key="NSTitleCell"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">0</int> + <string key="NSContents">Box</string> + <object class="NSFont" key="NSSupport" id="26"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">11</double> + <int key="NSfFlags">3100</int> + </object> + <object class="NSColor" key="NSBackgroundColor" id="105487286"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">textBackgroundColor</string> + <object class="NSColor" key="NSColor" id="746040121"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MQA</bytes> + </object> + </object> + <object class="NSColor" key="NSTextColor"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes> + </object> + </object> + <reference key="NSContentView" ref="196610401"/> + <int key="NSBorderType">1</int> + <int key="NSBoxType">4</int> + <int key="NSTitlePosition">0</int> + <bool key="NSTransparent">NO</bool> + <object class="NSColor" key="NSFillColor2"> + <int key="NSColorSpace">3</int> + <bytes key="NSWhite">MC45MzAwMDAwMDcyAA</bytes> + </object> + </object> <object class="NSBox" id="617902336"> <reference key="NSNextResponder" ref="78582513"/> <int key="NSvFlags">10</int> @@ -108,27 +155,15 @@ <reference key="NSSuperview" ref="617902336"/> </object> </object> - <string key="NSFrame">{{-1, 378}, {524, 41}}</string> + <string key="NSFrame">{{-1, 308}, {524, 41}}</string> <reference key="NSSuperview" ref="78582513"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> <int key="NSCellFlags2">0</int> <string key="NSContents">Box</string> - <object class="NSFont" key="NSSupport" id="26"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">11</double> - <int key="NSfFlags">3100</int> - </object> - <object class="NSColor" key="NSBackgroundColor" id="105487286"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">textBackgroundColor</string> - <object class="NSColor" key="NSColor" id="746040121"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MQA</bytes> - </object> - </object> + <reference key="NSSupport" ref="26"/> + <reference key="NSBackgroundColor" ref="105487286"/> <object class="NSColor" key="NSTextColor"> <int key="NSColorSpace">3</int> <bytes key="NSWhite">MCAwLjgwMDAwMDAxMTkAA</bytes> @@ -156,7 +191,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTableView" id="678921094"> <reference key="NSNextResponder" ref="929465390"/> - <int key="NSvFlags">256</int> + <int key="NSvFlags">288</int> <string key="NSFrameSize">{522, 126}</string> <reference key="NSSuperview" ref="929465390"/> <bool key="NSEnabled">YES</bool> @@ -177,7 +212,7 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTableColumn" id="790992768"> <string key="NSIdentifier">import_value</string> - <double key="NSWidth">231</double> + <double key="NSWidth">121</double> <double key="NSMinWidth">15</double> <double key="NSMaxWidth">1000</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> @@ -199,7 +234,11 @@ <object class="NSPopUpButtonCell" key="NSDataCell" id="130736119"> <int key="NSCellFlags">-2076049856</int> <int key="NSCellFlags2">133120</int> - <reference key="NSSupport" ref="26"/> + <object class="NSFont" key="NSSupport" id="219022499"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">11</double> + <int key="NSfFlags">16</int> + </object> <reference key="NSControlView" ref="678921094"/> <int key="NSButtonFlags">100679935</int> <int key="NSButtonFlags2">129</int> @@ -260,7 +299,7 @@ <object class="NSPopUpButtonCell" key="NSDataCell" id="264818313"> <int key="NSCellFlags">-2076049856</int> <int key="NSCellFlags2">134219776</int> - <reference key="NSSupport" ref="388072550"/> + <reference key="NSSupport" ref="219022499"/> <reference key="NSControlView" ref="678921094"/> <int key="NSButtonFlags">100679935</int> <int key="NSButtonFlags2">129</int> @@ -298,7 +337,7 @@ </object> <object class="NSTableColumn" id="185178480"> <string key="NSIdentifier">target_field</string> - <double key="NSWidth">113</double> + <double key="NSWidth">166</double> <double key="NSMinWidth">10</double> <double key="NSMaxWidth">3.4028234663852886e+38</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> @@ -317,7 +356,7 @@ <object class="NSPopUpButtonCell" key="NSDataCell" id="201096656"> <int key="NSCellFlags">-2076049856</int> <int key="NSCellFlags2">133120</int> - <reference key="NSSupport" ref="26"/> + <reference key="NSSupport" ref="219022499"/> <reference key="NSControlView" ref="678921094"/> <int key="NSButtonFlags">100679935</int> <int key="NSButtonFlags2">129</int> @@ -358,7 +397,7 @@ </object> <object class="NSTableColumn" id="221439252"> <string key="NSIdentifier">type</string> - <double key="NSWidth">138</double> + <double key="NSWidth">195</double> <double key="NSMinWidth">10</double> <double key="NSMaxWidth">3.4028234663852886e+38</double> <object class="NSTableHeaderCell" key="NSHeaderCell"> @@ -373,7 +412,7 @@ <int key="NSCellFlags">67239488</int> <int key="NSCellFlags2">272761856</int> <string key="NSContents">Text</string> - <reference key="NSSupport" ref="26"/> + <reference key="NSSupport" ref="219022499"/> <reference key="NSControlView" ref="678921094"/> <reference key="NSBackgroundColor" ref="19028295"/> <reference key="NSTextColor" ref="263116164"/> @@ -466,7 +505,7 @@ </object> <reference ref="20192669"/> </object> - <string key="NSFrame">{{-1, 199}, {524, 144}}</string> + <string key="NSFrame">{{-1, 129}, {524, 144}}</string> <reference key="NSSuperview" ref="78582513"/> <reference key="NSNextKeyView" ref="929465390"/> <int key="NSsFlags">530</int> @@ -480,7 +519,7 @@ <object class="NSButton" id="920273776"> <reference key="NSNextResponder" ref="78582513"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{343, 14}, {82, 32}}</string> + <string key="NSFrame">{{343, 12}, {82, 32}}</string> <reference key="NSSuperview" ref="78582513"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="977848648"> @@ -505,7 +544,7 @@ <object class="NSButton" id="341819846"> <reference key="NSNextResponder" ref="78582513"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{425, 14}, {83, 32}}</string> + <string key="NSFrame">{{425, 12}, {83, 32}}</string> <reference key="NSSuperview" ref="78582513"/> <int key="NSTag">1</int> <bool key="NSEnabled">YES</bool> @@ -538,7 +577,7 @@ <reference key="NSSupport" ref="388072550"/> <reference key="NSControlView" ref="834757891"/> <int key="NSButtonFlags">-2030812929</int> - <int key="NSButtonFlags2">34</int> + <int key="NSButtonFlags2">268435490</int> <object class="NSCustomResource" key="NSNormalImage"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSGoLeftTemplate</string> @@ -564,7 +603,7 @@ <reference key="NSControlView" ref="116285743"/> <int key="NSTag">1</int> <int key="NSButtonFlags">-2030812929</int> - <int key="NSButtonFlags2">34</int> + <int key="NSButtonFlags2">268435490</int> <object class="NSCustomResource" key="NSNormalImage"> <string key="NSClassName">NSImage</string> <string key="NSResourceName">NSGoRightTemplate</string> @@ -578,7 +617,7 @@ <object class="NSTextField" id="186404366"> <reference key="NSNextResponder" ref="78582513"/> <int key="NSvFlags">294</int> - <string key="NSFrame">{{88, 24}, {155, 14}}</string> + <string key="NSFrame">{{88, 23}, {155, 14}}</string> <reference key="NSSuperview" ref="78582513"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="929441265"> @@ -594,7 +633,7 @@ <object class="NSPopUpButton" id="549705971"> <reference key="NSNextResponder" ref="78582513"/> <int key="NSvFlags">267</int> - <string key="NSFrame">{{290, 348}, {215, 22}}</string> + <string key="NSFrame">{{290, 278}, {215, 22}}</string> <reference key="NSSuperview" ref="78582513"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="107647973"> @@ -626,7 +665,7 @@ <object class="NSPopUpButton" id="599385609"> <reference key="NSNextResponder" ref="78582513"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{371, 167}, {102, 22}}</string> + <string key="NSFrame">{{372, 97}, {133, 22}}</string> <reference key="NSSuperview" ref="78582513"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="1033308908"> @@ -690,12 +729,12 @@ <object class="NSTextField" id="228203205"> <reference key="NSNextResponder" ref="78582513"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{272, 172}, {94, 14}}</string> + <string key="NSFrame">{{276, 102}, {94, 14}}</string> <reference key="NSSuperview" ref="78582513"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="869323357"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272761856</int> + <int key="NSCellFlags2">71435264</int> <string key="NSContents">Import Method:</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="228203205"/> @@ -714,12 +753,12 @@ <string>NSFilenamesPboardType</string> </object> </object> - <string key="NSFrame">{{5, 350}, {246, 20}}</string> + <string key="NSFrame">{{5, 280}, {260, 20}}</string> <reference key="NSSuperview" ref="78582513"/> <bool key="NSEnabled">YES</bool> <object class="NSPathCell" key="NSCell" id="183652084"> - <int key="NSCellFlags">69336577</int> - <int key="NSCellFlags2">163840</int> + <int key="NSCellFlags">69336641</int> + <int key="NSCellFlags2">166400</int> <object class="NSURL" key="NSContents"> <nil key="NS.base"/> <string key="NS.relative">file://localhost/Applications/</string> @@ -763,7 +802,7 @@ <object class="NSButton" id="397227507"> <reference key="NSNextResponder" ref="78582513"/> <int key="NSvFlags">292</int> - <string key="NSFrame">{{17, 170}, {188, 18}}</string> + <string key="NSFrame">{{17, 100}, {188, 18}}</string> <reference key="NSSuperview" ref="78582513"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="413696615"> @@ -787,273 +826,10 @@ <int key="NSPeriodicInterval">25</int> </object> </object> - <object class="NSScrollView" id="1053069492"> - <reference key="NSNextResponder" ref="78582513"/> - <int key="NSvFlags">289</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="289958592"> - <reference key="NSNextResponder" ref="1053069492"/> - <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextView" id="989433642"> - <reference key="NSNextResponder" ref="289958592"/> - <int key="NSvFlags">2322</int> - <string key="NSFrameSize">{287, 94}</string> - <reference key="NSSuperview" ref="289958592"/> - <object class="NSTextContainer" key="NSTextContainer" id="588188642"> - <object class="NSLayoutManager" key="NSLayoutManager"> - <object class="NSTextStorage" key="NSTextStorage"> - <object class="NSMutableString" key="NSString"> - <bytes key="NS.bytes">CeKAlQlJbXBvcnQgZmllbGQKCQlJZ25vcmUgZmllbGQKCT0JTWF0Y2ggZmllbGQgY29udGVudAoJSU5T -RVJUCUFkZCBhcyBuZXcgcm93cyBJTlNFUlQgSU5UTyDigKYJUkVQTEFDRQlEZWxldGUgYW5kIHVwZGF0 -ZSBleGlzdGluZyByb3dzIG9yIGFkZCBhcyAKCQluZXcgcm93cyBSRVBMQUNFIElOVE8g4oCmCglVUERB -VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> - </object> - <object class="NSMutableArray" key="NSAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSDictionary"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSFont</string> - <string>NSParagraphStyle</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSFont" id="824850754"> - <string key="NSName">Helvetica</string> - <double key="NSSize">10</double> - <int key="NSfFlags">16</int> - </object> - <object class="NSParagraphStyle" id="878413692"> - <int key="NSAlignment">4</int> - <object class="NSArray" key="NSTabStops"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextTab"> - <int key="NSType">1</int> - <double key="NSLocation">63</double> - </object> - <object class="NSTextTab"> - <double key="NSLocation">70.650001525878906</double> - </object> - </object> - </object> - </object> - </object> - <object class="NSDictionary"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSFont</string> - <string>NSParagraphStyle</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSFont"> - <string key="NSName">LucidaGrande-Bold</string> - <double key="NSSize">11</double> - <int key="NSfFlags">16</int> - </object> - <reference ref="878413692"/> - </object> - </object> - <object class="NSDictionary"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSFont</string> - <string>NSParagraphStyle</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSFont"> - <string key="NSName">Helvetica</string> - <double key="NSSize">11</double> - <int key="NSfFlags">16</int> - </object> - <reference ref="878413692"/> - </object> - </object> - <object class="NSDictionary"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSFont</string> - <string>NSParagraphStyle</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSFont"> - <string key="NSName">Helvetica</string> - <double key="NSSize">12</double> - <int key="NSfFlags">16</int> - </object> - <reference ref="878413692"/> - </object> - </object> - <object class="NSDictionary"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSFont</string> - <string>NSParagraphStyle</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSFont"> - <string key="NSName">Helvetica-Bold</string> - <double key="NSSize">11</double> - <int key="NSfFlags">16</int> - </object> - <reference ref="878413692"/> - </object> - </object> - <object class="NSDictionary"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor</string> - <string>NSFont</string> - <string>NSParagraphStyle</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSColor"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MSAwLjEzMzMzMzM0MDMgMC4xODAzOTIxNjEAA</bytes> - </object> - <reference ref="824850754"/> - <reference ref="878413692"/> - </object> - </object> - </object> - <object class="NSMutableData" key="NSAttributeInfo"> - <bytes key="NS.bytes">AQABAQEADAIBAAIDDgIBAxQCAgAGBAEAGwIDAAcEAQAGBQUANwIDAAcEAQAbAgIAA</bytes> - </object> - <nil key="NSDelegate"/> - </object> - <object class="NSMutableArray" key="NSTextContainers"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="588188642"/> - </object> - <int key="NSLMFlags">6</int> - <nil key="NSDelegate"/> - </object> - <reference key="NSTextView" ref="989433642"/> - <double key="NSWidth">287</double> - <int key="NSTCFlags">1</int> - </object> - <object class="NSTextViewSharedData" key="NSSharedData"> - <int key="NSFlags">2308</int> - <int key="NSTextCheckingTypes">0</int> - <nil key="NSMarkedAttributes"/> - <object class="NSColor" key="NSBackgroundColor"> - <int key="NSColorSpace">3</int> - <bytes key="NSWhite">MC45MDcyNTgwOTM0AA</bytes> - </object> - <object class="NSDictionary" key="NSSelectedAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSBackgroundColor</string> - <string>NSColor</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSColor" id="304176749"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">selectedTextBackgroundColor</string> - <reference key="NSColor" ref="240513327"/> - </object> - <object class="NSColor" id="621386407"> - <int key="NSColorSpace">6</int> - <string key="NSCatalogName">System</string> - <string key="NSColorName">selectedTextColor</string> - <reference key="NSColor" ref="938074100"/> - </object> - </object> - </object> - <reference key="NSInsertionColor" ref="938074100"/> - <object class="NSDictionary" key="NSLinkAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor</string> - <string>NSCursor</string> - <string>NSUnderline</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSColor" id="1062455759"> - <int key="NSColorSpace">1</int> - <bytes key="NSRGB">MCAwIDEAA</bytes> - </object> - <object class="NSCursor" id="646479068"> - <string key="NSHotSpot">{8, -8}</string> - <int key="NSCursorType">13</int> - </object> - <integer value="1"/> - </object> - </object> - <nil key="NSDefaultParagraphStyle"/> - </object> - <int key="NSTVFlags">6</int> - <string key="NSMaxSize">{574, 1e+07}</string> - <string key="NSMinize">{133, 0}</string> - <nil key="NSDelegate"/> - </object> - </object> - <string key="NSFrameSize">{287, 98}</string> - <reference key="NSSuperview" ref="1053069492"/> - <reference key="NSNextKeyView" ref="989433642"/> - <reference key="NSDocView" ref="989433642"/> - <object class="NSColor" key="NSBGColor"> - <int key="NSColorSpace">2</int> - <bytes key="NSRGB">MC45Mjk0MTE4Mjg1IDAuOTI5NDExODI4NSAwLjkyOTQxMTgyODUAA</bytes> - </object> - <object class="NSCursor" key="NSCursor"> - <string key="NSHotSpot">{1, -1}</string> - <int key="NSCursorType">0</int> - </object> - <int key="NScvFlags">6</int> - </object> - <object class="NSScroller" id="98036131"> - <reference key="NSNextResponder" ref="1053069492"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{-100, -100}, {15, 55}}</string> - <reference key="NSSuperview" ref="1053069492"/> - <reference key="NSTarget" ref="1053069492"/> - <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">1</double> - <double key="NSPercent">0.85256409645080566</double> - </object> - <object class="NSScroller" id="958026344"> - <reference key="NSNextResponder" ref="1053069492"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{-100, -100}, {87, 18}}</string> - <reference key="NSSuperview" ref="1053069492"/> - <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="1053069492"/> - <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">0.99604743719100952</double> - <double key="NSPercent">0.94565218687057495</double> - </object> - </object> - <string key="NSFrame">{{219, 53}, {287, 98}}</string> - <reference key="NSSuperview" ref="78582513"/> - <reference key="NSNextKeyView" ref="289958592"/> - <int key="NSsFlags">512</int> - <reference key="NSVScroller" ref="98036131"/> - <reference key="NSHScroller" ref="958026344"/> - <reference key="NSContentView" ref="289958592"/> - </object> <object class="NSPopUpButton" id="573115956"> <reference key="NSNextResponder" ref="78582513"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{17, 127}, {161, 22}}</string> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{372, 73}, {133, 22}}</string> <reference key="NSSuperview" ref="78582513"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="940205369"> @@ -1134,13 +910,13 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> </object> <object class="NSTextField" id="155260473"> <reference key="NSNextResponder" ref="78582513"/> - <int key="NSvFlags">292</int> - <string key="NSFrame">{{19, 150}, {117, 14}}</string> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{253, 79}, {117, 14}}</string> <reference key="NSSuperview" ref="78582513"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="498123343"> <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">272761856</int> + <int key="NSCellFlags2">71435264</int> <string key="NSContents">Align field names by:</string> <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="155260473"/> @@ -1148,30 +924,10 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <reference key="NSTextColor" ref="263116164"/> </object> </object> - <object class="NSTextField" id="746818659"> - <reference key="NSNextResponder" ref="78582513"/> - <int key="NSvFlags">269</int> - <string key="NSFrame">{{218, 353}, {23, 17}}</string> - <reference key="NSSuperview" ref="78582513"/> - <bool key="NSEnabled">YES</bool> - <object class="NSTextFieldCell" key="NSCell" id="1056698237"> - <int key="NSCellFlags">68288064</int> - <int key="NSCellFlags2">138413056</int> - <string key="NSContents"/> - <object class="NSFont" key="NSSupport"> - <string key="NSName">ZapfDingbatsITC</string> - <double key="NSSize">13</double> - <int key="NSfFlags">16</int> - </object> - <reference key="NSControlView" ref="746818659"/> - <reference key="NSBackgroundColor" ref="19028295"/> - <reference key="NSTextColor" ref="263116164"/> - </object> - </object> <object class="NSButton" id="148795893"> <reference key="NSNextResponder" ref="78582513"/> <int key="NSvFlags">289</int> - <string key="NSFrame">{{242, 14}, {82, 32}}</string> + <string key="NSFrame">{{239, 12}, {82, 32}}</string> <reference key="NSSuperview" ref="78582513"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="538595338"> @@ -1190,57 +946,458 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> </object> <object class="NSButton" id="42651750"> <reference key="NSNextResponder" ref="78582513"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{484, 168}, {22, 22}}</string> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{11, 56}, {29, 26}}</string> <reference key="NSSuperview" ref="78582513"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1001034034"> - <int key="NSCellFlags">-2080244224</int> - <int key="NSCellFlags2">134348800</int> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">134217728</int> <string key="NSContents"/> - <reference key="NSSupport" ref="26"/> + <reference key="NSSupport" ref="388072550"/> <reference key="NSControlView" ref="42651750"/> - <int key="NSButtonFlags">-2033434369</int> - <int key="NSButtonFlags2">402653254</int> - <object class="NSCustomResource" key="NSNormalImage"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSAdvanced</string> - </object> + <int key="NSButtonFlags">-1191296769</int> + <int key="NSButtonFlags2">402653253</int> + <reference key="NSAlternateImage" ref="388072550"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent">a</string> <int key="NSPeriodicDelay">400</int> <int key="NSPeriodicInterval">75</int> </object> </object> - <object class="NSButton" id="346675130"> + <object class="NSCustomView" id="892658687"> <reference key="NSNextResponder" ref="78582513"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{371, 148}, {137, 18}}</string> + <int key="NSvFlags">293</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="799122111"> + <reference key="NSNextResponder" ref="892658687"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 8}, {100, 18}}</string> + <reference key="NSSuperview" ref="892658687"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="385836359"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">LOW_PRIORITY</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="799122111"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="294469764"/> + <reference key="NSAlternateImage" ref="728464408"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="367476938"> + <reference key="NSNextResponder" ref="892658687"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{132, 8}, {80, 18}}</string> + <reference key="NSSuperview" ref="892658687"/> + <int key="NSTag">1</int> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="767775548"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">DELAYED</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="367476938"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="294469764"/> + <reference key="NSAlternateImage" ref="728464408"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrame">{{145, 20}, {230, 44}}</string> + <reference key="NSSuperview" ref="78582513"/> + <string key="NSClassName">NSView</string> + </object> + <object class="NSCustomView" id="219742831"> + <reference key="NSNextResponder" ref="78582513"/> + <int key="NSvFlags">293</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSScrollView" id="952580067"> + <reference key="NSNextResponder" ref="219742831"/> + <int key="NSvFlags">274</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSClipView" id="396898918"> + <reference key="NSNextResponder" ref="952580067"/> + <int key="NSvFlags">2304</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSTextView" id="249839159"> + <reference key="NSNextResponder" ref="396898918"/> + <int key="NSvFlags">2322</int> + <object class="NSMutableSet" key="NSDragTypes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="set.sortedObjects"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>Apple HTML pasteboard type</string> + <string>Apple PDF pasteboard type</string> + <string>Apple PICT pasteboard type</string> + <string>Apple PNG pasteboard type</string> + <string>Apple URL pasteboard type</string> + <string>CorePasteboardFlavorType 0x6D6F6F76</string> + <string>NSColor pasteboard type</string> + <string>NSFilenamesPboardType</string> + <string>NSStringPboardType</string> + <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string> + <string>NeXT RTFD pasteboard type</string> + <string>NeXT Rich Text Format v1.0 pasteboard type</string> + <string>NeXT TIFF v4.0 pasteboard type</string> + <string>NeXT font pasteboard type</string> + <string>NeXT ruler pasteboard type</string> + <string>WebURLsWithTitlesPboardType</string> + <string>public.url</string> + </object> + </object> + <string key="NSFrameSize">{400, 14}</string> + <reference key="NSSuperview" ref="396898918"/> + <object class="NSTextContainer" key="NSTextContainer" id="510363477"> + <object class="NSLayoutManager" key="NSLayoutManager"> + <object class="NSTextStorage" key="NSTextStorage"> + <object class="NSMutableString" key="NSString"> + <characters key="NS.bytes"/> + </object> + <nil key="NSDelegate"/> + </object> + <object class="NSMutableArray" key="NSTextContainers"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="510363477"/> + </object> + <int key="NSLMFlags">134</int> + <nil key="NSDelegate"/> + </object> + <reference key="NSTextView" ref="249839159"/> + <double key="NSWidth">400</double> + <int key="NSTCFlags">1</int> + </object> + <object class="NSTextViewSharedData" key="NSSharedData"> + <int key="NSFlags">12263</int> + <int key="NSTextCheckingTypes">0</int> + <nil key="NSMarkedAttributes"/> + <reference key="NSBackgroundColor" ref="746040121"/> + <object class="NSDictionary" key="NSSelectedAttributes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSBackgroundColor</string> + <string>NSColor</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">selectedTextBackgroundColor</string> + <reference key="NSColor" ref="240513327"/> + </object> + <object class="NSColor"> + <int key="NSColorSpace">6</int> + <string key="NSCatalogName">System</string> + <string key="NSColorName">selectedTextColor</string> + <reference key="NSColor" ref="938074100"/> + </object> + </object> + </object> + <reference key="NSInsertionColor" ref="938074100"/> + <object class="NSDictionary" key="NSLinkAttributes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSColor</string> + <string>NSCursor</string> + <string>NSUnderline</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSColor"> + <int key="NSColorSpace">1</int> + <bytes key="NSRGB">MCAwIDEAA</bytes> + </object> + <object class="NSCursor"> + <string key="NSHotSpot">{8, -8}</string> + <int key="NSCursorType">13</int> + </object> + <integer value="1"/> + </object> + </object> + <nil key="NSDefaultParagraphStyle"/> + </object> + <int key="NSTVFlags">6</int> + <string key="NSMaxSize">{787, 1e+07}</string> + <string key="NSMinize">{223, 0}</string> + <nil key="NSDelegate"/> + </object> + </object> + <string key="NSFrame">{{1, 1}, {400, 37}}</string> + <reference key="NSSuperview" ref="952580067"/> + <reference key="NSNextKeyView" ref="249839159"/> + <reference key="NSDocView" ref="249839159"/> + <reference key="NSBGColor" ref="746040121"/> + <object class="NSCursor" key="NSCursor"> + <string key="NSHotSpot">{4, -5}</string> + <int key="NSCursorType">1</int> + </object> + <int key="NScvFlags">4</int> + </object> + <object class="NSScroller" id="24215372"> + <reference key="NSNextResponder" ref="952580067"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{386, 1}, {15, 37}}</string> + <reference key="NSSuperview" ref="952580067"/> + <int key="NSsFlags">512</int> + <reference key="NSTarget" ref="952580067"/> + <string key="NSAction">_doScroller:</string> + <double key="NSCurValue">1</double> + <double key="NSPercent">0.85256409645080566</double> + </object> + <object class="NSScroller" id="475133483"> + <reference key="NSNextResponder" ref="952580067"/> + <int key="NSvFlags">-2147483392</int> + <string key="NSFrame">{{-100, -100}, {87, 15}}</string> + <reference key="NSSuperview" ref="952580067"/> + <int key="NSsFlags">513</int> + <reference key="NSTarget" ref="952580067"/> + <string key="NSAction">_doScroller:</string> + <double key="NSCurValue">1</double> + <double key="NSPercent">0.94565218687057495</double> + </object> + </object> + <string key="NSFrame">{{20, 20}, {402, 39}}</string> + <reference key="NSSuperview" ref="219742831"/> + <reference key="NSNextKeyView" ref="396898918"/> + <int key="NSsFlags">530</int> + <reference key="NSVScroller" ref="24215372"/> + <reference key="NSHScroller" ref="475133483"/> + <reference key="NSContentView" ref="396898918"/> + </object> + <object class="NSButton" id="16766984"> + <reference key="NSNextResponder" ref="219742831"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{227, 85}, {104, 18}}</string> + <reference key="NSSuperview" ref="219742831"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="776859395"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">HIGH_PRIORITY</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="16766984"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="294469764"/> + <reference key="NSAlternateImage" ref="728464408"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="796449267"> + <reference key="NSNextResponder" ref="219742831"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 85}, {100, 18}}</string> + <reference key="NSSuperview" ref="219742831"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="666818493"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">LOW_PRIORITY</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="796449267"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="294469764"/> + <reference key="NSAlternateImage" ref="728464408"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="630547726"> + <reference key="NSNextResponder" ref="219742831"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 62}, {181, 18}}</string> + <reference key="NSSuperview" ref="219742831"/> + <int key="NSTag">2</int> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="265447544"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">ON DUPLICATE KEY UPDATE:</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="630547726"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="294469764"/> + <reference key="NSAlternateImage" ref="728464408"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="1014387480"> + <reference key="NSNextResponder" ref="219742831"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{137, 85}, {80, 18}}</string> + <reference key="NSSuperview" ref="219742831"/> + <int key="NSTag">1</int> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="548754049"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">DELAYED</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="1014387480"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="294469764"/> + <reference key="NSAlternateImage" ref="728464408"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="403613444"> + <reference key="NSNextResponder" ref="219742831"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{354, 85}, {70, 18}}</string> + <reference key="NSSuperview" ref="219742831"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="115350738"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">IGNORE</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="403613444"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="294469764"/> + <reference key="NSAlternateImage" ref="728464408"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrame">{{39, -57}, {442, 121}}</string> + <reference key="NSSuperview" ref="78582513"/> + <string key="NSClassName">NSView</string> + </object> + <object class="NSCustomView" id="471578497"> + <reference key="NSNextResponder" ref="78582513"/> + <int key="NSvFlags">293</int> + <object class="NSMutableArray" key="NSSubviews"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="346675130"> + <reference key="NSNextResponder" ref="471578497"/> + <int key="NSvFlags">289</int> + <string key="NSFrame">{{213, 8}, {139, 18}}</string> + <reference key="NSSuperview" ref="471578497"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="450486129"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">Insert remaining rows</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="346675130"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="294469764"/> + <reference key="NSAlternateImage" ref="728464408"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="388473976"> + <reference key="NSNextResponder" ref="471578497"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{17, 8}, {100, 18}}</string> + <reference key="NSSuperview" ref="471578497"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="162288118"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">LOW_PRIORITY</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="388473976"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="294469764"/> + <reference key="NSAlternateImage" ref="728464408"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + <object class="NSButton" id="446881673"> + <reference key="NSNextResponder" ref="471578497"/> + <int key="NSvFlags">268</int> + <string key="NSFrame">{{132, 8}, {70, 18}}</string> + <reference key="NSSuperview" ref="471578497"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="591185810"> + <int key="NSCellFlags">67239424</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">IGNORE</string> + <reference key="NSSupport" ref="26"/> + <reference key="NSControlView" ref="446881673"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <reference key="NSNormalImage" ref="294469764"/> + <reference key="NSAlternateImage" ref="728464408"/> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> + </object> + <string key="NSFrame">{{66, 20}, {377, 44}}</string> + <reference key="NSSuperview" ref="78582513"/> + <string key="NSClassName">NSView</string> + </object> + <object class="NSTextField" id="847916137"> + <reference key="NSNextResponder" ref="78582513"/> + <int key="NSvFlags">292</int> + <string key="NSFrame">{{35, 62}, {61, 14}}</string> <reference key="NSSuperview" ref="78582513"/> <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="450486129"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">Insert remaining data</string> + <object class="NSTextFieldCell" key="NSCell" id="462056945"> + <int key="NSCellFlags">68288064</int> + <int key="NSCellFlags2">4326400</int> + <string key="NSContents">Advanced</string> <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="346675130"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="294469764"/> - <reference key="NSAlternateImage" ref="728464408"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> + <reference key="NSControlView" ref="847916137"/> + <reference key="NSBackgroundColor" ref="19028295"/> + <reference key="NSTextColor" ref="263116164"/> </object> </object> </object> - <string key="NSFrameSize">{522, 418}</string> + <string key="NSFrameSize">{522, 348}</string> <reference key="NSSuperview"/> </object> - <string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string> - <string key="NSMinSize">{522, 440}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> + <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> + <string key="NSMinSize">{522, 370}</string> + <string key="NSMaxSize">{10000, 522}</string> <string key="NSFrameAutosaveName">SPCSVFieldMappingSheet</string> </object> <object class="NSWindowTemplate" id="280523396"> @@ -1254,7 +1411,7 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{311, 186}</string> <object class="NSView" key="NSWindowView" id="803374494"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1539,264 +1696,12 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> </object> </object> <string key="NSFrameSize">{311, 186}</string> - <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1280, 1002}}</string> <string key="NSMinSize">{311, 208}</string> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSFrameAutosaveName"/> </object> - <object class="NSWindowTemplate" id="564599675"> - <int key="NSWindowStyleMask">15</int> - <int key="NSWindowBacking">2</int> - <string key="NSWindowRect">{{131, 238}, {311, 190}}</string> - <int key="NSWTFlags">1954021376</int> - <string key="NSWindowTitle">Window</string> - <string key="NSWindowClass">NSWindow</string> - <nil key="NSViewClass"/> - <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> - <string key="NSWindowContentMinSize">{311, 190}</string> - <object class="NSView" key="NSWindowView" id="699476492"> - <reference key="NSNextResponder"/> - <int key="NSvFlags">274</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSButton" id="356300263"> - <reference key="NSNextResponder" ref="699476492"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{25, 154}, {70, 18}}</string> - <reference key="NSSuperview" ref="699476492"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="299767731"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">IGNORE</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="356300263"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="294469764"/> - <reference key="NSAlternateImage" ref="728464408"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="310442563"> - <reference key="NSNextResponder" ref="699476492"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{25, 134}, {80, 18}}</string> - <reference key="NSSuperview" ref="699476492"/> - <int key="NSTag">1</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="632579662"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">DELAYED</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="310442563"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="294469764"/> - <reference key="NSAlternateImage" ref="728464408"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSButton" id="728153759"> - <reference key="NSNextResponder" ref="699476492"/> - <int key="NSvFlags">268</int> - <string key="NSFrame">{{25, 114}, {202, 18}}</string> - <reference key="NSSuperview" ref="699476492"/> - <int key="NSTag">2</int> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="372006281"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">131072</int> - <string key="NSContents">ON DUPLICATE KEY UPDATE:</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="728153759"/> - <int key="NSButtonFlags">1211912703</int> - <int key="NSButtonFlags2">2</int> - <reference key="NSNormalImage" ref="294469764"/> - <reference key="NSAlternateImage" ref="728464408"/> - <string key="NSAlternateContents"/> - <string key="NSKeyEquivalent"/> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - <object class="NSScrollView" id="326072851"> - <reference key="NSNextResponder" ref="699476492"/> - <int key="NSvFlags">274</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSClipView" id="904582017"> - <reference key="NSNextResponder" ref="326072851"/> - <int key="NSvFlags">2304</int> - <object class="NSMutableArray" key="NSSubviews"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSTextView" id="155850591"> - <reference key="NSNextResponder" ref="904582017"/> - <int key="NSvFlags">2330</int> - <object class="NSMutableSet" key="NSDragTypes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="set.sortedObjects"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>Apple HTML pasteboard type</string> - <string>Apple PDF pasteboard type</string> - <string>Apple PICT pasteboard type</string> - <string>Apple PNG pasteboard type</string> - <string>Apple URL pasteboard type</string> - <string>CorePasteboardFlavorType 0x6D6F6F76</string> - <string>NSColor pasteboard type</string> - <string>NSFilenamesPboardType</string> - <string>NSStringPboardType</string> - <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string> - <string>NeXT RTFD pasteboard type</string> - <string>NeXT Rich Text Format v1.0 pasteboard type</string> - <string>NeXT TIFF v4.0 pasteboard type</string> - <string>NeXT font pasteboard type</string> - <string>NeXT ruler pasteboard type</string> - <string>WebURLsWithTitlesPboardType</string> - <string>public.url</string> - </object> - </object> - <string key="NSFrameSize">{269, 14}</string> - <reference key="NSSuperview" ref="904582017"/> - <object class="NSTextContainer" key="NSTextContainer" id="903171248"> - <object class="NSLayoutManager" key="NSLayoutManager"> - <object class="NSTextStorage" key="NSTextStorage"> - <object class="NSMutableString" key="NSString"> - <characters key="NS.bytes"/> - </object> - <nil key="NSDelegate"/> - </object> - <object class="NSMutableArray" key="NSTextContainers"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="903171248"/> - </object> - <int key="NSLMFlags">134</int> - <nil key="NSDelegate"/> - </object> - <reference key="NSTextView" ref="155850591"/> - <double key="NSWidth">269</double> - <int key="NSTCFlags">1</int> - </object> - <object class="NSTextViewSharedData" key="NSSharedData"> - <int key="NSFlags">11555</int> - <int key="NSTextCheckingTypes">0</int> - <nil key="NSMarkedAttributes"/> - <reference key="NSBackgroundColor" ref="746040121"/> - <object class="NSDictionary" key="NSSelectedAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSBackgroundColor</string> - <string>NSColor</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="304176749"/> - <reference ref="621386407"/> - </object> - </object> - <reference key="NSInsertionColor" ref="938074100"/> - <object class="NSDictionary" key="NSLinkAttributes"> - <bool key="EncodedWithXMLCoder">YES</bool> - <object class="NSArray" key="dict.sortedKeys"> - <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSColor</string> - <string>NSCursor</string> - <string>NSUnderline</string> - </object> - <object class="NSMutableArray" key="dict.values"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1062455759"/> - <reference ref="646479068"/> - <integer value="1"/> - </object> - </object> - <nil key="NSDefaultParagraphStyle"/> - </object> - <int key="NSTVFlags">6</int> - <string key="NSMaxSize">{540, 1e+07}</string> - <string key="NSMinize">{223, 0}</string> - <nil key="NSDelegate"/> - </object> - </object> - <string key="NSFrame">{{1, 1}, {269, 59}}</string> - <reference key="NSSuperview" ref="326072851"/> - <reference key="NSNextKeyView" ref="155850591"/> - <reference key="NSDocView" ref="155850591"/> - <reference key="NSBGColor" ref="746040121"/> - <object class="NSCursor" key="NSCursor"> - <string key="NSHotSpot">{4, -5}</string> - <int key="NSCursorType">1</int> - </object> - <int key="NScvFlags">4</int> - </object> - <object class="NSScroller" id="109888708"> - <reference key="NSNextResponder" ref="326072851"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{255, 1}, {15, 44}}</string> - <reference key="NSSuperview" ref="326072851"/> - <reference key="NSTarget" ref="326072851"/> - <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">1</double> - <double key="NSPercent">0.85256409645080566</double> - </object> - <object class="NSScroller" id="430947306"> - <reference key="NSNextResponder" ref="326072851"/> - <int key="NSvFlags">-2147483392</int> - <string key="NSFrame">{{-100, -100}, {254, 15}}</string> - <reference key="NSSuperview" ref="326072851"/> - <int key="NSsFlags">1</int> - <reference key="NSTarget" ref="326072851"/> - <string key="NSAction">_doScroller:</string> - <double key="NSCurValue">1</double> - <double key="NSPercent">0.94565218687057495</double> - </object> - </object> - <string key="NSFrame">{{20, 45}, {271, 61}}</string> - <reference key="NSSuperview" ref="699476492"/> - <reference key="NSNextKeyView" ref="904582017"/> - <int key="NSsFlags">530</int> - <reference key="NSVScroller" ref="109888708"/> - <reference key="NSHScroller" ref="430947306"/> - <reference key="NSContentView" ref="904582017"/> - </object> - <object class="NSButton" id="961544149"> - <reference key="NSNextResponder" ref="699476492"/> - <int key="NSvFlags">289</int> - <string key="NSFrame">{{226, 13}, {70, 28}}</string> - <reference key="NSSuperview" ref="699476492"/> - <bool key="NSEnabled">YES</bool> - <object class="NSButtonCell" key="NSCell" id="920720182"> - <int key="NSCellFlags">67239424</int> - <int key="NSCellFlags2">134348800</int> - <string key="NSContents">OK</string> - <reference key="NSSupport" ref="26"/> - <reference key="NSControlView" ref="961544149"/> - <int key="NSButtonFlags">-2038284033</int> - <int key="NSButtonFlags2">129</int> - <string key="NSAlternateContents"/> - <string type="base64-UTF8" key="NSKeyEquivalent">DQ</string> - <int key="NSPeriodicDelay">200</int> - <int key="NSPeriodicInterval">25</int> - </object> - </object> - </object> - <string key="NSFrameSize">{311, 190}</string> - <reference key="NSSuperview"/> - </object> - <string key="NSScreenRect">{{0, 0}, {1280, 778}}</string> - <string key="NSMinSize">{311, 212}</string> - <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> - </object> <object class="NSUserDefaultsController" id="443551699"> <bool key="NSSharedInstance">YES</bool> </object> @@ -2109,108 +2014,236 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <int key="connectionID">223</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">ignoreCheckBox</string> + <object class="IBActionConnection" key="connection"> + <string key="label">openAdvancedSheet:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="356300263"/> + <reference key="destination" ref="42651750"/> </object> - <int key="connectionID">242</int> + <int key="connectionID">248</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">delayedCheckBox</string> + <string key="label">globalValuesSheet</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="310442563"/> + <reference key="destination" ref="280523396"/> </object> - <int key="connectionID">243</int> + <int key="connectionID">249</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">onupdateCheckBox</string> + <string key="label">advancedButton</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="728153759"/> + <reference key="destination" ref="42651750"/> </object> - <int key="connectionID">244</int> + <int key="connectionID">256</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">onupdateTextView</string> + <string key="label">addRemainingDataSwitch</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="155850591"/> + <reference key="destination" ref="346675130"/> </object> - <int key="connectionID">245</int> + <int key="connectionID">259</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">closeAdvancedSheet:</string> + <string key="label">advancedCheckboxValidation:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="961544149"/> + <reference key="destination" ref="796449267"/> </object> - <int key="connectionID">246</int> + <int key="connectionID">309</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> - <string key="label">openAdvancedSheet:</string> + <string key="label">advancedCheckboxValidation:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="42651750"/> + <reference key="destination" ref="630547726"/> </object> - <int key="connectionID">248</int> + <int key="connectionID">310</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">globalValuesSheet</string> + <object class="IBActionConnection" key="connection"> + <string key="label">advancedCheckboxValidation:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="280523396"/> + <reference key="destination" ref="16766984"/> </object> - <int key="connectionID">249</int> + <int key="connectionID">311</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">advancedSheet</string> + <object class="IBActionConnection" key="connection"> + <string key="label">advancedCheckboxValidation:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="564599675"/> + <reference key="destination" ref="1014387480"/> </object> - <int key="connectionID">250</int> + <int key="connectionID">312</int> </object> <object class="IBConnectionRecord"> - <object class="IBOutletConnection" key="connection"> - <string key="label">delegate</string> - <reference key="source" ref="564599675"/> - <reference key="destination" ref="1001"/> + <object class="IBActionConnection" key="connection"> + <string key="label">advancedCheckboxValidation:</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="799122111"/> </object> - <int key="connectionID">252</int> + <int key="connectionID">329</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">advancedCheckboxValidation:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="310442563"/> + <reference key="destination" ref="367476938"/> </object> - <int key="connectionID">253</int> + <int key="connectionID">330</int> </object> <object class="IBConnectionRecord"> <object class="IBActionConnection" key="connection"> <string key="label">advancedCheckboxValidation:</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="728153759"/> + <reference key="destination" ref="388473976"/> </object> - <int key="connectionID">254</int> + <int key="connectionID">348</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">advancedButton</string> + <string key="label">advancedInsertView</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="42651750"/> + <reference key="destination" ref="219742831"/> </object> - <int key="connectionID">256</int> + <int key="connectionID">353</int> </object> <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> - <string key="label">addRemainingDataSwitch</string> + <string key="label">advancedUpdateView</string> <reference key="source" ref="1001"/> - <reference key="destination" ref="346675130"/> + <reference key="destination" ref="471578497"/> </object> - <int key="connectionID">259</int> + <int key="connectionID">354</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">advancedReplaceView</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="892658687"/> + </object> + <int key="connectionID">355</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">fieldMapperTableScrollView</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="495172082"/> + </object> + <int key="connectionID">356</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">importMethodLabel</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="228203205"/> + </object> + <int key="connectionID">357</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">alignByPopupLabel</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="155260473"/> + </object> + <int key="connectionID">358</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delayedCheckBox</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="1014387480"/> + </object> + <int key="connectionID">363</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">onupdateCheckBox</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="630547726"/> + </object> + <int key="connectionID">364</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">highPriorityCheckBox</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="16766984"/> + </object> + <int key="connectionID">367</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">advancedBox</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="412235166"/> + </object> + <int key="connectionID">372</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">advancedLabel</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="847916137"/> + </object> + <int key="connectionID">378</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">ignoreCheckBox</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="403613444"/> + </object> + <int key="connectionID">379</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">lowPriorityCheckBox</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="796449267"/> + </object> + <int key="connectionID">380</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">ignoreUpdateCheckBox</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="446881673"/> + </object> + <int key="connectionID">381</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">lowPriorityUpdateCheckBox</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="388473976"/> + </object> + <int key="connectionID">382</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">delayedReplaceCheckBox</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="367476938"/> + </object> + <int key="connectionID">383</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">lowPriorityReplaceCheckBox</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="799122111"/> + </object> + <int key="connectionID">384</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBOutletConnection" key="connection"> + <string key="label">onupdateTextView</string> + <reference key="source" ref="1001"/> + <reference key="destination" ref="249839159"/> + </object> + <int key="connectionID">390</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -2256,24 +2289,26 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="617902336"/> - <reference ref="341819846"/> - <reference ref="920273776"/> - <reference ref="834757891"/> - <reference ref="116285743"/> - <reference ref="186404366"/> <reference ref="549705971"/> <reference ref="495172082"/> <reference ref="697948389"/> <reference ref="599385609"/> <reference ref="228203205"/> <reference ref="397227507"/> - <reference ref="1053069492"/> - <reference ref="573115956"/> - <reference ref="155260473"/> - <reference ref="746818659"/> + <reference ref="920273776"/> + <reference ref="341819846"/> + <reference ref="834757891"/> + <reference ref="116285743"/> + <reference ref="186404366"/> <reference ref="148795893"/> + <reference ref="412235166"/> + <reference ref="155260473"/> + <reference ref="573115956"/> <reference ref="42651750"/> - <reference ref="346675130"/> + <reference ref="847916137"/> + <reference ref="471578497"/> + <reference ref="892658687"/> + <reference ref="219742831"/> </object> <reference key="parent" ref="420604405"/> </object> @@ -2297,6 +2332,7 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <reference ref="1052916804"/> </object> <reference key="parent" ref="78582513"/> + <string key="objectName">Header Box (Box)</string> </object> <object class="IBObjectRecord"> <int key="objectID">15</int> @@ -2620,32 +2656,6 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <reference key="parent" ref="397227507"/> </object> <object class="IBObjectRecord"> - <int key="objectID">123</int> - <reference key="object" ref="1053069492"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="98036131"/> - <reference ref="958026344"/> - <reference ref="989433642"/> - </object> - <reference key="parent" ref="78582513"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">124</int> - <reference key="object" ref="98036131"/> - <reference key="parent" ref="1053069492"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">125</int> - <reference key="object" ref="958026344"/> - <reference key="parent" ref="1053069492"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">126</int> - <reference key="object" ref="989433642"/> - <reference key="parent" ref="1053069492"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">131</int> <reference key="object" ref="573115956"/> <object class="NSMutableArray" key="children"> @@ -2705,20 +2715,6 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <reference key="parent" ref="877368345"/> </object> <object class="IBObjectRecord"> - <int key="objectID">142</int> - <reference key="object" ref="746818659"/> - <object class="NSMutableArray" key="children"> - <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1056698237"/> - </object> - <reference key="parent" ref="78582513"/> - </object> - <object class="IBObjectRecord"> - <int key="objectID">143</int> - <reference key="object" ref="1056698237"/> - <reference key="parent" ref="746818659"/> - </object> - <object class="IBObjectRecord"> <int key="objectID">144</int> <reference key="object" ref="221439252"/> <object class="NSMutableArray" key="children"> @@ -2911,123 +2907,174 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <reference key="parent" ref="877368345"/> </object> <object class="IBObjectRecord"> - <int key="objectID">225</int> - <reference key="object" ref="564599675"/> + <int key="objectID">139</int> + <reference key="object" ref="42651750"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="699476492"/> + <reference ref="1001034034"/> </object> - <reference key="parent" ref="0"/> - <string key="objectName">Advanced Sheet</string> + <reference key="parent" ref="78582513"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">140</int> + <reference key="object" ref="1001034034"/> + <reference key="parent" ref="42651750"/> </object> <object class="IBObjectRecord"> - <int key="objectID">226</int> - <reference key="object" ref="699476492"/> + <int key="objectID">268</int> + <reference key="object" ref="219742831"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="356300263"/> - <reference ref="310442563"/> - <reference ref="728153759"/> - <reference ref="326072851"/> - <reference ref="961544149"/> + <reference ref="630547726"/> + <reference ref="796449267"/> + <reference ref="1014387480"/> + <reference ref="16766984"/> + <reference ref="403613444"/> + <reference ref="952580067"/> </object> - <reference key="parent" ref="564599675"/> + <reference key="parent" ref="78582513"/> + <string key="objectName">Advanced View for INSERT</string> </object> <object class="IBObjectRecord"> - <int key="objectID">227</int> - <reference key="object" ref="356300263"/> + <int key="objectID">299</int> + <reference key="object" ref="796449267"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="299767731"/> + <reference ref="666818493"/> </object> - <reference key="parent" ref="699476492"/> + <reference key="parent" ref="219742831"/> </object> <object class="IBObjectRecord"> - <int key="objectID">228</int> - <reference key="object" ref="299767731"/> - <reference key="parent" ref="356300263"/> + <int key="objectID">302</int> + <reference key="object" ref="666818493"/> + <reference key="parent" ref="796449267"/> </object> <object class="IBObjectRecord"> - <int key="objectID">231</int> - <reference key="object" ref="310442563"/> + <int key="objectID">300</int> + <reference key="object" ref="16766984"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="632579662"/> + <reference ref="776859395"/> </object> - <reference key="parent" ref="699476492"/> + <reference key="parent" ref="219742831"/> </object> <object class="IBObjectRecord"> - <int key="objectID">232</int> - <reference key="object" ref="632579662"/> - <reference key="parent" ref="310442563"/> + <int key="objectID">301</int> + <reference key="object" ref="776859395"/> + <reference key="parent" ref="16766984"/> </object> <object class="IBObjectRecord"> - <int key="objectID">233</int> - <reference key="object" ref="728153759"/> + <int key="objectID">297</int> + <reference key="object" ref="630547726"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="372006281"/> + <reference ref="265447544"/> </object> - <reference key="parent" ref="699476492"/> + <reference key="parent" ref="219742831"/> </object> <object class="IBObjectRecord"> - <int key="objectID">234</int> - <reference key="object" ref="372006281"/> - <reference key="parent" ref="728153759"/> + <int key="objectID">306</int> + <reference key="object" ref="265447544"/> + <reference key="parent" ref="630547726"/> </object> <object class="IBObjectRecord"> - <int key="objectID">235</int> - <reference key="object" ref="326072851"/> + <int key="objectID">296</int> + <reference key="object" ref="1014387480"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="109888708"/> - <reference ref="430947306"/> - <reference ref="155850591"/> + <reference ref="548754049"/> </object> - <reference key="parent" ref="699476492"/> + <reference key="parent" ref="219742831"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">307</int> + <reference key="object" ref="548754049"/> + <reference key="parent" ref="1014387480"/> </object> <object class="IBObjectRecord"> - <int key="objectID">236</int> - <reference key="object" ref="109888708"/> - <reference key="parent" ref="326072851"/> + <int key="objectID">295</int> + <reference key="object" ref="403613444"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="115350738"/> + </object> + <reference key="parent" ref="219742831"/> </object> <object class="IBObjectRecord"> - <int key="objectID">237</int> - <reference key="object" ref="430947306"/> - <reference key="parent" ref="326072851"/> + <int key="objectID">308</int> + <reference key="object" ref="115350738"/> + <reference key="parent" ref="403613444"/> </object> <object class="IBObjectRecord"> - <int key="objectID">238</int> - <reference key="object" ref="155850591"/> - <reference key="parent" ref="326072851"/> + <int key="objectID">371</int> + <reference key="object" ref="412235166"/> + <reference key="parent" ref="78582513"/> + <string key="objectName">Advanced Box (Box)</string> </object> <object class="IBObjectRecord"> - <int key="objectID">239</int> - <reference key="object" ref="961544149"/> + <int key="objectID">376</int> + <reference key="object" ref="847916137"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="920720182"/> + <reference ref="462056945"/> </object> - <reference key="parent" ref="699476492"/> + <reference key="parent" ref="78582513"/> </object> <object class="IBObjectRecord"> - <int key="objectID">240</int> - <reference key="object" ref="920720182"/> - <reference key="parent" ref="961544149"/> + <int key="objectID">377</int> + <reference key="object" ref="462056945"/> + <reference key="parent" ref="847916137"/> </object> <object class="IBObjectRecord"> - <int key="objectID">139</int> - <reference key="object" ref="42651750"/> + <int key="objectID">313</int> + <reference key="object" ref="892658687"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="1001034034"/> + <reference ref="367476938"/> + <reference ref="799122111"/> </object> <reference key="parent" ref="78582513"/> + <string key="objectName">Advanced View for REPLACE</string> </object> <object class="IBObjectRecord"> - <int key="objectID">140</int> - <reference key="object" ref="1001034034"/> - <reference key="parent" ref="42651750"/> + <int key="objectID">318</int> + <reference key="object" ref="367476938"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="767775548"/> + </object> + <reference key="parent" ref="892658687"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">321</int> + <reference key="object" ref="767775548"/> + <reference key="parent" ref="367476938"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">314</int> + <reference key="object" ref="799122111"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="385836359"/> + </object> + <reference key="parent" ref="892658687"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">327</int> + <reference key="object" ref="385836359"/> + <reference key="parent" ref="799122111"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">332</int> + <reference key="object" ref="471578497"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="346675130"/> + <reference ref="446881673"/> + <reference ref="388473976"/> + </object> + <reference key="parent" ref="78582513"/> + <string key="objectName">Advanced View for UPDATE</string> </object> <object class="IBObjectRecord"> <int key="objectID">257</int> @@ -3036,13 +3083,67 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <reference ref="450486129"/> </object> - <reference key="parent" ref="78582513"/> + <reference key="parent" ref="471578497"/> </object> <object class="IBObjectRecord"> <int key="objectID">258</int> <reference key="object" ref="450486129"/> <reference key="parent" ref="346675130"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">338</int> + <reference key="object" ref="446881673"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="591185810"/> + </object> + <reference key="parent" ref="471578497"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">339</int> + <reference key="object" ref="591185810"/> + <reference key="parent" ref="446881673"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">333</int> + <reference key="object" ref="388473976"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="162288118"/> + </object> + <reference key="parent" ref="471578497"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">346</int> + <reference key="object" ref="162288118"/> + <reference key="parent" ref="388473976"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">385</int> + <reference key="object" ref="952580067"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="24215372"/> + <reference ref="475133483"/> + <reference ref="249839159"/> + </object> + <reference key="parent" ref="219742831"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">386</int> + <reference key="object" ref="24215372"/> + <reference key="parent" ref="952580067"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">387</int> + <reference key="object" ref="475133483"/> + <reference key="parent" ref="952580067"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">388</int> + <reference key="object" ref="249839159"/> + <reference key="parent" ref="952580067"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -3063,10 +3164,6 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <string>112.IBPluginDependency</string> <string>12.IBPluginDependency</string> <string>12.ImportedFromIB2</string> - <string>123.IBPluginDependency</string> - <string>124.IBPluginDependency</string> - <string>125.IBPluginDependency</string> - <string>126.IBPluginDependency</string> <string>13.IBPluginDependency</string> <string>13.ImportedFromIB2</string> <string>131.IBPluginDependency</string> @@ -3082,8 +3179,6 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <string>14.IBPluginDependency</string> <string>140.IBPluginDependency</string> <string>141.IBPluginDependency</string> - <string>142.IBPluginDependency</string> - <string>143.IBPluginDependency</string> <string>144.IBPluginDependency</string> <string>149.IBPluginDependency</string> <string>15.IBAttributePlaceholdersKey</string> @@ -3134,44 +3229,58 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <string>221.IBPluginDependency</string> <string>222.IBPluginDependency</string> <string>224.IBPluginDependency</string> - <string>225.IBEditorWindowLastContentRect</string> - <string>225.IBPluginDependency</string> - <string>225.IBWindowTemplateEditedContentRect</string> - <string>225.NSWindowTemplate.visibleAtLaunch</string> - <string>225.windowTemplate.hasMinSize</string> - <string>225.windowTemplate.minSize</string> - <string>226.IBPluginDependency</string> - <string>227.IBPluginDependency</string> - <string>228.IBPluginDependency</string> - <string>231.IBPluginDependency</string> - <string>232.IBPluginDependency</string> - <string>233.IBPluginDependency</string> - <string>234.IBPluginDependency</string> - <string>235.IBPluginDependency</string> - <string>236.IBPluginDependency</string> - <string>237.IBPluginDependency</string> - <string>238.CustomClassName</string> - <string>238.IBPluginDependency</string> - <string>239.IBPluginDependency</string> <string>24.IBPluginDependency</string> - <string>240.IBPluginDependency</string> <string>25.IBAttributePlaceholdersKey</string> <string>25.IBPluginDependency</string> + <string>257.IBAttributePlaceholdersKey</string> <string>257.IBPluginDependency</string> <string>258.IBPluginDependency</string> + <string>26.IBPathControlIntegration.allowedTypes</string> <string>26.IBPluginDependency</string> + <string>268.IBEditorWindowLastContentRect</string> + <string>268.IBPluginDependency</string> <string>27.IBPluginDependency</string> <string>28.IBEditorWindowLastContentRect</string> <string>28.IBPluginDependency</string> <string>29.IBPluginDependency</string> + <string>295.IBPluginDependency</string> + <string>296.IBPluginDependency</string> + <string>297.IBPluginDependency</string> + <string>299.IBPluginDependency</string> <string>30.IBPluginDependency</string> + <string>300.IBPluginDependency</string> + <string>301.IBPluginDependency</string> + <string>302.IBPluginDependency</string> + <string>306.IBPluginDependency</string> + <string>307.IBPluginDependency</string> + <string>308.IBPluginDependency</string> <string>31.IBPluginDependency</string> + <string>313.IBEditorWindowLastContentRect</string> + <string>313.IBPluginDependency</string> + <string>314.IBPluginDependency</string> + <string>318.IBPluginDependency</string> + <string>321.IBPluginDependency</string> + <string>327.IBPluginDependency</string> + <string>332.IBEditorWindowLastContentRect</string> + <string>332.IBPluginDependency</string> + <string>333.IBPluginDependency</string> + <string>338.IBPluginDependency</string> + <string>339.IBPluginDependency</string> <string>34.IBPluginDependency</string> + <string>346.IBPluginDependency</string> <string>35.IBPluginDependency</string> <string>36.IBEditorWindowLastContentRect</string> <string>36.IBPluginDependency</string> <string>37.IBPluginDependency</string> + <string>371.IBPluginDependency</string> + <string>376.IBPluginDependency</string> + <string>377.IBPluginDependency</string> <string>38.IBPluginDependency</string> + <string>385.IBPluginDependency</string> + <string>386.IBPluginDependency</string> + <string>387.IBPluginDependency</string> + <string>388.CustomClassName</string> + <string>388.IBPluginDependency</string> <string>39.IBPluginDependency</string> <string>40.IBPluginDependency</string> <string>41.IBPluginDependency</string> @@ -3205,28 +3314,24 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{390, 238}, {522, 418}}</string> + <string>{{204, 328}, {522, 348}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{390, 238}, {522, 418}}</string> + <string>{{204, 328}, {522, 348}}</string> <integer value="1"/> <string>{{387, 725}, {432, 282}}</string> - <integer value="0"/> + <boolean value="YES"/> <integer value="1"/> - <string>{3.40282e+38, 3.40282e+38}</string> - <string>{522, 418}</string> + <string>{10000, 500}</string> + <string>{522, 348}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{237, 379}, {161, 71}}</string> + <string>{{637, 410}, {161, 71}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3237,7 +3342,7 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <object class="IBToolTipAttribute" key="NS.object.0"> <string key="name">ToolTip</string> <reference key="object" ref="42651750"/> - <string key="toolTip">Advanced settings for import methods INSERT and REPLACE (⌥⌘A)</string> + <string key="toolTip">Advanced settings for import methods (⌥⌘A)</string> </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3246,14 +3351,12 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <object class="NSMutableDictionary"> <string key="NS.key.0">ToolTip</string> <object class="IBToolTipAttribute" key="NS.object.0"> <string key="name">ToolTip</string> <reference key="object" ref="341819846"/> - <string type="base64-UTF8" key="toolTip">KBLihqkpA</string> + <string type="base64-UTF8" key="toolTip">SW1wb3J0ICgS4oapKQ</string> </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3273,7 +3376,7 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <object class="IBToolTipAttribute" key="NS.object.0"> <string key="name">ToolTip</string> <reference key="object" ref="920273776"/> - <string type="base64-UTF8" key="toolTip">KA/ijospA</string> + <string type="base64-UTF8" key="toolTip">Q2FuY2VsIEltcG9ydCAoD+KOiyk</string> </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3296,7 +3399,7 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <object class="IBToolTipAttribute" key="NS.object.0"> <string key="name">ToolTip</string> <reference key="object" ref="834757891"/> - <string key="toolTip">(←)</string> + <string key="toolTip">Show previous source row (⌘←)</string> </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3313,7 +3416,7 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <object class="IBToolTipAttribute" key="NS.object.0"> <string key="name">ToolTip</string> <reference key="object" ref="116285743"/> - <string key="toolTip">(→)</string> + <string key="toolTip">Show next source row (⌘→)</string> </object> </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3352,41 +3455,57 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{154, 262}, {311, 190}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{154, 262}, {311, 190}}</string> - <boolean value="NO"/> - <boolean value="YES"/> - <string>{311, 190}</string> + <object class="NSMutableDictionary"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="697948389"/> + <string key="toolTip">Source file path</string> + </object> + </object> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableDictionary"> + <string key="NS.key.0">ToolTip</string> + <object class="IBToolTipAttribute" key="NS.object.0"> + <string key="name">ToolTip</string> + <reference key="object" ref="346675130"/> + <string key="toolTip">All rows which doesn't match the WHERE clause in the UPDATE statement will be inserted via INSERT INTO…</string> + </object> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSMutableArray"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>csv</string> + </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{63, 565}, {360, 157}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{593, 420}, {95, 54}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>CMTextView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <object class="NSMutableDictionary"> - <string key="NS.key.0">ToolTip</string> - <object class="IBToolTipAttribute" key="NS.object.0"> - <string key="name">ToolTip</string> - <reference key="object" ref="697948389"/> - <string key="toolTip">Source File</string> - </object> - </object> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{593, 420}, {95, 54}}</string> + <string>{{51, 382}, {230, 54}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>{{51, 461}, {230, 45}}</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -3401,6 +3520,14 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>CMTextView</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -3444,7 +3571,7 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">259</int> + <int key="maxID">390</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -3487,7 +3614,6 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <string>changeHasHeaderCheckbox:</string> <string>changeImportMethod:</string> <string>changeTableTarget:</string> - <string>closeAdvancedSheet:</string> <string>closeGlobalValuesSheet:</string> <string>closeSheet:</string> <string>goBackToFileChooser:</string> @@ -3512,7 +3638,6 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <string>id</string> <string>id</string> <string>id</string> - <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> @@ -3521,20 +3646,33 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <bool key="EncodedWithXMLCoder">YES</bool> <string>addGlobalValueButton</string> <string>addRemainingDataSwitch</string> + <string>advancedBox</string> <string>advancedButton</string> - <string>advancedSheet</string> + <string>advancedInsertView</string> + <string>advancedLabel</string> + <string>advancedReplaceView</string> + <string>advancedUpdateView</string> <string>alignByPopup</string> + <string>alignByPopupLabel</string> <string>delayedCheckBox</string> + <string>delayedReplaceCheckBox</string> + <string>fieldMapperTableScrollView</string> <string>fieldMapperTableView</string> <string>fieldMappingImportArray</string> <string>fileSourcePath</string> <string>globalValuesSheet</string> <string>globalValuesTableView</string> + <string>highPriorityCheckBox</string> <string>ignoreCheckBox</string> + <string>ignoreUpdateCheckBox</string> <string>importButton</string> <string>importFieldNamesHeaderSwitch</string> + <string>importMethodLabel</string> <string>importMethodPopup</string> <string>insertNULLValueButton</string> + <string>lowPriorityCheckBox</string> + <string>lowPriorityReplaceCheckBox</string> + <string>lowPriorityUpdateCheckBox</string> <string>matchingNameMenuItem</string> <string>onupdateCheckBox</string> <string>onupdateTextView</string> @@ -3552,8 +3690,15 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> <string>NSPopUpButton</string> <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> <string>NSTableView</string> <string>id</string> <string>NSPathControl</string> @@ -3562,11 +3707,17 @@ VEUJVXBkYXRlIG1hdGNoaW5nIHJvd3MgVVBEQVRFIOKApg</bytes> <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> <string>NSPopUpButton</string> <string>NSButton</string> + <string>id</string> + <string>id</string> + <string>id</string> <string>NSMenuItem</string> <string>id</string> - <string>CMTextView</string> + <string>id</string> <string>id</string> <string>NSButton</string> <string>id</string> diff --git a/Source/CMTextView.m b/Source/CMTextView.m index 4a226ef5..d6a1e9d7 100644 --- a/Source/CMTextView.m +++ b/Source/CMTextView.m @@ -507,7 +507,7 @@ NSInteger alphabeticSort(id string1, id string2, void *reverse) BOOL caretMovedLeft = NO; // Check if caret is located after a ` - if so move caret inside - if([[self string] length] && [[self string] characterAtIndex:caretPos-1] == '`') { + if([[self string] length] && caretPos > 0 && [[self string] characterAtIndex:caretPos-1] == '`') { if([[self string] length] > caretPos && [[self string] characterAtIndex:caretPos] == '`') { ; } else { diff --git a/Source/SPFieldMapperController.h b/Source/SPFieldMapperController.h index 6dc7ffe8..7db0f5c9 100644 --- a/Source/SPFieldMapperController.h +++ b/Source/SPFieldMapperController.h @@ -29,6 +29,7 @@ @interface SPFieldMapperController : NSWindowController { IBOutlet NSTableView *fieldMapperTableView; + IBOutlet id fieldMapperTableScrollView; IBOutlet NSTableView *globalValuesTableView; IBOutlet NSPopUpButton *tableTargetPopup; IBOutlet NSPathControl *fileSourcePath; @@ -39,7 +40,11 @@ IBOutlet id importFieldNamesHeaderSwitch; IBOutlet id addRemainingDataSwitch; IBOutlet id importButton; + IBOutlet id advancedBox; IBOutlet NSPopUpButton *alignByPopup; + IBOutlet id alignByPopupLabel; + IBOutlet id importMethodLabel; + IBOutlet id advancedLabel; IBOutlet NSMenuItem *matchingNameMenuItem; IBOutlet id globalValuesSheet; @@ -48,14 +53,25 @@ IBOutlet NSButton *insertNULLValueButton; IBOutlet id replaceAfterSavingCheckBox; - IBOutlet id advancedSheet; IBOutlet id ignoreCheckBox; + IBOutlet id ignoreUpdateCheckBox; IBOutlet id delayedCheckBox; + IBOutlet id delayedReplaceCheckBox; IBOutlet id onupdateCheckBox; + IBOutlet id lowPriorityCheckBox; + IBOutlet id lowPriorityReplaceCheckBox; + IBOutlet id lowPriorityUpdateCheckBox; + IBOutlet id highPriorityCheckBox; IBOutlet CMTextView *onupdateTextView; + IBOutlet id advancedButton; + IBOutlet id advancedInsertView; + IBOutlet id advancedReplaceView; + IBOutlet id advancedUpdateView; + id theDelegate; + id customQueryInstance; id fieldMappingImportArray; NSInteger fieldMappingCurrentRow; @@ -79,6 +95,7 @@ BOOL fieldMappingImportArrayIsPreview; BOOL importFieldNamesHeader; + BOOL showAdvancedView; NSNumber *lastDisabledCSVFieldcolumn; MCPConnection *mySQLConnection; @@ -86,6 +103,11 @@ NSString *sourcePath; NSUserDefaults *prefs; + + NSInteger heightOffset; + NSUInteger windowMinWidth; + NSUInteger windowMinHeigth; + } @property(retain) NSString* sourcePath; @@ -122,11 +144,11 @@ - (IBAction)removeGlobalValue:(id)sender; - (IBAction)insertNULLValue:(id)sender; - (IBAction)closeGlobalValuesSheet:(id)sender; -- (IBAction)closeAdvancedSheet:(id)sender; - (IBAction)advancedCheckboxValidation:(id)sender; // Others +- (void)resizeWindowByHeightDelta:(NSInteger)delta; - (void)matchHeaderNames; - (void)setupFieldMappingArray; - (void)updateFieldMappingButtonCell; diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m index e6fafe1b..1760d239 100644 --- a/Source/SPFieldMapperController.m +++ b/Source/SPFieldMapperController.m @@ -80,7 +80,11 @@ { // Set source path - [fileSourcePath setURL:[NSURL URLWithString:sourcePath]]; + [fileSourcePath setURL:[NSURL fileURLWithPath:sourcePath]]; + [fileSourcePath setDoubleAction:@selector(goBackToFileChooser:)]; + [onupdateTextView setDelegate:theDelegate]; + windowMinWidth = [[self window] minSize].width; + windowMinHeigth = [[self window] minSize].height; // Init table target popup menu [tableTargetPopup removeAllItems]; @@ -97,9 +101,27 @@ } [importFieldNamesHeaderSwitch setState:importFieldNamesHeader]; - [addRemainingDataSwitch setHidden:YES]; - [addRemainingDataSwitch setState:NSOffState]; - + + [addRemainingDataSwitch setState:NO]; + [ignoreCheckBox setState:NO]; + [ignoreUpdateCheckBox setState:NO]; + [delayedCheckBox setState:NO]; + [delayedReplaceCheckBox setState:NO]; + [onupdateCheckBox setState:NO]; + [lowPriorityCheckBox setState:NO]; + [lowPriorityReplaceCheckBox setState:NO]; + [lowPriorityUpdateCheckBox setState:NO]; + [highPriorityCheckBox setState:NO]; + + [advancedButton setState:NSOffState]; + [advancedBox setHidden:YES]; + + showAdvancedView = NO; + heightOffset = 0; + [advancedReplaceView setHidden:YES]; + [advancedUpdateView setHidden:YES]; + [advancedInsertView setHidden:YES]; + [self changeHasHeaderCheckbox:self]; [self changeTableTarget:self]; [[self window] makeFirstResponder:fieldMapperTableView]; @@ -203,18 +225,25 @@ - (NSString*)importHeaderString { if([[importMethodPopup titleOfSelectedItem] isEqualToString:@"INSERT"]) { - return [NSString stringWithFormat:@"INSERT %@%@INTO ", + return [NSString stringWithFormat:@"INSERT %@%@%@%@INTO ", + ([lowPriorityCheckBox state] == NSOnState) ? @"LOW_PRIORITY " : @"", ([delayedCheckBox state] == NSOnState) ? @"DELAYED " : @"", + ([highPriorityCheckBox state] == NSOnState) ? @"HIGH_PRIORITY " : @"", ([ignoreCheckBox state] == NSOnState) ? @"IGNORE " : @"" ]; } else if([[importMethodPopup titleOfSelectedItem] isEqualToString:@"REPLACE"]) { - return [NSString stringWithFormat:@"REPLACE %@INTO ", - ([delayedCheckBox state] == NSOnState) ? @"DELAYED " : @"" + return [NSString stringWithFormat:@"REPLACE %@%@INTO ", + ([lowPriorityReplaceCheckBox state] == NSOnState) ? @"LOW_PRIORITY " : @"", + ([delayedReplaceCheckBox state] == NSOnState) ? @"DELAYED " : @"" ]; } else if([[importMethodPopup titleOfSelectedItem] isEqualToString:@"UPDATE"]) { - return [NSString stringWithFormat:@"UPDATE %@ SET ", [[self selectedTableTarget] backtickQuotedString]]; + return [NSString stringWithFormat:@"UPDATE %@%@%@ SET ", + ([lowPriorityUpdateCheckBox state] == NSOnState) ? @"LOW_PRIORITY " : @"", + ([ignoreUpdateCheckBox state] == NSOnState) ? @"IGNORE " : @"", + [[self selectedTableTarget] backtickQuotedString] + ]; } return @""; } @@ -232,6 +261,11 @@ - (IBAction)closeSheet:(id)sender { + [advancedReplaceView setHidden:YES]; + [advancedUpdateView setHidden:YES]; + [advancedInsertView setHidden:YES]; + [advancedBox setHidden:YES]; + [self resizeWindowByHeightDelta:0]; [NSApp endSheet:[self window] returnCode:[sender tag]]; } @@ -310,6 +344,15 @@ // Disable Import button if no fields are available [importButton setEnabled:([fieldMappingTableColumnNames count] > 0)]; + // Disable UPDATE import method if target table has less than 2 fields + // and fall back to INSERT if UPDATE was selected + if([fieldMappingTableColumnNames count] > 1) { + [[importMethodPopup itemWithTitle:@"UPDATE"] setEnabled:YES]; + } else { + [[importMethodPopup itemWithTitle:@"UPDATE"] setEnabled:NO]; + if([[importMethodPopup titleOfSelectedItem] isEqualToString:@"UPDATE"]) + [importMethodPopup selectItemWithTitle:@"INSERT"]; + } [self updateFieldNameAlignment]; @@ -321,6 +364,46 @@ { NSInteger i; + [onupdateTextView setBackgroundColor:[NSColor lightGrayColor]]; + [onupdateTextView setEditable:NO]; + [ignoreCheckBox setState:NO]; + [ignoreUpdateCheckBox setState:NO]; + [delayedCheckBox setState:NO]; + [delayedReplaceCheckBox setState:NO]; + [onupdateCheckBox setState:NO]; + [lowPriorityCheckBox setState:NO]; + [lowPriorityReplaceCheckBox setState:NO]; + [lowPriorityUpdateCheckBox setState:NO]; + [highPriorityCheckBox setState:NO]; + + [advancedReplaceView setHidden:YES]; + [advancedUpdateView setHidden:YES]; + [advancedInsertView setHidden:YES]; + + if(showAdvancedView) { + [advancedBox setHidden:NO]; + if([[importMethodPopup titleOfSelectedItem] isEqualToString:@"UPDATE"]) { + [self resizeWindowByHeightDelta:[advancedUpdateView frame].size.height-10]; + [advancedUpdateView setHidden:NO]; + [advancedInsertView setHidden:YES]; + [advancedReplaceView setHidden:YES]; + } + else if([[importMethodPopup titleOfSelectedItem] isEqualToString:@"INSERT"]) { + [self resizeWindowByHeightDelta:[advancedInsertView frame].size.height-20]; + [advancedInsertView setHidden:NO]; + [advancedUpdateView setHidden:YES]; + [advancedReplaceView setHidden:YES]; + } + else if([[importMethodPopup titleOfSelectedItem] isEqualToString:@"REPLACE"]) { + [self resizeWindowByHeightDelta:[advancedReplaceView frame].size.height-10]; + [advancedReplaceView setHidden:NO]; + [advancedUpdateView setHidden:YES]; + [advancedInsertView setHidden:YES]; + } + } else { + [advancedBox setHidden:YES]; + } + // If operator is set to = for UPDATE method replace it by doNotImport if(![[importMethodPopup titleOfSelectedItem] isEqualToString:@"UPDATE"]) { [advancedButton setEnabled:YES]; @@ -331,8 +414,7 @@ } } } else { - [advancedButton setEnabled:NO]; - [addRemainingDataSwitch setHidden:NO]; + [advancedButton setEnabled:YES]; [addRemainingDataSwitch setEnabled:NO]; // TODO HansJB } @@ -417,10 +499,6 @@ [self addGlobalValue:nil]; } -// TDOD this won't be called - WHY? ask HansJB -// - (NSRect)window:(NSWindow *)window willPositionSheet:(NSWindow *)sheet usingRect:(NSRect)rect { -// return NSMakeRect(300,300,50,10); -// } - (IBAction)addGlobalValue:(id)sender { [fieldMappingGlobalValues addObject:@""]; @@ -493,63 +571,123 @@ - (IBAction)openAdvancedSheet:(id)sender { - - if([[importMethodPopup titleOfSelectedItem] isEqualToString:@"REPLACE"]) { - [ignoreCheckBox setEnabled:NO]; - [onupdateCheckBox setEnabled:NO]; - [delayedCheckBox setEnabled:YES]; - [onupdateTextView setBackgroundColor:[NSColor lightGrayColor]]; - [onupdateTextView setEditable:NO]; - } - else if([[importMethodPopup titleOfSelectedItem] isEqualToString:@"INSERT"]) { - [ignoreCheckBox setEnabled:YES]; - [onupdateCheckBox setEnabled:([delayedCheckBox state] == NSOnState) ? NO : YES]; - [delayedCheckBox setEnabled:([onupdateCheckBox state] == NSOnState) ? NO : YES]; - if([onupdateCheckBox state] == NSOffState) { - [onupdateTextView setEditable:NO]; - [onupdateTextView setBackgroundColor:[NSColor lightGrayColor]]; - } else { - [onupdateTextView setEditable:YES]; - [onupdateTextView setBackgroundColor:[NSColor whiteColor]]; - } + showAdvancedView = !showAdvancedView; + if(showAdvancedView) { + [self changeImportMethod:nil]; + } else { + [advancedBox setHidden:YES]; + [advancedReplaceView setHidden:YES]; + [advancedUpdateView setHidden:YES]; + [advancedInsertView setHidden:YES]; + [self resizeWindowByHeightDelta:0]; } - - [advancedSheet makeFirstResponder:ignoreCheckBox]; - - [NSApp beginSheet:advancedSheet - modalForWindow:[self window] - modalDelegate:self - didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:nil]; -} - -- (IBAction)closeAdvancedSheet:(id)sender -{ - [NSApp endSheet:advancedSheet returnCode:[sender tag]]; } - (IBAction)advancedCheckboxValidation:(id)sender { - if([delayedCheckBox state] == NSOnState) - [onupdateCheckBox setState:NO]; - if([onupdateCheckBox state] == NSOnState) { + if(sender == lowPriorityReplaceCheckBox && [lowPriorityReplaceCheckBox state] == NSOnState) { + [delayedReplaceCheckBox setState:NO]; + return; + } + if(sender == delayedReplaceCheckBox && [delayedReplaceCheckBox state] == NSOnState) { + [lowPriorityReplaceCheckBox setState:NO]; + return; + } + + if(sender == lowPriorityCheckBox && [lowPriorityCheckBox state] == NSOnState) { + [highPriorityCheckBox setState:NO]; + [delayedCheckBox setState:NO]; + [onupdateCheckBox setEnabled:YES]; + } + if(sender == highPriorityCheckBox && [highPriorityCheckBox state] == NSOnState) { + [lowPriorityCheckBox setState:NO]; [delayedCheckBox setState:NO]; + [onupdateCheckBox setEnabled:YES]; + } + if(sender == delayedCheckBox) { + if([delayedCheckBox state] == NSOnState) { + [lowPriorityCheckBox setState:NO]; + [highPriorityCheckBox setState:NO]; + [onupdateCheckBox setState:NO]; + [onupdateCheckBox setEnabled:NO]; + } else { + [onupdateCheckBox setEnabled:YES]; + } + } + + if(sender == onupdateCheckBox && [onupdateCheckBox state] == NSOnState) { [onupdateTextView setBackgroundColor:[NSColor whiteColor]]; [onupdateTextView setEditable:YES]; - [advancedSheet makeFirstResponder:onupdateTextView]; - } else { + [[self window] makeFirstResponder:onupdateTextView]; + } + if([onupdateCheckBox state] == NSOffState) { [onupdateTextView setBackgroundColor:[NSColor lightGrayColor]]; [onupdateTextView setEditable:NO]; } - - [onupdateCheckBox setEnabled:([delayedCheckBox state] == NSOnState) ? NO : YES]; - [delayedCheckBox setEnabled:([onupdateCheckBox state] == NSOnState) ? NO : YES]; - } #pragma mark - #pragma mark Others +- (void)resizeWindowByHeightDelta:(NSInteger)delta +{ + NSUInteger tableMask = [fieldMapperTableScrollView autoresizingMask]; + NSUInteger headerSwitchMask = [importFieldNamesHeaderSwitch autoresizingMask]; + NSUInteger alignPopupMask = [alignByPopup autoresizingMask]; + NSUInteger alignPopupLabelMask = [alignByPopupLabel autoresizingMask]; + NSUInteger importMethodLabelMask = [importMethodLabel autoresizingMask]; + NSUInteger importMethodMask = [importMethodPopup autoresizingMask]; + NSUInteger advancedButtonMask = [advancedButton autoresizingMask]; + NSUInteger advancedLabelMask = [advancedLabel autoresizingMask]; + NSUInteger insertViewMask = [advancedInsertView autoresizingMask]; + NSUInteger updateViewMask = [advancedUpdateView autoresizingMask]; + NSUInteger replaceViewMask = [advancedReplaceView autoresizingMask]; + + NSRect frame = [[self window] frame]; + if(frame.size.height>600 && delta > heightOffset) { + frame.origin.y += [advancedInsertView frame].size.height; + frame.size.height -= [advancedInsertView frame].size.height; + [[self window] setFrame:frame display:YES animate:YES]; + } + + [fieldMapperTableScrollView setAutoresizingMask:NSViewNotSizable|NSViewMinYMargin]; + [importFieldNamesHeaderSwitch setAutoresizingMask:NSViewNotSizable|NSViewMinYMargin]; + [alignByPopup setAutoresizingMask:NSViewNotSizable|NSViewMinYMargin]; + [alignByPopupLabel setAutoresizingMask:NSViewNotSizable|NSViewMinYMargin]; + [importMethodLabel setAutoresizingMask:NSViewNotSizable|NSViewMinYMargin]; + [importMethodPopup setAutoresizingMask:NSViewNotSizable|NSViewMinYMargin]; + [advancedButton setAutoresizingMask:NSViewNotSizable|NSViewMinYMargin]; + [advancedLabel setAutoresizingMask:NSViewNotSizable|NSViewMinYMargin]; + [advancedInsertView setAutoresizingMask:NSViewNotSizable|NSViewMinYMargin]; + [advancedUpdateView setAutoresizingMask:NSViewNotSizable|NSViewMinYMargin]; + [advancedReplaceView setAutoresizingMask:NSViewNotSizable|NSViewMinYMargin]; + [advancedBox setAutoresizingMask:NSViewNotSizable|NSViewWidthSizable|NSViewHeightSizable|NSViewMaxXMargin|NSViewMinXMargin]; + + NSInteger newMinHeight = (windowMinHeigth-heightOffset+delta < windowMinHeigth) ? windowMinHeigth : windowMinHeigth-heightOffset+delta; + [[self window] setMinSize:NSMakeSize(windowMinWidth, newMinHeight)]; + frame.origin.y += heightOffset; + frame.size.height -= heightOffset; + heightOffset = delta; + frame.origin.y -= heightOffset; + frame.size.height += heightOffset; + [[self window] setFrame:frame display:YES animate:YES]; + + [fieldMapperTableScrollView setAutoresizingMask:tableMask]; + [importFieldNamesHeaderSwitch setAutoresizingMask:headerSwitchMask]; + [alignByPopup setAutoresizingMask:alignPopupMask]; + [alignByPopupLabel setAutoresizingMask:alignPopupLabelMask]; + [importMethodLabel setAutoresizingMask:importMethodLabelMask]; + [importMethodPopup setAutoresizingMask:importMethodMask]; + [advancedButton setAutoresizingMask:advancedButtonMask]; + [advancedLabel setAutoresizingMask:advancedLabelMask]; + [advancedReplaceView setAutoresizingMask:replaceViewMask]; + [advancedUpdateView setAutoresizingMask:updateViewMask]; + [advancedInsertView setAutoresizingMask:insertViewMask]; + [advancedBox setAutoresizingMask:NSViewNotSizable|NSViewWidthSizable|NSViewMaxYMargin|NSViewMaxXMargin|NSViewMinXMargin]; + +} + - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo { [sheet orderOut:self]; diff --git a/Source/SPQueryController.m b/Source/SPQueryController.m index 8b1b6c8e..911923bd 100644 --- a/Source/SPQueryController.m +++ b/Source/SPQueryController.m @@ -620,7 +620,7 @@ static SPQueryController *sharedQueryController = nil; // Save history items coming from each Untitled document in the global Preferences successively // regardingless of the source document. - if(![[fileURL absoluteString] hasPrefix:@"/"]) { + if(![fileURL isFileURL]) { // Remove all duplicates by using a NSPopUpButton NSPopUpButton *uniquifier = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(0,0,0,0) pullsDown:YES]; diff --git a/Source/TableDocument.m b/Source/TableDocument.m index 69e3a337..689ee253 100644 --- a/Source/TableDocument.m +++ b/Source/TableDocument.m @@ -500,7 +500,7 @@ [spfDocData setObject:[NSNumber numberWithBool:YES] forKey:@"include_session"]; } - [self setFileURL:[NSURL URLWithString:[path stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]]; + [self setFileURL:[NSURL fileURLWithPath:path]]; [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:[NSURL fileURLWithPath:path]]; if([spf objectForKey:SPQueryFavorites]) @@ -2426,7 +2426,7 @@ [[NSDocumentController sharedDocumentController] addDocument:newTableDocument]; [newTableDocument makeWindowControllers]; [newTableDocument showWindows]; - [newTableDocument initWithConnectionFile:[[[self fileURL] absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]; + [newTableDocument initWithConnectionFile:[[self fileURL] path]]; } } @@ -2457,8 +2457,7 @@ */ - (BOOL)isUntitled { - // Check whether fileURL path begins with a '/' - return ([[[self fileURL] absoluteString] hasPrefix:@"/"]) ? NO : YES; + return ([[self fileURL] isFileURL]) ? NO : YES; } #pragma mark - @@ -2553,9 +2552,9 @@ - (void)applicationWillTerminate:(NSNotification *)notification { // Auto-save preferences to spf file based connection - if([self fileURL] && [[[self fileURL] absoluteString] length] && ![self isUntitled]) + if([self fileURL] && [[[self fileURL] path] length] && ![self isUntitled]) if(_isConnected && ![self saveDocumentWithFilePath:nil inBackground:YES onlyPreferences:YES]) { - NSLog(@"Preference data for file ‘%@’ could not be saved.", [[[self fileURL] absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]); + NSLog(@"Preference data for file ‘%@’ could not be saved.", [[self fileURL] path]); NSBeep(); } @@ -2609,7 +2608,7 @@ // If Save was invoked check for fileURL and Untitled docs and save the spf file without save panel // otherwise ask for file name - if(sender != nil && [sender tag] == 1004 && [[[self fileURL] absoluteString] length] && ![self isUntitled]) { + if(sender != nil && [sender tag] == 1004 && [[[self fileURL] path] length] && ![self isUntitled]) { [self saveDocumentWithFilePath:nil inBackground:YES onlyPreferences:NO]; return; } @@ -2646,7 +2645,7 @@ [panel setAccessoryView:saveConnectionAccessory]; // Set file name - if([[[self fileURL] absoluteString] length]) + if([[[self fileURL] path] length]) filename = [self displayName]; else filename = [NSString stringWithFormat:@"%@", [self name]]; @@ -2742,7 +2741,7 @@ NSMutableDictionary *spfDocData_temp = [NSMutableDictionary dictionary]; if(fileName == nil) - fileName = [[[self fileURL] absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + fileName = [[self fileURL] path]; //[[[self fileURL] absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; // Store save panel settings or take them from spfDocData if(!saveInBackground) { @@ -2764,7 +2763,7 @@ if(saveOnlyPreferences) { // Check URL for safety reasons - if(![[[self fileURL] absoluteString] length] || [self isUntitled]) { + if(![[[self fileURL] path] length] || [self isUntitled]) { NSLog(@"Couldn't save data. No file URL found!"); NSBeep(); return NO; @@ -3010,9 +3009,9 @@ [preferences setObject:[spfdata objectForKey:SPQueryHistory] forKey:SPQueryHistory]; [preferences setObject:[spfdata objectForKey:SPQueryFavorites] forKey:SPQueryFavorites]; [preferences setObject:[spfdata objectForKey:SPContentFilters] forKey:SPContentFilters]; - [[SPQueryController sharedQueryController] registerDocumentWithFileURL:[NSURL URLWithString:[fileName stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]] andContextInfo:preferences]; + [[SPQueryController sharedQueryController] registerDocumentWithFileURL:[NSURL fileURLWithPath:fileName] andContextInfo:preferences]; - [self setFileURL:[NSURL URLWithString:[fileName stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding]]]; + [self setFileURL:[NSURL fileURLWithPath:fileName]]; [[NSDocumentController sharedDocumentController] noteNewRecentDocumentURL:[NSURL fileURLWithPath:fileName]]; [tableWindow setTitle:[self displaySPName]]; @@ -3687,7 +3686,7 @@ if ( ![tablesListInstance selectionShouldChangeInTableView:nil] ) return NO; // Auto-save spf file based connection and return whether the save was successful - if([self fileURL] && [[[self fileURL] absoluteString] length] && ![self isUntitled]) { + if([self fileURL] && [[[self fileURL] path] length] && ![self isUntitled]) { BOOL isSaved = [self saveDocumentWithFilePath:nil inBackground:YES onlyPreferences:YES]; if(isSaved) [[SPQueryController sharedQueryController] removeRegisteredDocumentWithFileURL:[self fileURL]]; @@ -3736,7 +3735,7 @@ */ - (BOOL)isDocumentEdited { - return ([self fileURL] && [[[self fileURL] absoluteString] length] && [self isUntitled] && ([[[SPQueryController sharedQueryController] favoritesForFileURL:[self fileURL]] count] + return ([self fileURL] && [[[self fileURL] path] length] && [self isUntitled] && ([[[SPQueryController sharedQueryController] favoritesForFileURL:[self fileURL]] count] || [[[[SPQueryController sharedQueryController] contentFilterForFileURL:[self fileURL]] objectForKey:@"number"] count] || [[[[SPQueryController sharedQueryController] contentFilterForFileURL:[self fileURL]] objectForKey:@"date"] count] || [[[[SPQueryController sharedQueryController] contentFilterForFileURL:[self fileURL]] objectForKey:@"string"] count]) @@ -3750,12 +3749,12 @@ { if (!_isConnected) { return [NSString stringWithFormat:@"%@%@", - ([[[self fileURL] absoluteString] length] && ![self isUntitled]) ? [NSString stringWithFormat:@"%@ — ",[[[[self fileURL] absoluteString] lastPathComponent] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]] : @"", @"Sequel Pro"]; + ([[[self fileURL] path] length] && ![self isUntitled]) ? [NSString stringWithFormat:@"%@ — ",[[[self fileURL] path] lastPathComponent]] : @"", @"Sequel Pro"]; } return [NSString stringWithFormat:@"%@(MySQL %@) %@%@%@", - ([[[self fileURL] absoluteString] length] && ![self isUntitled]) ? [NSString stringWithFormat:@"%@ — ",[self displayName]] : @"", + ([[[self fileURL] path] length] && ![self isUntitled]) ? [NSString stringWithFormat:@"%@ — ",[self displayName]] : @"", mySQLVersion, [self name], ([self database]?[NSString stringWithFormat:@"/%@",[self database]]:@""), @@ -3767,7 +3766,7 @@ - (NSString *)displayName { if(!_isConnected) return [self displaySPName]; - return [[[[self fileURL] absoluteString] lastPathComponent] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding]; + return [[[self fileURL] path] lastPathComponent]; } #pragma mark - diff --git a/Source/TableDump.m b/Source/TableDump.m index 4ee19c57..222e9715 100644 --- a/Source/TableDump.m +++ b/Source/TableDump.m @@ -990,7 +990,7 @@ query = [[NSMutableString alloc] initWithString:insertBaseString]; for (i = 0; i < csvRowsPerQuery && i < [parsedRows count]; i++) { if (i > 0) [query appendString:@",\n"]; - [query appendString:[self mappedValueStringForRowArray:[parsedRows objectAtIndex:i]]]; + [query appendString:[[self mappedValueStringForRowArray:[parsedRows objectAtIndex:i]] description]]; csvRowsThisQuery++; if ([query length] > 250000) break; } @@ -1004,6 +1004,7 @@ } else { for (i = 0; i < [parsedRows count]; i++) { if (progressCancelled) break; + query = [[NSMutableString alloc] initWithString:insertBaseString]; [query appendString:[self mappedUpdateSetStatementStringForRowArray:[parsedRows objectAtIndex:i]]]; |