From 0275c3e833774f4a762ecd8587e26d9f7edcfc88 Mon Sep 17 00:00:00 2001 From: Bibiko Date: Wed, 29 Sep 2010 08:26:53 +0000 Subject: =?UTF-8?q?=E2=80=A2=20Filter=20Table=20-=20fixed=20thread=20issue?= =?UTF-8?q?=20while=20loading=20a=20new=20table=20-=20fixed=20DBView.xib?= =?UTF-8?q?=20warnings?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Source/SPTableContent.m | 10 ++++++++++ Source/SPTablesList.m | 3 --- 2 files changed, 10 insertions(+), 3 deletions(-) (limited to 'Source') diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 73441466..26cdb96b 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -371,6 +371,14 @@ // Clear restoration settings [self clearDetailsToRestore]; + // Clear filter table + while ([[filterTableView tableColumns] count]) { + [filterTableView removeTableColumn:NSArrayObjectAtIndex([filterTableView tableColumns], 0)]; + } + // Clear filter table data + [filterTableData removeAllObjects]; + [filterTableWhereClause setString:@""]; + activeFilter = 0; return; } @@ -381,6 +389,7 @@ [tableContentView removeTableColumn:NSArrayObjectAtIndex([tableContentView tableColumns], 0)]; } // Remove existing columns from the filter table + [filterTableView abortEditing]; while ([[filterTableView tableColumns] count]) { [filterTableView removeTableColumn:NSArrayObjectAtIndex([filterTableView tableColumns], 0)]; } @@ -504,6 +513,7 @@ [filterTableView setDelegate:self]; [filterTableView setDataSource:self]; + [filterTableView reloadData]; // If the table has been reloaded and the previously selected sort column is still present, reselect it. if (sortColumnNumberToRestore) { diff --git a/Source/SPTablesList.m b/Source/SPTablesList.m index c9192147..9f409e57 100644 --- a/Source/SPTablesList.m +++ b/Source/SPTablesList.m @@ -1516,9 +1516,6 @@ - (void)tableViewSelectionDidChange:(NSNotification *)aNotification { - // Clear Content's Filter Table - [tableContentInstance tableFilterClear:nil]; - if([tablesListView selectedRow] < 0) { // Reset all if (selectedTableName) [selectedTableName release]; -- cgit v1.2.3