github/textmate
1
1
Fork 0
mirror of https://github.com/textmate/textmate.git synced 2026-04-28 03:00:34 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove implementation details from interface

Browse Source 
The properties left in the interface are used with bindings so sort of public (as they are used “outside” the implementation file).
This commit is contained in:
Allan Odgaard
2013-01-01 17:26:13 +01:00
parent 079b762c42
commit 534df6e755
2 changed files with 31 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
Frameworks/DocumentWindow/src/FileTypeDialog.h
View File

@@ -10,43 +10,12 @@ enum enabled_grammar_t { kEnabledGrammarsRecommended = 0, kEnabledGrammarsInstal
IBOutlet NSWindow* installingBundleWindow;
IBOutlet NSTextField* installingBundleActivityTextField;
IBOutlet NSProgressIndicator* installingBundleProgressIndicator;
NSString* path;
std::string firstLine;
NSInteger enabledGrammars;
BOOL persistentSetting;
BOOL canOpenDocument;
NSArray* recommendedGrammars;
NSArray* installedGrammars;
NSArray* allGrammars;
NSArray* grammars;
NSIndexSet* selectedGrammarIndexes;
NSString* alertFormatString;
NSString* infoFormatString;
NSString* useForAllFormatString;
}
@property (nonatomic, retain) NSString* path;
@property (nonatomic, assign) NSInteger enabledGrammars;
@property (nonatomic, assign) BOOL persistentSetting;
@property (nonatomic, assign) BOOL canOpenDocument;
@property (nonatomic, retain) NSArray* recommendedGrammars;
@property (nonatomic, retain) NSArray* installedGrammars;
@property (nonatomic, retain) NSArray* allGrammars;
@property (nonatomic, retain) NSArray* grammars;
@property (nonatomic, retain) NSIndexSet* selectedGrammarIndexes;
@property (nonatomic, retain) NSString* alertFormatString;
@property (nonatomic, retain) NSString* infoFormatString;
@property (nonatomic, retain) NSString* useForAllFormatString;
@property (nonatomic, readonly) NSDictionary* grammar;
@property (nonatomic, readonly) NSString* fileType;
@property (nonatomic, assign) BOOL persistentSetting;
@property (nonatomic, assign) BOOL canOpenDocument;
- (id)initWithPath:(NSString*)aPath first:(char const*)firstPointer last:(char const*)lastPointer;
- (void)beginSheetModalForWindow:(NSWindow*)aWindow completionHandler:(void(^)(NSString* fileType))aCompletionHandler;

44
Frameworks/DocumentWindow/src/FileTypeDialog.mm
View File

@@ -51,11 +51,25 @@ static bool is_installed (oak::uuid_t const& uuid)
return bundles::lookup(uuid) ? true : false;
}
@interface FileTypeDialog ()
@property (nonatomic, retain) NSString* path;
@property (nonatomic, retain) NSArray* recommendedGrammars;
@property (nonatomic, retain) NSArray* installedGrammars;
@property (nonatomic, retain) NSArray* allGrammars;
@property (nonatomic, retain) NSString* alertFormatString;
@property (nonatomic, retain) NSString* infoFormatString;
@property (nonatomic, retain) NSString* useForAllFormatString;
@property (nonatomic, readonly) NSDictionary* grammar;
@property (nonatomic, readonly) NSString* fileType;
@end
@implementation FileTypeDialog
@synthesize path, enabledGrammars, persistentSetting, canOpenDocument;
@synthesize recommendedGrammars, installedGrammars, allGrammars;
@synthesize grammars, selectedGrammarIndexes;
@synthesize alertFormatString, infoFormatString, useForAllFormatString;
{
std::string firstLine;
}
- (id)initWithPath:(NSString*)aPath first:(char const*)firstPointer last:(char const*)lastPointer
{
@@ -93,7 +107,7 @@ static bool is_installed (oak::uuid_t const& uuid)
{
iterate(ext, (*grammar)->file_types())
{
if(path::rank(to_s(path), *ext))
if(path::rank(to_s(self.path), *ext))
recommended.insert(info);
}
}
@@ -122,18 +136,18 @@ static bool is_installed (oak::uuid_t const& uuid)
self.useForAllFormatString = [useForAllCheckBox title];
std::map<std::string, std::string> variables;
variables["DisplayName"] = path::display_name(to_s(path));
std::string const ext = path::extensions(to_s(path));;
variables["DisplayName"] = path::display_name(to_s(self.path));
std::string const ext = path::extensions(to_s(self.path));;
if(ext != "")
{
self.persistentSetting = YES;
if(ext != path::name(to_s(path)))
if(ext != path::name(to_s(self.path)))
variables["X"] = ext;
}
std::string const alert = format_string::expand(to_s(alertFormatString), variables);
std::string const info = format_string::expand(to_s(infoFormatString), variables);
std::string const choice = format_string::expand(to_s(useForAllFormatString), variables);
std::string const alert = format_string::expand(to_s(self.alertFormatString), variables);
std::string const info = format_string::expand(to_s(self.infoFormatString), variables);
std::string const choice = format_string::expand(to_s(self.useForAllFormatString), variables);
[alertTextField setStringValue:[NSString stringWithCxxString:alert]];
[infoTextField setStringValue:[NSString stringWithCxxString:info]];
@@ -142,8 +156,8 @@ static bool is_installed (oak::uuid_t const& uuid)
- (void)setEnabledGrammars:(NSInteger)newFilter
{
enabledGrammars = newFilter;
switch(enabledGrammars)
_enabledGrammars = newFilter;
switch(_enabledGrammars)
{
case kEnabledGrammarsRecommended: self.grammars = self.recommendedGrammars; break;
case kEnabledGrammarsInstalled: self.grammars = self.installedGrammars; break;
@@ -154,7 +168,7 @@ static bool is_installed (oak::uuid_t const& uuid)
- (NSDictionary*)grammar
{
return [selectedGrammarIndexes count] == 0 ? nil : [grammars objectAtIndex:[selectedGrammarIndexes firstIndex]];
return [_selectedGrammarIndexes count] == 0 ? nil : [_grammars objectAtIndex:[_selectedGrammarIndexes firstIndex]];
}
- (NSString*)fileType
@@ -183,7 +197,7 @@ static bool is_installed (oak::uuid_t const& uuid)
if(is_installed(uuid))
{
if(self.persistentSetting)
file::set_type(to_s(path), scope);
file::set_type(to_s(self.path), scope);
return aCompletionHandler(self.fileType);
}