Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
Minor changes
  • Loading branch information
dmoagx committed May 13, 2018
1 parent c2fe67b commit 146d45c
Show file tree
Hide file tree
Showing 6 changed files with 10 additions and 11 deletions.
2 changes: 1 addition & 1 deletion Source/SPContentFilterManager.m
Expand Up @@ -33,7 +33,6 @@
#import "RegexKitLite.h"
#import "SPQueryController.h"
#import "SPDatabaseDocument.h"
#import "SPTableContent.h"
#import "SPConnectionController.h"
#import "SPSplitView.h"
#import "SPAppController.h"
Expand Down Expand Up @@ -218,6 +217,7 @@ - (NSMutableArray *)contentFilterForFileURL:(NSURL *)fileURL
*/
- (id)customQueryInstance
{
#warning private ivar accessed from outside
return [tableDocumentInstance valueForKey:@"customQueryInstance"];
}

Expand Down
1 change: 0 additions & 1 deletion Source/SPDataImport.m
Expand Up @@ -34,7 +34,6 @@
#import "SPTablesList.h"
#import "SPTableStructure.h"
#import "SPDatabaseStructure.h"
#import "SPTableContent.h"
#import "SPCustomQuery.h"
#import "SPGrowlController.h"
#import "SPSQLParser.h"
Expand Down
1 change: 1 addition & 0 deletions Source/SPHistoryController.m
Expand Up @@ -58,6 +58,7 @@ - (id) init

- (void) awakeFromNib
{
#warning private ivar accessed from outside
tableContentInstance = [theDocument valueForKey:@"tableContentInstance"];
tablesListInstance = [theDocument valueForKey:@"tablesListInstance"];
toolbarItemVisible = NO;
Expand Down
1 change: 0 additions & 1 deletion Source/SPIndexesController.m
Expand Up @@ -31,7 +31,6 @@
#import "SPIndexesController.h"
#import "SPAlertSheets.h"
#import "SPServerSupport.h"
#import "SPTableContent.h"
#import "SPTableData.h"
#import "SPDatabaseDocument.h"
#import "SPTablesList.h"
Expand Down
2 changes: 1 addition & 1 deletion Source/SPTableContent.h
Expand Up @@ -231,7 +231,7 @@ typedef NS_ENUM(NSInteger, SPTableContentFilterSource) {
- (IBAction)addRow:(id)sender;
- (IBAction)duplicateRow:(id)sender;
- (IBAction)removeRow:(id)sender;
- (void)removeRowSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo;
- (void)removeRowSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo;

// Filter Table
- (IBAction)showFilterTable:(id)sender;
Expand Down
14 changes: 7 additions & 7 deletions Source/SPTableContent.m
Expand Up @@ -1809,10 +1809,10 @@ - (IBAction)removeRow:(id)sender
if (![tableContentView numberOfSelectedRows]) return;

NSAlert *alert = [NSAlert alertWithMessageText:@""
defaultButton:NSLocalizedString(@"Delete", @"delete button")
alternateButton:NSLocalizedString(@"Cancel", @"cancel button")
otherButton:nil
informativeTextWithFormat:@""];
defaultButton:NSLocalizedString(@"Delete", @"delete button")
alternateButton:NSLocalizedString(@"Cancel", @"cancel button")
otherButton:nil
informativeTextWithFormat:@""];

[alert setAlertStyle:NSCriticalAlertStyle];

Expand Down Expand Up @@ -1869,7 +1869,7 @@ - (IBAction)removeRow:(id)sender
/**
* Perform the requested row deletion action.
*/
- (void)removeRowSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(NSString *)contextInfo
- (void)removeRowSheetDidEnd:(NSAlert *)alert returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo
{
NSMutableIndexSet *selectedRows = [NSMutableIndexSet indexSet];
NSString *wherePart;
Expand Down Expand Up @@ -2389,8 +2389,8 @@ - (void)clickLinkArrowTask:(SPTextAndLinkCell *)theArrowCell

// Store the filter details to use when loading the target table
NSDictionary *filterSettings = [SPRuleFilterController makeSerializedFilterForColumn:[refDictionary objectForKey:@"column"]
operator:filterComparison
values:@[targetFilterValue]];
operator:filterComparison
values:@[targetFilterValue]];

// If the link is within the current table, apply filter settings manually
if ([[refDictionary objectForKey:@"table"] isEqualToString:selectedTable]) {
Expand Down

0 comments on commit 146d45c

Please sign in to comment.