diff options
author | sqlprodev <sqlprodev@northofthree.com> | 2011-04-14 21:58:04 +0000 |
---|---|---|
committer | sqlprodev <sqlprodev@northofthree.com> | 2011-04-14 21:58:04 +0000 |
commit | c92056ec0042a7a3de9163ce08704236f5e1c331 (patch) | |
tree | 65c5e7b2d81d58967597615f7ed0bb10e9c8aba2 /Source | |
parent | 8c2e3126426c0c4c9e5bc2392879a850d3373641 (diff) | |
download | sequelpro-c92056ec0042a7a3de9163ce08704236f5e1c331.tar.gz sequelpro-c92056ec0042a7a3de9163ce08704236f5e1c331.tar.bz2 sequelpro-c92056ec0042a7a3de9163ce08704236f5e1c331.zip |
Fixes source text encoding problems accidentally introduced in r3273
Diffstat (limited to 'Source')
-rw-r--r-- | Source/SPConnectionController.m | 2 | ||||
-rw-r--r-- | Source/SPCustomQuery.m | 30 | ||||
-rw-r--r-- | Source/SPDatabaseDocument.m | 4 | ||||
-rw-r--r-- | Source/SPFieldMapperController.m | 12 | ||||
-rw-r--r-- | Source/SPNarrowDownCompletion.m | 2 | ||||
-rw-r--r-- | Source/SPTableContent.m | 36 | ||||
-rw-r--r-- | Source/SPTextView.m | 56 | ||||
-rw-r--r-- | Source/SPTextViewAdditions.m | 8 |
8 files changed, 75 insertions, 75 deletions
diff --git a/Source/SPConnectionController.m b/Source/SPConnectionController.m index a0fa4c0a..728c621e 100644 --- a/Source/SPConnectionController.m +++ b/Source/SPConnectionController.m @@ -438,7 +438,7 @@ [self initiateMySQLConnection]; } else { - [tableDocument setTitlebarStatus:NSLocalizedString(@"SSH Connecting", @"SSH connecting titlebar marker")]; + [tableDocument setTitlebarStatus:NSLocalizedString(@"SSH Connecting…", @"SSH connecting titlebar marker")]; } } diff --git a/Source/SPCustomQuery.m b/Source/SPCustomQuery.m index 8c2b4f43..df377e57 100644 --- a/Source/SPCustomQuery.m +++ b/Source/SPCustomQuery.m @@ -1168,7 +1168,7 @@ } /* - * Add or remove "‚ÅÑ* *‚ÅÑ" for each line in the current query + * Add or remove "⁄* *⁄" for each line in the current query * a given selection */ - (void)commentOutCurrentQueryTakingSelection:(BOOL)takeSelection @@ -1221,8 +1221,8 @@ /* * Add or remove "-- " for each line in the current query or selection, - * if the selection is in-line wrap selection into ‚ÅÑ* block comments and - * place the caret after ‚ÅÑ* to allow to enter !xxxxxx e.g. + * if the selection is in-line wrap selection into ⁄* block comments and + * place the caret after ⁄* to allow to enter !xxxxxx e.g. */ - (void)commentOut { @@ -1594,7 +1594,7 @@ [[dataCell formatter] setFieldType:[columnDefinition objectForKey:@"type"]]; [theCol setDataCell:dataCell]; [[theCol headerCell] setStringValue:[columnDefinition objectForKey:@"name"]]; - [theCol setHeaderToolTip:[NSString stringWithFormat:@"%@ ‚Äì %@%@", [columnDefinition objectForKey:@"name"], [columnDefinition objectForKey:@"type"], ([columnDefinition objectForKey:@"char_length"]) ? [NSString stringWithFormat:@"(%@)", [columnDefinition objectForKey:@"char_length"]] : @""]]; + [theCol setHeaderToolTip:[NSString stringWithFormat:@"%@ – %@%@", [columnDefinition objectForKey:@"name"], [columnDefinition objectForKey:@"type"], ([columnDefinition objectForKey:@"char_length"]) ? [NSString stringWithFormat:@"(%@)", [columnDefinition objectForKey:@"char_length"]] : @""]]; #ifndef SP_REFACTOR // Set the width of this column to saved value if exists and maps to a real column @@ -2045,7 +2045,7 @@ return; } - // This shouldn't happen ‚Äì for safety reasons + // This shouldn't happen – for safety reasons if ( ![mySQLConnection affectedRows] ) { #ifndef SP_REFACTOR if ( [prefs boolForKey:SPShowNoAffectedRowsError] ) { @@ -3145,7 +3145,7 @@ aRange = [desc rangeOfRegex:@"\\[HELP ([^ ]*?)\\]" options:RKLNoOptions inRange:NSMakeRange(aRange.location+aRange.length+53, [desc length]-53-aRange.location-aRange.length) capture:1 error:&err1]; if(aRange.location != NSNotFound) { aUrl = [[desc substringWithRange:aRange] stringByReplacingOccurrencesOfString:@"\n" withString:@" "]; - [desc replaceCharactersInRange:aRange withString:[NSString stringWithFormat:@"<a title='%@ ‚Äú%@‚Äù' href='%@' class='internallink'>%@</a>", NSLocalizedString(@"Show MySQL help for", @"show mysql help for"), aUrl, aUrl, aUrl]]; + [desc replaceCharactersInRange:aRange withString:[NSString stringWithFormat:@"<a title='%@ “%@”' href='%@' class='internallink'>%@</a>", NSLocalizedString(@"Show MySQL help for", @"show mysql help for"), aUrl, aUrl, aUrl]]; } else break; @@ -3160,7 +3160,7 @@ // aRange = [desc rangeOfRegex:@"(?<!\\w)([A-Z_]{2,}( [A-Z_]{2,})?)" options:RKLNoOptions inRange:NSMakeRange(aRange.location+aRange.length, [desc length]-aRange.location-aRange.length) capture:1 error:&err1]; // if(aRange.location != NSNotFound) { // aUrl = [desc substringWithRange:aRange]; - // [desc replaceCharactersInRange:aRange withString:[NSString stringWithFormat:@"<a title='%@ ‚Äú%@‚Äù' href='%@' class='internallink'>%@</a>", NSLocalizedString(@"Show MySQL help for", @"show mysql help for"), aUrl, aUrl, aUrl]]; + // [desc replaceCharactersInRange:aRange withString:[NSString stringWithFormat:@"<a title='%@ “%@”' href='%@' class='internallink'>%@</a>", NSLocalizedString(@"Show MySQL help for", @"show mysql help for"), aUrl, aUrl, aUrl]]; // } // else // break; @@ -3184,7 +3184,7 @@ if (r) [theResult dataSeek:0]; // check if HELP 'contents' is called if(![searchString isEqualToString:SP_HELP_TOC_SEARCH_STRING]) - [theHelp appendFormat:@"<br><i>%@ ‚Äú%@‚Äù</i><br>", NSLocalizedString(@"Help topics for", @"help topics for"), searchString]; + [theHelp appendFormat:@"<br><i>%@ “%@”</i><br>", NSLocalizedString(@"Help topics for", @"help topics for"), searchString]; else [theHelp appendFormat:@"<br><b>%@:</b><br>", NSLocalizedString(@"MySQL Help ‚Äì Categories", @"mysql help categories"), searchString]; @@ -3193,7 +3193,7 @@ for ( i = 0 ; i < r ; i++ ) { NSArray *anArray = [theResult fetchRowAsArray]; NSString *topic = [anArray objectAtIndex:[anArray count]-2]; - [theHelp appendFormat:@"<li><a title='%@ ‚Äú%@‚Äù' href='%@' class='internallink'>%@</a></li>", + [theHelp appendFormat:@"<li><a title='%@ “%@”' href='%@' class='internallink'>%@</a></li>", NSLocalizedString(@"Show MySQL help for", @"show mysql help for"), topic, topic, topic]; } [theHelp appendString:@"</ul>"]; @@ -3375,7 +3375,7 @@ [[[[tableDocumentInstance fileURL] absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] lastPathComponent] action:NULL keyEquivalent:@""]; [headerMenuItem setTag:SP_FAVORITE_HEADER_MENUITEM_TAG]; - [headerMenuItem setToolTip:[NSString stringWithFormat:@"‚Äò%@‚Äô based favorites", + [headerMenuItem setToolTip:[NSString stringWithFormat:@"‘%@’ based favorites", [[[[tableDocumentInstance fileURL] absoluteString] stringByReplacingPercentEscapesUsingEncoding:NSUTF8StringEncoding] lastPathComponent]]]; [headerMenuItem setIndentationLevel:0]; [menu addItem:headerMenuItem]; @@ -3387,7 +3387,7 @@ [paraStyle addTabStop:[[[NSTextTab alloc] initWithType:NSRightTabStopType location:190.0f] autorelease]]; NSDictionary *attributes = [NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:paraStyle, [NSFont systemFontOfSize:11], nil] forKeys:[NSArray arrayWithObjects:NSParagraphStyleAttributeName, NSFontAttributeName, nil]]; NSAttributedString *titleString = [[[NSAttributedString alloc] - initWithString:([favorite objectForKey:@"tabtrigger"] && [(NSString*)[favorite objectForKey:@"tabtrigger"] length]) ? [NSString stringWithFormat:@"%@\t%@‚á•", [favorite objectForKey:@"name"], [favorite objectForKey:@"tabtrigger"]] : [favorite objectForKey:@"name"] + initWithString:([favorite objectForKey:@"tabtrigger"] && [(NSString*)[favorite objectForKey:@"tabtrigger"] length]) ? [NSString stringWithFormat:@"%@\t%@⇥", [favorite objectForKey:@"name"], [favorite objectForKey:@"tabtrigger"]] : [favorite objectForKey:@"name"] attributes:attributes] autorelease]; NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""]; [item setToolTip:[NSString stringWithString:[favorite objectForKey:@"query"]]]; @@ -3412,7 +3412,7 @@ [paraStyle addTabStop:[[[NSTextTab alloc] initWithType:NSRightTabStopType location:190.0f] autorelease]]; NSDictionary *attributes = [NSDictionary dictionaryWithObjects:[NSArray arrayWithObjects:paraStyle, [NSFont systemFontOfSize:11], nil] forKeys:[NSArray arrayWithObjects:NSParagraphStyleAttributeName, NSFontAttributeName, nil]]; NSAttributedString *titleString = [[[NSAttributedString alloc] - initWithString:([favorite objectForKey:@"tabtrigger"] && [(NSString*)[favorite objectForKey:@"tabtrigger"] length]) ? [NSString stringWithFormat:@"%@\t%@‚á•", [favorite objectForKey:@"name"], [favorite objectForKey:@"tabtrigger"]] : [favorite objectForKey:@"name"] + initWithString:([favorite objectForKey:@"tabtrigger"] && [(NSString*)[favorite objectForKey:@"tabtrigger"] length]) ? [NSString stringWithFormat:@"%@\t%@⇥", [favorite objectForKey:@"name"], [favorite objectForKey:@"tabtrigger"]] : [favorite objectForKey:@"name"] attributes:attributes] autorelease]; NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:@"" action:NULL keyEquivalent:@""]; [item setToolTip:[NSString stringWithString:[favorite objectForKey:@"query"]]]; @@ -3514,7 +3514,7 @@ // Result Table Font preference changed else if ([keyPath isEqualToString:SPGlobalResultTableFont]) { NSFont *tableFont = [NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]]; - [customQueryView setRowHeight:2.0f+NSSizeToCGSize([[NSString stringWithString:@"{«û·π∂·∏π√ú‚àëzgyf"] sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; + [customQueryView setRowHeight:2.0f+NSSizeToCGSize([[NSString stringWithString:@"{ǞṶḹÜ∑zgyf"] sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; [customQueryView setFont:tableFont]; [customQueryView reloadData]; } @@ -3641,7 +3641,7 @@ [menuItem setToolTip:NSLocalizedString(@"Clear the global history list", @"clear the global history list tooltip message")]; #ifndef SP_REFACTOR /* if ( [tableDocumentInstance isUntitled] ) */ } else { - [menuItem setTitle:[NSString stringWithFormat:NSLocalizedString(@"Clear History for ‚Äú%@‚Äù", @"clear history for ‚Äú%@‚Äù menu title"), [tableDocumentInstance displayName]]]; + [menuItem setTitle:[NSString stringWithFormat:NSLocalizedString(@"Clear History for “%@”", @"clear history for “%@” menu title"), [tableDocumentInstance displayName]]]; [menuItem setToolTip:NSLocalizedString(@"Clear the document-based history list", @"clear the document-based history list tooltip message")]; } #endif @@ -3726,7 +3726,7 @@ // an error occurred while reading if (helpHTMLTemplate == nil) { - NSLog(@"%@", [NSString stringWithFormat:@"Error reading ‚Äú%@.html‚Äù!<br>%@", SPHTMLHelpTemplate, [error localizedFailureReason]]); + NSLog(@"%@", [NSString stringWithFormat:@"Error reading “%@.html”!<br>%@", SPHTMLHelpTemplate, [error localizedFailureReason]]); NSBeep(); } diff --git a/Source/SPDatabaseDocument.m b/Source/SPDatabaseDocument.m index 7bb28a97..8c05daa0 100644 --- a/Source/SPDatabaseDocument.m +++ b/Source/SPDatabaseDocument.m @@ -5224,7 +5224,7 @@ { [runningActivitiesArray addObject:commandDict]; #ifndef SP_REFACTOR - [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:SPActivitiesUpdateNotification object:self]; + [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:SPActivitiesUpdateNotification object:nil]; #else [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:SPActivitiesUpdateNotification object:self]; #endif @@ -5260,7 +5260,7 @@ } #ifndef SP_REFACTOR - [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:SPActivitiesUpdateNotification object:self]; + [[NSNotificationCenter defaultCenter] postNotificationOnMainThreadWithName:SPActivitiesUpdateNotification object:nil]; #else [[NSNotificationCenter defaultCenter] sequelProPostNotificationOnMainThreadWithName:SPActivitiesUpdateNotification object:self]; #endif diff --git a/Source/SPFieldMapperController.m b/Source/SPFieldMapperController.m index a81a942f..268eb0c7 100644 --- a/Source/SPFieldMapperController.m +++ b/Source/SPFieldMapperController.m @@ -82,7 +82,7 @@ static NSString *SPTableViewSqlColumnID = @"sql"; doImport = [NSNumber numberWithInteger:0]; doNotImport = [NSNumber numberWithInteger:1]; isEqual = [NSNumber numberWithInteger:2]; - doImportString = @"―"; + doImportString = @"‚Äï"; doNotImportString = @" "; isEqualString = @"="; newTableMode = NO; @@ -254,8 +254,8 @@ static NSString *SPTableViewSqlColumnID = @"sql"; NSInteger i; for(i=0; i<numberOfImportColumns; i++) { - [fieldMappingGlobalValues addObject:@"…"]; - [fieldMappingGlobalValuesSQLMarked addObject:@"…"]; + [fieldMappingGlobalValues addObject:@"‚Ķ"]; + [fieldMappingGlobalValuesSQLMarked addObject:@"‚Ķ"]; } } @@ -556,7 +556,7 @@ static NSString *SPTableViewSqlColumnID = @"sql"; if([column objectForKey:@"length"]) [type appendFormat:@"(%@)", [column objectForKey:@"length"]]; if([column objectForKey:@"values"]) - [type appendFormat:@"(%@)", [[column objectForKey:@"values"] componentsJoinedByString:@"¦"]]; + [type appendFormat:@"(%@)", [[column objectForKey:@"values"] componentsJoinedByString:@"¬¶"]]; if([column objectForKey:@"isprimarykey"]) { [type appendFormat:@",%@",@"PRIMARY"]; @@ -1121,7 +1121,7 @@ static NSString *SPTableViewSqlColumnID = @"sql"; [insertPullDownButton addItemWithTitle:[NSString stringWithFormat:@"%i. <%@>", i, @"DEFAULT"]]; } else { if([(NSString*)item length] > 20) - [insertPullDownButton addItemWithTitle:[NSString stringWithFormat:@"%i. %@", i, [item substringToIndex:20]]]; + [insertPullDownButton addItemWithTitle:[NSString stringWithFormat:@"%i. %@…", i, [item substringToIndex:20]]]; else [insertPullDownButton addItemWithTitle:[NSString stringWithFormat:@"%i. %@", i, item]]; } @@ -1803,7 +1803,7 @@ static NSString *SPTableViewSqlColumnID = @"sql"; if([[self selectedImportMethod] isEqualToString:@"UPDATE"]) [c addItemWithTitle:NSLocalizedString(@"Match Field", @"match field menu item")]; [m addItem:[NSMenuItem separatorItem]]; - NSMenuItem *menuItem = [m addItemWithTitle:NSLocalizedString(@"Add Value or Expression…", @"add global value or expression menu item") action:@selector(addGlobalSourceVariable:) keyEquivalent:@"g"]; + NSMenuItem *menuItem = [m addItemWithTitle:NSLocalizedString(@"Add Value or Expression‚Ķ", @"add global value or expression menu item") action:@selector(addGlobalSourceVariable:) keyEquivalent:@"g"]; [menuItem setKeyEquivalentModifierMask:(NSAlternateKeyMask|NSCommandKeyMask)]; [c addItemWithTitle:[NSString stringWithFormat:@"DEFAULT: %@", [fieldMappingTableDefaultValues objectAtIndex:rowIndex]]]; [[m itemAtIndex:[c numberOfItems]-1] setEnabled:NO]; diff --git a/Source/SPNarrowDownCompletion.m b/Source/SPNarrowDownCompletion.m index 4b4513a8..04627e2d 100644 --- a/Source/SPNarrowDownCompletion.m +++ b/Source/SPNarrowDownCompletion.m @@ -7,7 +7,7 @@ // Created by Hans-J. Bibiko on May 14, 2009. // // This class is based on TextMate's TMDIncrementalPopUp implementation -// (Dialog plugin) written by Joachim M√•rtensson, Allan Odgaard, and H.-J. Bibiko. +// (Dialog plugin) written by Joachim Mårtensson, Allan Odgaard, and H.-J. Bibiko. // see license: http://svn.textmate.org/trunk/LICENSE // // This program is free software; you can redistribute it and/or modify diff --git a/Source/SPTableContent.m b/Source/SPTableContent.m index 75338fe1..cfbca3b2 100644 --- a/Source/SPTableContent.m +++ b/Source/SPTableContent.m @@ -480,7 +480,7 @@ // Set up the column theCol = [[NSTableColumn alloc] initWithIdentifier:[columnDefinition objectForKey:@"datacolumnindex"]]; [[theCol headerCell] setStringValue:[columnDefinition objectForKey:@"name"]]; - [theCol setHeaderToolTip:[NSString stringWithFormat:@"%@ ‚Äì %@%@%@%@", + [theCol setHeaderToolTip:[NSString stringWithFormat:@"%@ – %@%@%@%@", [columnDefinition objectForKey:@"name"], [columnDefinition objectForKey:@"type"], ([columnDefinition objectForKey:@"length"]) ? [NSString stringWithFormat:@"(%@)", [columnDefinition objectForKey:@"length"]] : @"", @@ -829,7 +829,7 @@ } // Filter task came from filter table else if(activeFilter == 1){ - [filterTableWindow setTitle:[NSString stringWithFormat:@"%@ ‚Äì %@", NSLocalizedString(@"Filter", @"filter label"), NSLocalizedString(@"WHERE clause not valid", @"WHERE clause not valid")]]; + [filterTableWindow setTitle:[NSString stringWithFormat:@"%@ – %@", NSLocalizedString(@"Filter", @"filter label"), NSLocalizedString(@"WHERE clause not valid", @"WHERE clause not valid")]]; } } else { // Trigger a full reload if required @@ -960,7 +960,7 @@ } // If the clause has the placeholder $BINARY that placeholder will be replaced - // by BINARY if the user pressed ‚áß while invoking 'Filter' otherwise it will + // by BINARY if the user pressed ⇧ while invoking 'Filter' otherwise it will // replaced by @"". BOOL caseSensitive = (([[[NSApp onMainThread] currentEvent] modifierFlags] & (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask)) > 0); @@ -975,14 +975,14 @@ // Current selected filter type if(![contentFilters objectForKey:compareType]) { - NSLog(@"Error while retrieving filters. Filter type ‚Äú%@‚Äù unknown.", compareType); + NSLog(@"Error while retrieving filters. Filter type “%@” unknown.", compareType); NSBeep(); return nil; } NSDictionary *filter = [[contentFilters objectForKey:compareType] objectAtIndex:[[compareField selectedItem] tag]]; if(![filter objectForKey:@"NumberOfArguments"]) { - NSLog(@"Error while retrieving filter clause. No ‚ÄúClause‚Äù or/and ‚ÄúNumberOfArguments‚Äù key found."); + NSLog(@"Error while retrieving filter clause. No “Clause” or/and “NumberOfArguments” key found."); NSBeep(); return nil; } @@ -1053,7 +1053,7 @@ // Check number of placeholders and given 'NumberOfArguments' if([clause replaceOccurrencesOfString:@"%@" withString:@"%@" options:NSLiteralSearch range:NSMakeRange(0, [clause length])] != numberOfArguments) { - NSLog(@"Error while setting filter string. ‚ÄúNumberOfArguments‚Äù differs from the number of arguments specified in ‚ÄúClause‚Äù."); + NSLog(@"Error while setting filter string. “NumberOfArguments” differs from the number of arguments specified in “Clause”."); NSBeep(); [argument release]; [firstBetweenArgument release]; @@ -1399,7 +1399,7 @@ - (IBAction)toggleFilterField:(id)sender { - // Check if user called "Edit Filter‚Ķ" + // Check if user called "Edit Filter…" if([[compareField selectedItem] tag] == (NSInteger)[[contentFilters objectForKey:compareType] count]) { [self openContentFilterManager]; return; @@ -2435,7 +2435,7 @@ [tip setString:[[filter objectForKey:@"Clause"] stringByReplacingOccurrencesOfRegex:@"(?<!\\\\)(\\$\\{.*?\\})" withString:@"[arg]"]]; if([tip isMatchedByRegex:@"(?<!\\\\)\\$BINARY"]) { [tip replaceOccurrencesOfRegex:@"(?<!\\\\)\\$BINARY" withString:@""]; - [tip appendString:NSLocalizedString(@"\n\nPress ‚áß for binary search (case-sensitive).", @"\n\npress shift for binary search tooltip message")]; + [tip appendString:NSLocalizedString(@"\n\nPress ⇧ for binary search (case-sensitive).", @"\n\npress shift for binary search tooltip message")]; } [tip flushCachedRegexData]; [tip replaceOccurrencesOfRegex:@"(?<!\\\\)\\$CURRENT_FIELD" withString:[[fieldField titleOfSelectedItem] backtickQuotedString]]; @@ -2453,8 +2453,8 @@ } [menu addItem:[NSMenuItem separatorItem]]; - NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Edit Filters‚Ķ", @"edit filter") action:NULL keyEquivalent:@""]; - [item setToolTip:NSLocalizedString(@"Edit user-defined Filters‚Ķ", @"edit user-defined filter")]; + NSMenuItem *item = [[NSMenuItem alloc] initWithTitle:NSLocalizedString(@"Edit Filters…", @"edit filter") action:NULL keyEquivalent:@""]; + [item setToolTip:NSLocalizedString(@"Edit user-defined Filters…", @"edit user-defined filter")]; [item setTag:i]; [menu addItem:item]; [item release]; @@ -2856,7 +2856,7 @@ [argument appendFormat:@"%@ IS NULL", [NSArrayObjectAtIndex(keys, i) backtickQuotedString]]; } else if ([tempValue isSPNotLoaded]) { - NSLog(@"Exceptional case: SPNotLoaded object found for method ‚ÄúargumentForRow:‚Äù!"); + NSLog(@"Exceptional case: SPNotLoaded object found for method “argumentForRow:”!"); return @""; } else { @@ -3901,7 +3901,7 @@ } - // This shouldn't happen ‚Äì for safety reasons + // This shouldn't happen – for safety reasons if ( ![mySQLConnection affectedRows] ) { #ifndef SP_REFACTOR if ( [prefs boolForKey:SPShowNoAffectedRowsError] ) { @@ -4310,7 +4310,7 @@ if (aTableView == tableContentView) { NSString *tmp; - // By holding ‚åò, ‚áß, or/and ‚å• copies selected rows as SQL INSERTS + // By holding ⌘, ⇧, or/and ⌥ copies selected rows as SQL INSERTS // otherwise \t delimited lines if([[NSApp currentEvent] modifierFlags] & (NSCommandKeyMask|NSShiftKeyMask|NSAlternateKeyMask)) tmp = [tableContentView rowsAsSqlInsertsOnlySelectedRows:YES]; @@ -4623,7 +4623,7 @@ // Table font preference changed else if ([keyPath isEqualToString:SPGlobalResultTableFont]) { NSFont *tableFont = [NSUnarchiver unarchiveObjectWithData:[change objectForKey:NSKeyValueChangeNewKey]]; - [tableContentView setRowHeight:2.0f+NSSizeToCGSize([[NSString stringWithString:@"{«û·π∂·∏π√ú‚àëzgyf"] sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; + [tableContentView setRowHeight:2.0f+NSSizeToCGSize([[NSString stringWithString:@"{ǞṶḹÜ∑zgyf"] sizeWithAttributes:[NSDictionary dictionaryWithObject:tableFont forKey:NSFontAttributeName]]).height]; [tableContentView setFont:tableFont]; [tableContentView reloadData]; } @@ -4682,7 +4682,7 @@ BOOL lookInAllFields = NO; - NSString *re1 = @"^\\s*(<[=>]?|>=?|!?=|‚â†|‚â§|‚â•)\\s*(.*?)\\s*$"; + NSString *re1 = @"^\\s*(<[=>]?|>=?|!?=|≠|≤|≥)\\s*(.*?)\\s*$"; NSString *re2 = @"^\\s*(.*)\\s+(.*?)\\s*$"; NSInteger editedRow = [filterTableView editedRow]; @@ -4728,9 +4728,9 @@ if([filterCell length]) { // Recode special operators - filterCell = [filterCell stringByReplacingOccurrencesOfRegex:@"^\\s*‚â†" withString:@"!="]; - filterCell = [filterCell stringByReplacingOccurrencesOfRegex:@"^\\s*‚â§" withString:@"<="]; - filterCell = [filterCell stringByReplacingOccurrencesOfRegex:@"^\\s*‚â•" withString:@">="]; + filterCell = [filterCell stringByReplacingOccurrencesOfRegex:@"^\\s*≠" withString:@"!="]; + filterCell = [filterCell stringByReplacingOccurrencesOfRegex:@"^\\s*≤" withString:@"<="]; + filterCell = [filterCell stringByReplacingOccurrencesOfRegex:@"^\\s*≥" withString:@">="]; if(numberOfValues) [clause appendString:(lookInAllFields) ? @" OR " : @" AND "]; diff --git a/Source/SPTextView.m b/Source/SPTextView.m index b9ec6459..c22a56c8 100644 --- a/Source/SPTextView.m +++ b/Source/SPTextView.m @@ -4,7 +4,7 @@ // SPTextView.m // sequel-pro // -// Created by Carsten Blüm. +// Created by Carsten Bl√ºm. // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -490,10 +490,10 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) NSString *fieldpath = [field substringFromIndex:[field rangeOfString:SPUniqueSchemaDelimiter].location]; NSArray *def = [theTable objectForKey:field]; NSString *typ = [NSString stringWithFormat:@"%@ %@ %@", [def objectAtIndex:0], [def objectAtIndex:3], [def objectAtIndex:5]]; - // Check if type definition contains a , if so replace the bracket content by … and add + // Check if type definition contains a , if so replace the bracket content by ‚Ķ and add // the bracket content as "list" key to prevend the token field to split them by , if(typ && [typ rangeOfString:@","].length) { - NSString *t = [typ stringByReplacingOccurrencesOfRegex:@"\\(.*?\\)" withString:@"(…)"]; + NSString *t = [typ stringByReplacingOccurrencesOfRegex:@"\\(.*?\\)" withString:@"(‚Ķ)"]; NSString *lst = [typ stringByMatching:@"\\(([^\\)]*?)\\)" capture:1L]; [possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys: [[field componentsSeparatedByString:SPUniqueSchemaDelimiter] lastObject], @"display", @@ -520,7 +520,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) if(desc) [desc release]; } else { - // [possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"fetching table data…", @"fetching table data for completion in progress message"), @"path", @"", @"noCompletion", nil]]; + // [possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:NSLocalizedString(@"fetching table data‚Ķ", @"fetching table data for completion in progress message"), @"path", @"", @"noCompletion", nil]]; // Add all database names to completions list for (id obj in [tablesListInstance allDatabaseNames]) @@ -924,7 +924,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) /** * Checks if the caret adjoins to an alphanumeric char |word or word| or wo|rd - * Exception for word| and char is a “(” to allow e.g. auto-pairing () for functions + * Exception for word| and char is a ‚Äú(‚Äù to allow e.g. auto-pairing () for functions */ - (BOOL) isCaretAdjacentToAlphanumCharWithInsertionOf:(unichar)aChar { @@ -1455,10 +1455,10 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) if(![field hasPrefix:@" "]) { NSArray *def = [theTable objectForKey:field]; NSString *typ = [NSString stringWithFormat:@"%@ %@ %@", [def objectAtIndex:0], [def objectAtIndex:1], [def objectAtIndex:2]]; - // Check if type definition contains a , if so replace the bracket content by … and add + // Check if type definition contains a , if so replace the bracket content by ‚Ķ and add // the bracket content as "list" key to prevend the token field to split them by , if(typ && [typ rangeOfString:@","].length) { - NSString *t = [typ stringByReplacingOccurrencesOfRegex:@"\\(.*?\\)" withString:@"(…)"]; + NSString *t = [typ stringByReplacingOccurrencesOfRegex:@"\\(.*?\\)" withString:@"(‚Ķ)"]; NSString *lst = [typ stringByMatching:@"\\(([^\\)]*?)\\)" capture:1L]; [possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys: field, @"display", @@ -1489,7 +1489,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) } } else { - NSLog(@"“%@” is not a valid completion list", kind); + NSLog(@"‚Äú%@‚Äù is not a valid completion list", kind); NSBeep(); return; } @@ -1600,7 +1600,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) /** - * Selects the current snippet defined by “currentSnippetIndex” + * Selects the current snippet defined by ‚ÄúcurrentSnippetIndex‚Äù */ - (void)selectCurrentSnippet { @@ -1637,8 +1637,8 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) [self setSelectedRange:r2]; NSString *snip = [[self string] substringWithRange:r2]; - if([snip length] > 2 && [snip hasPrefix:@"¦"] && [snip hasSuffix:@"¦"]) { - BOOL fuzzySearchMode = ([snip hasPrefix:@"¦¦"] && [snip hasSuffix:@"¦¦"]) ? YES : NO; + if([snip length] > 2 && [snip hasPrefix:@"¬¶"] && [snip hasSuffix:@"¬¶"]) { + BOOL fuzzySearchMode = ([snip hasPrefix:@"¬¶¬¶"] && [snip hasSuffix:@"¬¶¬¶"]) ? YES : NO; NSInteger offset = (fuzzySearchMode) ? 2 : 1; NSRange insertRange = NSMakeRange(r2.location,0); NSString *newSnip = [snip substringWithRange:NSMakeRange(1*offset,[snip length]-(2*offset))]; @@ -1646,7 +1646,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) [self showCompletionListFor:newSnip atRange:NSMakeRange(r2.location, 0) fuzzySearch:fuzzySearchMode]; return; } else { - NSArray *list = [[snip substringWithRange:NSMakeRange(1*offset,[snip length]-(2*offset))] componentsSeparatedByString:@"¦"]; + NSArray *list = [[snip substringWithRange:NSMakeRange(1*offset,[snip length]-(2*offset))] componentsSeparatedByString:@"¬¶"]; NSMutableArray *possibleCompletions = [[[NSMutableArray alloc] initWithCapacity:[list count]] autorelease]; for(id w in list) [possibleCompletions addObject:[NSDictionary dictionaryWithObjectsAndKeys:w, @"display", @"dummy-small", @"image", nil]]; @@ -1741,7 +1741,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) return; } - // Replace `${x:…}` by ${x:`…`} for convience + // Replace `${x:‚Ķ}` by ${x:`‚Ķ`} for convience [snip replaceOccurrencesOfRegex:@"`(?s)(?<!\\\\)\\$\\{(1?\\d):(.{0}|.*?[^\\\\])\\}`" withString:@"${$1:`$2`}"]; [snip flushCachedRegexData]; @@ -1762,7 +1762,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) // Check for snippet number 19 (to simplify regexp) if(snipCnt>18 || snipCnt<0) { - NSLog(@"Only snippets in the range of 0…18 allowed."); + NSLog(@"Only snippets in the range of 0‚Ķ18 allowed."); [self endSnippetSession]; break; } @@ -1825,9 +1825,9 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) [theHintString flushCachedRegexData]; #ifndef SP_REFACTOR - // If inside the snippet hint $() is defined run as BASH command - // and replace $() by the return string of that command. Please note - // only one $() statement is allowed within one ${} snippet environment. + // If inside the snippet hint $(…) is defined run … as BASH command + // and replace $(…) by the return string of that command. Please note + // only one $(…) statement is allowed within one ${…} snippet environment. NSRange tagRange = [theHintString rangeOfRegex:@"(?s)(?<!\\\\)\\$\\((.*)\\)"]; if(tagRange.length) { [theHintString flushCachedRegexData]; @@ -1840,7 +1840,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) } else if([err code] != 9) { // Suppress an error message if command was killed NSString *errorMessage = [err localizedDescription]; SPBeginAlertSheet(NSLocalizedString(@"BASH Error", @"bash error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil, - [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [theHintString substringWithRange:cmdRange], errorMessage]); + [NSString stringWithFormat:@"%@ ‚Äú%@‚Äù:\n%@", NSLocalizedString(@"Error for", @"error for message"), [theHintString substringWithRange:cmdRange], errorMessage]); } } else { [theHintString replaceCharactersInRange:tagRange withString:@""]; @@ -1880,7 +1880,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) // Check for snippet number 19 (to simplify regexp) if(snipCnt>18 || snipCnt<0) { - NSLog(@"Only snippets in the range of 0…18 allowed."); + NSLog(@"Only snippets in the range of 0‚Ķ18 allowed."); [self endSnippetSession]; break; } @@ -1928,7 +1928,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) snippetControlArray[snippetControlMax][2] = 0; } - // unescape escaped snippets and re-adjust successive snippet locations : \${1:a} → ${1:a} + // unescape escaped snippets and re-adjust successive snippet locations : \${1:a} ‚Üí ${1:a} NSString *ure = @"(?s)\\\\\\$\\{(1?\\d):(.{0}|.*?[^\\\\])\\}"; while([snip isMatchedByRegex:ure]) { NSRange escapeRange = [snip rangeOfRegex:ure capture:0L]; @@ -2128,7 +2128,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) long allFlags = (NSShiftKeyMask|NSControlKeyMask|NSAlternateKeyMask|NSCommandKeyMask); - // Check if user pressed ⌥ to allow composing of accented characters. + // Check if user pressed ‚å• to allow composing of accented characters. // e.g. for US keyboard "⌥u a" to insert ä // or for non-US keyboards to allow to enter dead keys // e.g. for German keyboard ` is a dead key, press space to enter ` @@ -2248,12 +2248,12 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) return; } if(curFlags & NSCommandKeyMask) { - if([charactersIgnMod isEqualToString:@"+"] || [charactersIgnMod isEqualToString:@"="]) // increase text size by 1; ⌘+, ⌘=, and ⌘ numpad + + if([charactersIgnMod isEqualToString:@"+"] || [charactersIgnMod isEqualToString:@"="]) // increase text size by 1; ‚åò+, ‚åò=, and ‚åò numpad + { [self makeTextSizeLarger]; return; } - if([charactersIgnMod isEqualToString:@"-"]) // decrease text size by 1; ⌘- and numpad - + if([charactersIgnMod isEqualToString:@"-"]) // decrease text size by 1; ‚åò- and numpad - { [self makeTextSizeSmaller]; return; @@ -2417,7 +2417,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) } /** - * The following moveWord... routines are needed to be able to recognize a db schema à la + * The following moveWord... routines are needed to be able to recognize a db schema √† la * db.table.field as ONE word while navigating and selecting by the keyboard */ - (void)moveWordRight:(id)sender @@ -2692,7 +2692,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) // If text larger than SP_TEXT_SIZE_TRIGGER_FOR_PARTLY_PARSING // do highlighting partly (max SP_SYNTAX_HILITE_BIAS*2). // The approach is to take the middle position of the current view port - // and highlight only ±SP_SYNTAX_HILITE_BIAS of that middle position + // and highlight only ¬±SP_SYNTAX_HILITE_BIAS of that middle position // considering of line starts resp. ends if(strlength > SP_TEXT_SIZE_TRIGGER_FOR_PARTLY_PARSING) { @@ -3373,7 +3373,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) #pragma mark drag&drop /** - * Insert the content of a dragged file path or if ⌘ is pressed + * Insert the content of a dragged file path or if ‚åò is pressed * while dragging insert the file path */ - (BOOL)performDragOperation:(id <NSDraggingInfo>)sender @@ -3404,7 +3404,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) NSUInteger characterIndex = [self characterIndexOfPoint:draggingLocation]; [self setSelectedRange:NSMakeRange(characterIndex,0)]; - // Check if user pressed ⌘ while dragging for inserting only the file path + // Check if user pressed ‚åò while dragging for inserting only the file path if([sender draggingSourceOperationMask] == 4) { [self insertText:filepath]; @@ -3593,7 +3593,7 @@ NSInteger _alphabeticSort(id string1, id string2, void *reverse) [result release]; - NSLog(@"%@ ‘%@’.", NSLocalizedString(@"Couldn't read the file content of", @"Couldn't read the file content of"), aPath); + NSLog(@"%@ ‚Äò%@‚Äô.", NSLocalizedString(@"Couldn't read the file content of", @"Couldn't read the file content of"), aPath); } // Do nothing if NSColorPanel was opened from the NSTextView diff --git a/Source/SPTextViewAdditions.m b/Source/SPTextViewAdditions.m index c23bd14e..e2f1a715 100644 --- a/Source/SPTextViewAdditions.m +++ b/Source/SPTextViewAdditions.m @@ -4,7 +4,7 @@ // SPTextViewAdditions.m // sequel-pro // -// Created by Hans-Jrg Bibiko on April 05, 2009 +// Created by Hans-Jörg Bibiko on April 05, 2009 // // This program is free software; you can redistribute it and/or modify // it under the terms of the GNU General Public License as published by @@ -524,7 +524,7 @@ mutabilityOption:NSPropertyListImmutable format:&format errorDescription:&convError] retain]; if(!cmdData || readError != nil || [convError length] || !(format == NSPropertyListXMLFormat_v1_0 || format == NSPropertyListBinaryFormat_v1_0)) { - NSLog(@"%@ file couldn't be read.", infoPath); + NSLog(@"“%@” file couldn't be read.", infoPath); NSBeep(); if (cmdData) [cmdData release]; return; @@ -643,7 +643,7 @@ if(inputFileError != nil) { NSString *errorMessage = [inputFileError localizedDescription]; SPBeginAlertSheet(NSLocalizedString(@"Bundle Error", @"bundle error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil, - [NSString stringWithFormat:@"%@ %@:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage]); + [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage]); if (cmdData) [cmdData release]; return; } @@ -763,7 +763,7 @@ } else if([err code] != 9) { // Suppress an error message if command was killed NSString *errorMessage = [err localizedDescription]; SPBeginAlertSheet(NSLocalizedString(@"BASH Error", @"bash error"), NSLocalizedString(@"OK", @"OK button"), nil, nil, [self window], self, nil, nil, - [NSString stringWithFormat:@"%@ %@:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage]); + [NSString stringWithFormat:@"%@ “%@”:\n%@", NSLocalizedString(@"Error for", @"error for message"), [cmdData objectForKey:@"name"], errorMessage]); } } |