diff options
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/SPAboutController.m | 7 | ||||
| -rw-r--r-- | Source/SPExportController.m | 4 | ||||
| -rw-r--r-- | Source/SPWindowController.m | 28 |
3 files changed, 19 insertions, 20 deletions
diff --git a/Source/SPAboutController.m b/Source/SPAboutController.m index 0e0e7a09..1e0c82c2 100644 --- a/Source/SPAboutController.m +++ b/Source/SPAboutController.m @@ -25,6 +25,9 @@ #import "SPAboutController.h" +static NSString *SPCreditsFilename = @"Credits"; +static NSString *SPLicenseFilename = @"License"; + @implementation SPAboutController /** @@ -52,10 +55,10 @@ [appBuildVersionTextField setStringValue:[NSString stringWithFormat:@"%@ %@", (isNightly) ? NSLocalizedString(@"Nightly Build", @"nightly build label") : NSLocalizedString(@"Build", @"build label") , [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]]]; // Get the credits file contents - NSAttributedString *credits = [[[NSAttributedString alloc] initWithPath:[[NSBundle mainBundle] pathForResource:@"Credits" ofType:@"rtf"] documentAttributes:nil] autorelease]; + NSAttributedString *credits = [[[NSAttributedString alloc] initWithPath:[[NSBundle mainBundle] pathForResource:SPCreditsFilename ofType:@"rtf"] documentAttributes:nil] autorelease]; // Get the license file contents - NSAttributedString *license = [[[NSAttributedString alloc] initWithPath:[[NSBundle mainBundle] pathForResource:@"License" ofType:@"rtf"] documentAttributes:nil] autorelease]; + NSAttributedString *license = [[[NSAttributedString alloc] initWithPath:[[NSBundle mainBundle] pathForResource:SPLicenseFilename ofType:@"rtf"] documentAttributes:nil] autorelease]; // Set the credits [[appCreditsTextView textStorage] appendAttributedString:credits]; diff --git a/Source/SPExportController.m b/Source/SPExportController.m index 54be5b91..ffaa242b 100644 --- a/Source/SPExportController.m +++ b/Source/SPExportController.m @@ -45,8 +45,8 @@ static const NSString *SPTableViewContentColumnID = @"content"; static const NSString *SPTableViewDropColumnID = @"drop"; static const NSString *SPSQLExportStructureEnabled = @"SQLExportStructureEnabled"; -static const NSString *SPSQLExportContentEnabled = @"SQLExportContentEnabled"; -static const NSString *SPSQLExportDropEnabled = @"SQLExportDropEnabled"; +static const NSString *SPSQLExportContentEnabled = @"SQLExportContentEnabled"; +static const NSString *SPSQLExportDropEnabled = @"SQLExportDropEnabled"; @interface SPExportController (PrivateAPI) diff --git a/Source/SPWindowController.m b/Source/SPWindowController.m index ed18335d..f4094ac3 100644 --- a/Source/SPWindowController.m +++ b/Source/SPWindowController.m @@ -31,9 +31,9 @@ #import <PSMTabBar/PSMTabBarControl.h> #import <PSMTabBar/PSMTabStyle.h> -@interface SPWindowController (PrivateAPI) +@interface SPWindowController () -- (void) _updateProgressIndicatorForItem:(NSTabViewItem *)theItem; +- (void)_updateProgressIndicatorForItem:(NSTabViewItem *)theItem; @end @@ -760,20 +760,25 @@ return [selectedTableDocument performSelector:theSelector withObject:theObject]; } -@end - -@implementation SPWindowController (PrivateAPI) +/** + * When receiving an update for a bound value - an observed value on the + * document - ask the tab bar control to redraw as appropriate. + */ +- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context +{ + [tabBar update]; +} /** * Binds a tab bar item's progress indicator to the represented * tableDocument. */ -- (void) _updateProgressIndicatorForItem:(NSTabViewItem *)theItem +- (void)_updateProgressIndicatorForItem:(NSTabViewItem *)theItem { PSMTabBarCell *theCell = [[tabBar cells] objectAtIndex:[tabView indexOfTabViewItem:theItem]]; [[theCell indicator] setControlSize:NSSmallControlSize]; SPDatabaseDocument *theDocument = [theItem identifier]; - + [[theCell indicator] setHidden:NO]; NSMutableDictionary *bindingOptions = [NSMutableDictionary dictionary]; [bindingOptions setObject:NSNegateBooleanTransformerName forKey:@"NSValueTransformerName"]; @@ -782,13 +787,4 @@ [theDocument addObserver:self forKeyPath:@"isProcessing" options:0 context:nil]; } -/** - * When receiving an update for a bound value - an observed value on the - * document - ask the tab bar control to redraw as appropriate. - */ -- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context -{ - [tabBar update]; -} - @end
\ No newline at end of file |