From a4dc3bf97740abf362dede181231e20dde29bc1e Mon Sep 17 00:00:00 2001 From: Allan Odgaard Date: Fri, 15 Feb 2013 15:27:54 +0100 Subject: [PATCH] =?UTF-8?q?OakFileManagerDirectoryKey=20=E2=86=92=20OakFil?= =?UTF-8?q?eManagerPathKey?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This allows us to use the same key for more than just directories. The notification name itself should indicate if the ‘path’ refers only to directories or files. --- Frameworks/OakAppKit/src/OakFileManager.h | 2 +- Frameworks/OakAppKit/src/OakFileManager.mm | 4 ++-- Frameworks/OakFileBrowser/src/io/FSDirectoryDataSource.mm | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Frameworks/OakAppKit/src/OakFileManager.h b/Frameworks/OakAppKit/src/OakFileManager.h index 3219dd78..b1ff1944 100644 --- a/Frameworks/OakAppKit/src/OakFileManager.h +++ b/Frameworks/OakAppKit/src/OakFileManager.h @@ -1,7 +1,7 @@ #import PUBLIC extern NSString* const OakFileManagerDidChangeContentsOfDirectory; -PUBLIC extern NSString* const OakFileManagerDirectoryKey; +PUBLIC extern NSString* const OakFileManagerPathKey; PUBLIC @interface OakFileManager : NSObject + (OakFileManager*)sharedInstance; diff --git a/Frameworks/OakAppKit/src/OakFileManager.mm b/Frameworks/OakAppKit/src/OakFileManager.mm index 5e8e9e04..3ebcc754 100644 --- a/Frameworks/OakAppKit/src/OakFileManager.mm +++ b/Frameworks/OakAppKit/src/OakFileManager.mm @@ -5,7 +5,7 @@ #import NSString* const OakFileManagerDidChangeContentsOfDirectory = @"OakFileManagerDidChangeContentsOfDirectory"; -NSString* const OakFileManagerDirectoryKey = @"directory"; +NSString* const OakFileManagerPathKey = @"directory"; @interface OakFileManager () @property (nonatomic) BOOL hasUISoundToPlay; @@ -35,7 +35,7 @@ NSString* const OakFileManagerDirectoryKey = @"directory"; - (void)postDidChangeContentsOfDirectory:(NSString*)aDirectory { - [[NSNotificationCenter defaultCenter] postNotificationName:OakFileManagerDidChangeContentsOfDirectory object:self userInfo:@{ OakFileManagerDirectoryKey : aDirectory }]; + [[NSNotificationCenter defaultCenter] postNotificationName:OakFileManagerDidChangeContentsOfDirectory object:self userInfo:@{ OakFileManagerPathKey : aDirectory }]; } // =================== diff --git a/Frameworks/OakFileBrowser/src/io/FSDirectoryDataSource.mm b/Frameworks/OakFileBrowser/src/io/FSDirectoryDataSource.mm index 4348f66e..5ae8b0b8 100644 --- a/Frameworks/OakFileBrowser/src/io/FSDirectoryDataSource.mm +++ b/Frameworks/OakFileBrowser/src/io/FSDirectoryDataSource.mm @@ -343,7 +343,7 @@ private: - (void)fileManagerDidChangeContentsOfDirectory:(NSNotification*)aNotification { NSDictionary* userInfo = [aNotification userInfo]; - NSString* dir = userInfo[OakFileManagerDirectoryKey]; + NSString* dir = userInfo[OakFileManagerPathKey]; auto it = visibleItems.find(to_s(dir)); if(it != visibleItems.end()) it->second->reload(false);