Skip to content

Commit 2252b66

Browse files
dmoagxdmoagx
committed
Formatting changes
1 parent 30bd18e commit 2252b66

File tree

3 files changed

+43
-36
lines changed

3 files changed

+43
-36
lines changed

‎Source/SPContentFilterManager.m‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,10 @@ - (void)awakeFromNib
8989

9090
// Add global group row to contentFilters
9191
[contentFilters addObject:@{
92-
@"MenuLabel" : NSLocalizedString(@"Global", @"Content Filter Manager : Filter Entry List: 'Global' Header"),
93-
@"headerOfFileURL" : @"",
94-
@"Clause" : @"",
95-
@"ConjunctionLabel" : @""
92+
@"MenuLabel" : NSLocalizedString(@"Global", @"Content Filter Manager : Filter Entry List: 'Global' Header"),
93+
@"headerOfFileURL" : @"",
94+
@"Clause" : @"",
95+
@"ConjunctionLabel" : @""
9696
}];
9797

9898
#ifndef SP_CODA /* prefs access */
@@ -940,16 +940,16 @@ - (void)savePanelDidEnd:(NSSavePanel *)panel returnCode:(NSInteger)returnCode co
940940

941941
NSError *error = nil;
942942
NSData *plist = [NSPropertyListSerialization dataWithPropertyList:spfdata
943-
format:NSPropertyListXMLFormat_v1_0
944-
options:0
945-
error:&error];
943+
format:NSPropertyListXMLFormat_v1_0
944+
options:0
945+
error:&error];
946946

947947
if(error) {
948948
NSAlert *alert = [NSAlert alertWithMessageText:NSLocalizedString(@"Error while converting content filter data", @"Content filters could not be converted to plist upon export - message title (ContentFilterManager)")
949-
defaultButton:NSLocalizedString(@"OK", @"OK button")
950-
alternateButton:nil
951-
otherButton:nil
952-
informativeTextWithFormat:@"%@", [error localizedDescription]];
949+
defaultButton:NSLocalizedString(@"OK", @"OK button")
950+
alternateButton:nil
951+
otherButton:nil
952+
informativeTextWithFormat:@"%@", [error localizedDescription]];
953953

954954
[alert setAlertStyle:NSCriticalAlertStyle];
955955
[alert runModal];

‎Source/SPTableContent.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
IBOutlet id reloadButton;
7676
#ifndef SP_CODA
7777
IBOutlet NSButton *multipleLineEditingButton;
78-
IBOutlet id countText;
78+
IBOutlet NSTextField *countText;
7979
IBOutlet id limitRowsField;
8080
IBOutlet id limitRowsButton;
8181
IBOutlet id limitRowsStepper;

‎Source/SPTableContent.m‎

Lines changed: 31 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -182,14 +182,14 @@ - (id)init
182182
NSError *readError = nil;
183183
NSString *filePath = [NSBundle pathForResource:@"ContentFilters.plist" ofType:nil inDirectory:[[NSBundle mainBundle] bundlePath]];
184184
NSData *defaultFilterData = [NSData dataWithContentsOfFile:filePath
185-
options:NSMappedRead
186-
error:&readError];
187-
188-
if(defaultFilterData && !readError) {
185+
options:NSMappedRead
186+
error:&readError];
187+
188+
if (defaultFilterData && !readError) {
189189
NSDictionary *defaultFilterDict = [NSPropertyListSerialization propertyListWithData:defaultFilterData
190-
options:NSPropertyListMutableContainersAndLeaves
191-
format:NULL
192-
error:&readError];
190+
options:NSPropertyListMutableContainersAndLeaves
191+
format:NULL
192+
error:&readError];
193193

