diff options
Diffstat (limited to 'Source/SPTableContent.h')
| -rw-r--r-- | Source/SPTableContent.h | 49 |
1 files changed, 41 insertions, 8 deletions
diff --git a/Source/SPTableContent.h b/Source/SPTableContent.h index 9045772e..9220b21d 100644 --- a/Source/SPTableContent.h +++ b/Source/SPTableContent.h @@ -29,11 +29,12 @@ @class SPDatabaseDocument, SPCopyTable, SPTextAndLinkCell, SPHistoryController, SPTableInfo, SPDataStorage, SPTextView, SPFieldEditorController; -@class SPTableData, SPDatabaseDocument, SPTablesList; +@class SPTableData, SPDatabaseDocument, SPTablesList, SPTableStructure, SPTableList; +#ifndef SP_REFACTOR @interface SPTableContent : NSObject -#ifdef SP_REFACTOR -<NSTableViewDelegate, NSTableViewDataSource> +#else +@interface SPTableContent : NSObject <NSTableViewDelegate, NSTableViewDataSource, NSComboBoxDataSource, NSComboBoxDelegate> #endif { IBOutlet SPDatabaseDocument *tableDocumentInstance; @@ -41,8 +42,10 @@ IBOutlet SPTableData* tableDataInstance; IBOutlet id tableSourceInstance; +#ifndef SP_REFACTOR IBOutlet SPTableInfo *tableInfoInstance; IBOutlet SPHistoryController *spHistoryControllerInstance; +#endif IBOutlet SPCopyTable *tableContentView; IBOutlet NSPopUpButton *fieldField; @@ -53,21 +56,28 @@ IBOutlet id copyButton; IBOutlet id removeButton; IBOutlet id reloadButton; +#ifndef SP_REFACTOR IBOutlet id multipleLineEditingButton; IBOutlet id countText; IBOutlet id limitRowsField; IBOutlet id limitRowsButton; IBOutlet id limitRowsStepper; +#endif IBOutlet id firstBetweenField; IBOutlet id secondBetweenField; IBOutlet id betweenTextField; IBOutlet NSButton *paginationPreviousButton; +#ifndef SP_REFACTOR IBOutlet NSButton *paginationButton; +#endif IBOutlet NSButton *paginationNextButton; +#ifndef SP_REFACTOR IBOutlet NSView *contentViewPane; IBOutlet NSView *paginationView; +#endif IBOutlet NSTextField *paginationPageField; +#ifndef SP_REFACTOR IBOutlet NSStepper *paginationPageStepper; IBOutlet SPCopyTable *filterTableView; @@ -81,13 +91,15 @@ IBOutlet NSMenuItem *filterTableGearLookAllFields; IBOutlet NSPanel *filterTableSetDefaultOperatorSheet; IBOutlet NSComboBox* filterTableSetDefaultOperatorValue; - +#endif MCPConnection *mySQLConnection; BOOL _mainNibLoaded; BOOL isWorking; pthread_mutex_t tableValuesLock; +#ifndef SP_REFACTOR NSMutableArray *nibObjectsToRelease; +#endif NSString *selectedTable, *usedQuery; SPDataStorage *tableValues; @@ -106,6 +118,7 @@ id contentFilterManager; NSUInteger contentPage; +#ifndef SP_REFACTOR NSMutableDictionary *filterTableData; BOOL filterTableNegate; BOOL filterTableDistinct; @@ -114,6 +127,7 @@ NSString *lastEditedFilterTableValue; NSInteger activeFilter; // 0 = default filter; 1 = filter table; 2 = sequelpro url scheme NSString *schemeFilter; +#endif BOOL sortColumnToRestoreIsAsc; BOOL tableRowsSelectable; @@ -123,7 +137,9 @@ NSRect selectionViewportToRestore; NSString *filterFieldToRestore, *filterComparisonToRestore, *filterValueToRestore, *firstBetweenValueToRestore, *secondBetweenValueToRestore; +#ifndef SP_REFACTOR NSInteger paginationViewHeight; +#endif NSTimer *tableLoadTimer; NSUInteger tableLoadInterfaceUpdateInterval, tableLoadTimerTicksSinceLastUpdate, tableLoadLastRowCount, tableLoadTargetRowCount; @@ -144,7 +160,6 @@ } - - (void)setFieldEditorSelectedRange:(NSRange)aRange; - (NSRange)fieldEditorSelectedRange; @@ -169,7 +184,9 @@ // Pagination - (IBAction) navigatePaginationFromButton:(id)sender; +#ifndef SP_REFACTOR - (IBAction) togglePagination:(id)sender; +#endif - (void) setPaginationViewVisibility:(BOOL)makeVisible; - (void) updatePaginationState; @@ -247,9 +264,25 @@ - (NSString*)escapeFilterTableDefaultOperator:(NSString*)anOperator; #ifdef SP_REFACTOR /* glue */ -- (void)setDatabaseDocument:(SPDatabaseDocument*)doc; -- (void)setTableListInstance:(SPTablesList*)list; -- (void)setConnection:(MCPConnection *)theConnection; +@property (assign) id filterButton; +@property (assign) id fieldField; +@property (assign) id compareField; +@property (assign) id betweenTextField; +@property (assign) id firstBetweenField; +@property (assign) id secondBetweenField; +@property (assign) id argumentField; +@property (assign) NSButton* addButton; +@property (assign) NSButton* copyButton; +@property (assign) NSButton* removeButton; +@property (assign) NSButton* reloadButton; +@property (assign) NSButton* paginationNextButton; +@property (assign) NSButton* paginationPreviousButton; +@property (assign) NSTextField* paginationPageField; +@property (assign) SPDatabaseDocument* tableDocumentInstance; +@property (assign) SPTablesList* tablesListInstance; +@property (assign) SPCopyTable* tableContentView; +@property (assign) SPTableData* tableDataInstance; +@property (assign) SPTableStructure* tableSourceInstance; #endif @end |