aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--English.lproj/MainMenu.xib123
-rw-r--r--TableDocument.h1
-rw-r--r--TableDocument.m7
3 files changed, 17 insertions, 114 deletions
diff --git a/English.lproj/MainMenu.xib b/English.lproj/MainMenu.xib
index 7dc4e9d7..de716930 100644
--- a/English.lproj/MainMenu.xib
+++ b/English.lproj/MainMenu.xib
@@ -8,7 +8,7 @@
<string key="IBDocument.HIToolboxVersion">352.00</string>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool>
- <integer value="57"/>
+ <integer value="81"/>
</object>
<object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool>
@@ -264,50 +264,12 @@
</object>
<object class="NSMenuItem" id="867960923">
<reference key="NSMenu" ref="709725194"/>
- <string key="NSTitle">Import</string>
+ <string type="base64-UTF8" key="NSTitle">SW1wb3J04oCmA</string>
<string key="NSKeyEquiv"/>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="625762401"/>
<reference key="NSMixedImage" ref="315854375"/>
- <string key="NSAction">submenuAction:</string>
- <object class="NSMenu" key="NSSubmenu" id="310287021">
- <string key="NSTitle">Import</string>
- <object class="NSMutableArray" key="NSMenuItems">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <object class="NSMenuItem" id="294566754">
- <reference key="NSMenu" ref="310287021"/>
- <string type="base64-UTF8" key="NSTitle">TXlTUUwgZHVtcOKApg</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="625762401"/>
- <reference key="NSMixedImage" ref="315854375"/>
- <int key="NSTag">1</int>
- </object>
- <object class="NSMenuItem" id="568740738">
- <reference key="NSMenu" ref="310287021"/>
- <bool key="NSIsDisabled">YES</bool>
- <bool key="NSIsSeparator">YES</bool>
- <string key="NSTitle"/>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="625762401"/>
- <reference key="NSMixedImage" ref="315854375"/>
- </object>
- <object class="NSMenuItem" id="810146166">
- <reference key="NSMenu" ref="310287021"/>
- <string type="base64-UTF8" key="NSTitle">Q1NWIGZpbGXigKY</string>
- <string key="NSKeyEquiv"/>
- <int key="NSKeyEquivModMask">1048576</int>
- <int key="NSMnemonicLoc">2147483647</int>
- <reference key="NSOnImage" ref="625762401"/>
- <reference key="NSMixedImage" ref="315854375"/>
- <int key="NSTag">2</int>
- </object>
- </object>
- </object>
</object>
<object class="NSMenuItem" id="258329286">
<reference key="NSMenu" ref="709725194"/>
@@ -3227,14 +3189,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">import:</string>
- <reference key="source" ref="63651044"/>
- <reference key="destination" ref="294566754"/>
- </object>
- <int key="connectionID">425</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
<string key="label">export:</string>
<reference key="source" ref="63651044"/>
<reference key="destination" ref="183322562"/>
@@ -3651,14 +3605,6 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
- <string key="label">importCSV:</string>
- <reference key="source" ref="63651044"/>
- <reference key="destination" ref="810146166"/>
- </object>
- <int key="connectionID">678</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBActionConnection" key="connection">
<string key="label">exportTable:</string>
<reference key="source" ref="63651044"/>
<reference key="destination" ref="146976252"/>
@@ -3825,6 +3771,14 @@
</object>
<int key="connectionID">810</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBActionConnection" key="connection">
+ <string key="label">import:</string>
+ <reference key="source" ref="63651044"/>
+ <reference key="destination" ref="867960923"/>
+ </object>
+ <int key="connectionID">811</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -4087,37 +4041,10 @@
<reference key="object" ref="867960923"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="310287021"/>
</object>
<reference key="parent" ref="709725194"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">370</int>
- <reference key="object" ref="310287021"/>
- <object class="NSMutableArray" key="children">
- <bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="294566754"/>
- <reference ref="810146166"/>
- <reference ref="568740738"/>
- </object>
- <reference key="parent" ref="867960923"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">371</int>
- <reference key="object" ref="294566754"/>
- <reference key="parent" ref="310287021"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">375</int>
- <reference key="object" ref="810146166"/>
- <reference key="parent" ref="310287021"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">379</int>
- <reference key="object" ref="568740738"/>
- <reference key="parent" ref="310287021"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">372</int>
<reference key="object" ref="258329286"/>
<object class="NSMutableArray" key="children">
@@ -6002,26 +5929,16 @@
<string>324.ImportedFromIB2</string>
<string>369.IBPluginDependency</string>
<string>369.ImportedFromIB2</string>
- <string>370.IBEditorWindowLastContentRect</string>
- <string>370.IBPluginDependency</string>
- <string>370.ImportedFromIB2</string>
- <string>370.editorWindowContentRectSynchronizationRect</string>
- <string>371.IBPluginDependency</string>
- <string>371.ImportedFromIB2</string>
<string>372.IBPluginDependency</string>
<string>372.ImportedFromIB2</string>
<string>373.IBEditorWindowLastContentRect</string>
<string>373.IBPluginDependency</string>
<string>373.ImportedFromIB2</string>
<string>373.editorWindowContentRectSynchronizationRect</string>
- <string>375.IBPluginDependency</string>
- <string>375.ImportedFromIB2</string>
<string>377.IBPluginDependency</string>
<string>377.ImportedFromIB2</string>
<string>378.IBPluginDependency</string>
<string>378.ImportedFromIB2</string>
- <string>379.IBPluginDependency</string>
- <string>379.ImportedFromIB2</string>
<string>385.IBPluginDependency</string>
<string>385.ImportedFromIB2</string>
<string>386.IBEditorWindowLastContentRect</string>
@@ -6568,7 +6485,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{123, 602}, {511, 20}}</string>
+ <string>{{244, 424}, {511, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{506, 836}, {511, 20}}</string>
@@ -6596,15 +6513,9 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{442, 370}, {172, 53}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>{{399, 525}, {172, 53}}</string>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{442, 340}, {213, 93}}</string>
+ <string>{{434, 429}, {213, 93}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{399, 465}, {213, 93}}</string>
@@ -6614,10 +6525,6 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
- <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <reference ref="9"/>
<string>{{655, 360}, {136, 43}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
@@ -6892,7 +6799,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string>{{237, 330}, {205, 153}}</string>
+ <string>{{350, 271}, {205, 153}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
<string>{{180, 535}, {182, 253}}</string>
@@ -6924,7 +6831,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">810</int>
+ <int key="maxID">811</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -7157,6 +7064,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<bool key="EncodedWithXMLCoder">YES</bool>
<string>addDatabase:</string>
<string>analyzeTable:</string>
+ <string>cancelConnectSheet:</string>
<string>checkTable:</string>
<string>checksumTable:</string>
<string>chooseDatabase:</string>
@@ -7222,6 +7130,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="NSMutableDictionary" key="outlets">
diff --git a/TableDocument.h b/TableDocument.h
index fe0ee0eb..e1e4afe9 100644
--- a/TableDocument.h
+++ b/TableDocument.h
@@ -173,7 +173,6 @@
//menu methods
- (BOOL)validateMenuItem:(NSMenuItem *)anItem;
- (IBAction)import:(id)sender;
-- (IBAction)importCSV:(id)sender;
- (IBAction)export:(id)sender;
- (IBAction)exportTable:(id)sender;
- (IBAction)exportMultipleTables:(id)sender;
diff --git a/TableDocument.m b/TableDocument.m
index 968a9480..f473dfd2 100644
--- a/TableDocument.m
+++ b/TableDocument.m
@@ -1099,12 +1099,7 @@ NSString *TableDocumentFavoritesControllerFavoritesDidChange = @"TableDocumentFa
passes the request to the tableDump object
*/
{
- [tableDumpInstance importFile:[sender tag]];
-}
-
-- (IBAction)importCSV:(id)sender
-{
- return [self import:sender];
+ [tableDumpInstance importFile];
}
- (IBAction)export:(id)sender
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-01 00:41:47 +0000