194194
if(defaultFilterDict && !readError) {
195195
[contentFilters setDictionary:defaultFilterDict];
@@ -289,13 +289,13 @@ - (void)awakeFromNib
289289

290290
// Add observers for document task activity
291291
[[NSNotificationCenter defaultCenter] addObserver:self
292-
selector:@selector(startDocumentTaskForTab:)
293-
name:SPDocumentTaskStartNotification
294-
object:tableDocumentInstance];
292+
selector:@selector(startDocumentTaskForTab:)
293+
name:SPDocumentTaskStartNotification
294+
object:tableDocumentInstance];
295295
[[NSNotificationCenter defaultCenter] addObserver:self
296-
selector:@selector(endDocumentTaskForTab:)
297-
name:SPDocumentTaskEndNotification
298-
object:tableDocumentInstance];
296+
selector:@selector(endDocumentTaskForTab:)
297+
name:SPDocumentTaskEndNotification
298+
object:tableDocumentInstance];
299299
[[NSNotificationCenter defaultCenter] addObserver:self
300300
selector:@selector(documentWillClose:)
301301
name:SPDocumentWillCloseNotification
@@ -830,7 +830,7 @@ - (void) loadTableValues
830830
// Add a filter string if appropriate
831831
filterString = [[self onMainThread] tableFilterString];
832832

833-
if (filterString) {
833+
if ([filterString length]) {
834834
[queryString appendFormat:@" WHERE %@", filterString];
835835
isFiltered = YES;
836836
} else {
@@ -1007,7 +1007,7 @@ - (void) loadTableValues
10071007
if(activeFilter == 0) {
10081008
#endif
10091009
NSString *errorDetail;
1010-
if(filterString)
1010+
if([filterString length])
10111011
errorDetail = [NSString stringWithFormat:NSLocalizedString(@"The table data couldn't be loaded presumably due to used filter clause. \n\nMySQL said: %@", @"message of panel when loading of table failed and presumably due to used filter argument"), [mySQLConnection lastErrorMessage]];
10121012
else
10131013
errorDetail = [NSString stringWithFormat:NSLocalizedString(@"The table data couldn't be loaded.\n\nMySQL said: %@", @"message of panel when loading of table failed"), [mySQLConnection lastErrorMessage]];
@@ -1098,9 +1098,8 @@ - (NSString *)tableFilterString
10981098

10991099
#ifndef SP_CODA
11001100
// If filter command was passed by sequelpro url scheme
1101-
if(activeFilter == 2) {
1102-
if(schemeFilter)
1103-
return schemeFilter;
1101+
if(activeFilter == SPTableContentFilterSourceURLScheme) {
1102+
if(schemeFilter) return schemeFilter;
11041103
}
11051104

11061105
// Call did come from filter table and is filter table window still open?
@@ -2851,8 +2850,8 @@ - (BOOL)saveRowToTable
28512850
fieldValue = [NSString stringWithFormat:@"b'%@'", ((![desc length] || [desc isEqualToString:@"0"]) ? @"0" : desc)];
28522851
} else if ([fieldTypeGroup isEqualToString:@"date"] && [desc isEqualToString:@"NOW()"]) {
28532852
fieldValue = @"NOW()";
2854-
} else if ([fieldTypeGroup isEqualToString:@"string"] && [[rowObject description] isEqualToString:@"UUID()"]) {
2855-
fieldValue = @"UUID()";
2853+
} else if ([fieldTypeGroup isEqualToString:@"string"] && [[rowObject description] isEqualToString:@"UUID()"]) {
2854+
fieldValue = @"UUID()";
28562855
} else {
28572856
fieldValue = [mySQLConnection escapeAndQuoteString:desc];
28582857
}
@@ -2986,12 +2985,20 @@ - (BOOL)saveRowToTable
29862985
currentlyEditingRow = -1;
29872986

29882987
return YES;
2989-
2988+
}
29902989
// Report errors which have occurred
2991-
}
29922990
else {
2993-
SPBeginAlertSheet(NSLocalizedString(@"Unable to write row", @"Unable to write row error"), NSLocalizedString(@"Edit row", @"Edit row button"), NSLocalizedString(@"Discard changes", @"discard changes button"), nil, [tableDocumentInstance parentWindow], self, @selector(addRowErrorSheetDidEnd:returnCode:contextInfo:), NULL,
2994-
[NSString stringWithFormat:NSLocalizedString(@"MySQL said:\n\n%@", @"message of panel when error while adding row to db"), [mySQLConnection lastErrorMessage]]);
2991+
SPBeginAlertSheet(
2992+
NSLocalizedString(@"Unable to write row", @"Unable to write row error"),
2993+
NSLocalizedString(@"Edit row", @"Edit row button"),
2994+
NSLocalizedString(@"Discard changes", @"discard changes button"),
2995+
nil,
2996+
[tableDocumentInstance parentWindow],
2997+
self,
2998+
@selector(addRowErrorSheetDidEnd:returnCode:contextInfo:),
2999+
NULL,
3000+
[NSString stringWithFormat:NSLocalizedString(@"MySQL said:\n\n%@", @"message of panel when error while adding row to db"), [mySQLConnection lastErrorMessage]]
3001+
);
29953002
return NO;
29963003
}
29973004
}

0 commit comments

Comments
 (0)