aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoravenjamin <avenjamin@gmail.com>2008-12-06 14:06:25 +0000
committeravenjamin <avenjamin@gmail.com>2008-12-06 14:06:25 +0000
commit1a7130fea502cf627897984fc5a8453e9df9ab00 (patch)
tree7aec6ce256bc0d8d71c7ad4cf92d99e0c478c7d4
parente9aef1487ae6f889b5c98b48263a95140e89a274 (diff)
downloadsequelpro-1a7130fea502cf627897984fc5a8453e9df9ab00.tar.gz
sequelpro-1a7130fea502cf627897984fc5a8453e9df9ab00.tar.bz2
sequelpro-1a7130fea502cf627897984fc5a8453e9df9ab00.zip
Known Issue for field mapping when importing a CSV file now resolved.
No longer required to select a table first before selecting the Import... menu item
-rw-r--r--English.lproj/DBView.xib16
-rw-r--r--TableDump.h4
-rw-r--r--TableDump.m4
-rw-r--r--TablesList.h1
-rw-r--r--TablesList.m5
5 files changed, 24 insertions, 6 deletions
diff --git a/English.lproj/DBView.xib b/English.lproj/DBView.xib
index 5c1c3981..6a3f5332 100644
--- a/English.lproj/DBView.xib
+++ b/English.lproj/DBView.xib
@@ -11720,6 +11720,14 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<int key="connectionID">4681</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">tableListView</string>
+ <reference key="source" ref="225526897"/>
+ <reference key="destination" ref="251040077"/>
+ </object>
+ <int key="connectionID">4683</int>
+ </object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects">
@@ -19243,8 +19251,8 @@ IGRvIHlvdSB3YW50IHRvIGFkZCBmb3IgdGhpcyBmaWVsZD8</string>
</object>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{208, 308}, {863, 550}}</string>
- <string>{{208, 308}, {863, 550}}</string>
+ <string>{{774, 505}, {863, 550}}</string>
+ <string>{{774, 505}, {863, 550}}</string>
<reference ref="9"/>
<reference ref="9"/>
<string>{{62, 352}, {845, 504}}</string>
@@ -19657,7 +19665,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">4682</int>
+ <int key="maxID">4683</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -20225,6 +20233,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<string>singleProgressText</string>
<string>tableContentInstance</string>
<string>tableDocumentInstance</string>
+ <string>tableListView</string>
<string>tableSourceInstance</string>
<string>tableWindow</string>
<string>tablesListInstance</string>
@@ -20277,6 +20286,7 @@ Y2hhbmdlIHRoZSBvcmRlcg</string>
<string>id</string>
<string>id</string>
<string>id</string>
+ <string>id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
diff --git a/TableDump.h b/TableDump.h
index 092999cc..13ba4493 100644
--- a/TableDump.h
+++ b/TableDump.h
@@ -36,7 +36,9 @@
IBOutlet id tableContentInstance;
IBOutlet id customQueryInstance;
- IBOutlet id tableWindow;
+ IBOutlet id tableWindow;
+ IBOutlet id tableListView;
+
IBOutlet id exportDumpView;
IBOutlet id exportCSVView;
IBOutlet id exportMultipleCSVView;
diff --git a/TableDump.m b/TableDump.m
index 93204438..0fbd48d0 100644
--- a/TableDump.m
+++ b/TableDump.m
@@ -291,7 +291,7 @@
{
NSPopUpButtonCell *buttonCell = [[NSPopUpButtonCell alloc] init];
- [tableSourceInstance loadTable:[fieldMappingPopup titleOfSelectedItem]];
+ [tableListView selectRowIndexes:[NSIndexSet indexSetWithIndex:[[tablesListInstance tables] indexOfObject:[fieldMappingPopup titleOfSelectedItem]]] byExtendingSelection:NO];
//set up tableView
currentRow = 0;
@@ -466,7 +466,7 @@
[fieldMappingPopup selectItemAtIndex:0];
}
- [tableSourceInstance loadTable:[fieldMappingPopup titleOfSelectedItem]];
+ [tableListView selectRowIndexes:[NSIndexSet indexSetWithIndex:[[tablesListInstance tables] indexOfObject:[fieldMappingPopup titleOfSelectedItem]]] byExtendingSelection:NO];
//set up tableView
currentRow = 0;
diff --git a/TablesList.h b/TablesList.h
index 84bb5e4e..d7d37d2e 100644
--- a/TablesList.h
+++ b/TablesList.h
@@ -69,6 +69,7 @@
//getter methods
- (NSString *)table;
+- (NSArray *)tables;
- (BOOL)structureLoaded;
- (BOOL)contentLoaded;
- (BOOL)statusLoaded;
diff --git a/TablesList.m b/TablesList.m
index 454b6dd8..32104d9b 100644
--- a/TablesList.m
+++ b/TablesList.m
@@ -307,6 +307,11 @@ returns the currently selected table or nil if no table or mulitple tables are s
}
}
+- (NSArray *)tables
+{
+ return tables;
+}
+
/*
returns YES if table source has already been loaded
*/