From 19d3956c14f63872981ab292e7498ac4505e1fae Mon Sep 17 00:00:00 2001 From: rowanbeentje Date: Thu, 13 Aug 2009 00:57:43 +0000 Subject: - Rework TableContent row count fetching, loading it in the correct locations, and correcting the logic for fetching the count of rows so that the query is not used where not necessary. - Update the Table Info pane and tab with a new row count if one is known - this addresses Issue #141 - This reverts r1090, and so needs to be discussed with stuart02 - the rest of the row logic changes may have fixed the 'larger issue' described there? --- Source/TableContent.h | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'Source/TableContent.h') diff --git a/Source/TableContent.h b/Source/TableContent.h index ea09a325..e389c8df 100644 --- a/Source/TableContent.h +++ b/Source/TableContent.h @@ -28,13 +28,14 @@ #import #import -@class CMCopyTable, SPTextAndLinkCell, SPHistoryController; +@class CMCopyTable, SPTextAndLinkCell, SPHistoryController, SPTableInfo; @interface TableContent : NSObject { IBOutlet id tableDocumentInstance; IBOutlet id tablesListInstance; IBOutlet id tableDataInstance; + IBOutlet SPTableInfo *tableInfoInstance; IBOutlet SPHistoryController *spHistoryControllerInstance; IBOutlet id tableWindow; @@ -59,9 +60,9 @@ NSString *compareType; NSNumber *sortCol; BOOL isEditingRow, isEditingNewRow, isSavingRow, isDesc, setLimit; - BOOL isFiltered, isLimited; + BOOL isFiltered, isLimited, maxNumRowsIsEstimate; NSUserDefaults *prefs; - int numRows, currentlyEditingRow, maxNumRowsOfCurrentTable; + int currentlyEditingRow, maxNumRows; BOOL sortColumnToRestoreIsAsc; NSString *sortColumnToRestore; @@ -105,7 +106,7 @@ - (BOOL)tableContainsBlobOrTextColumns; - (NSString *)fieldListForQuery; - (void)sheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode contextInfo:(NSString *)contextInfo; -- (int)getNumberOfRows; +- (void)updateNumberOfRows; - (int)fetchNumberOfRows; - (BOOL)saveRowOnDeselect; -- cgit v1.2.3