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

Move OakFileBrowser delegate protocol and constants to new file browser

Browse Source
This commit is contained in:
Allan Odgaard
2018-10-28 13:13:03 +07:00
parent b43abb13a6
commit c822943b93
16 changed files with 29 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Frameworks/DocumentWindow/src/DocumentWindowController.mm
View File

@@ -7,7 +7,6 @@
#import <OakAppKit/NSAlert Additions.h>
#import <OakAppKit/NSMenuItem Additions.h>
#import <OakAppKit/OakAppKit.h>
#import <OakAppKit/OakFileManager.h>
#import <OakAppKit/OakPasteboard.h>
#import <OakAppKit/OakSavePanel.h>
#import <MenuBuilder/MenuBuilder.h>
@@ -15,7 +14,6 @@
#import <OakFoundation/NSString Additions.h>
#import <Preferences/Keys.h>
#import <OakTextView/OakDocumentView.h>
#import <OakFileBrowser/OakFileBrowser.h>
#import <FileBrowser/FileBrowserViewController.h>
#import <OakCommand/OakCommand.h>
#import <HTMLOutputWindow/HTMLOutputWindow.h>

2
Frameworks/DocumentWindow/target
View File

@@ -1,5 +1,5 @@
SOURCES = src/*.mm
CP_Resources = resources/*
LINK += BundleEditor BundlesManager FileBrowser Find HTMLOutputWindow MenuBuilder OakAppKit OakTabBarView OakCommand OakFileBrowser OakFilterList OakFoundation OakSystem OakTextView Preferences command document file io kvdb license network ns scm settings text
LINK += BundleEditor BundlesManager FileBrowser Find HTMLOutputWindow MenuBuilder OakAppKit OakTabBarView OakCommand OakFilterList OakFoundation OakSystem OakTextView Preferences command document file io kvdb license network ns scm settings text
EXPORT = src/DocumentWindowController.h
FRAMEWORKS = Cocoa

6
Frameworks/FileBrowser/src/FileBrowserDiskOperations.mm
View File

@@ -1,15 +1,11 @@
#import "FileBrowserView.h"
#import "FileBrowserNotifications.h"
#import "FileItem.h"
#import <OakAppKit/OakSound.h>
#import <OakAppKit/OakFileManager.h> // Only for OakFileManagerWillDeleteItemAtPath
#import <OakAppKit/NSAlert Additions.h>
#import <io/path.h>
#import <ns/ns.h>
// From OakFileBrowser.h
extern PUBLIC NSString* OakFileBrowserDidDuplicateURLs;
extern PUBLIC NSString* OakFileBrowserURLMapKey;
@implementation FileBrowserView (DiskOperations)
- (NSArray<NSURL*>*)performOperation:(FBOperation)op withURLs:(NSDictionary<NSURL*, NSURL*>*)urls unique:(BOOL)makeUnique select:(BOOL)selectDestinationURLs
{

3
Frameworks/OakAppKit/src/OakFileManager.h → Frameworks/FileBrowser/src/FileBrowserNotifications.h
View File

@@ -2,3 +2,6 @@
PUBLIC extern NSString* const OakFileManagerWillDeleteItemAtPath;
PUBLIC extern NSString* const OakFileManagerPathKey;
PUBLIC extern NSString* const OakFileBrowserDidDuplicateURLs;
PUBLIC extern NSString* const OakFileBrowserURLMapKey;

7
Frameworks/FileBrowser/src/FileBrowserNotifications.mm Normal file
View File

@@ -0,0 +1,7 @@
#import "FileBrowserNotifications.h"
NSString* const OakFileManagerWillDeleteItemAtPath = @"OakFileManagerWillDeleteItemAtPath";
NSString* const OakFileManagerPathKey = @"directory";
NSString* const OakFileBrowserDidDuplicateURLs = @"OakFileBrowserDidDuplicateURLs";
NSString* const OakFileBrowserURLMapKey = @"OakFileBrowserURLMapKey";

2
Frameworks/FileBrowser/src/FileBrowserView.h
View File

@@ -1,3 +1,5 @@
#include <oak/misc.h>
@class FileItem;
@class OFBHeaderView;
@class OFBActionsView;

1
Frameworks/FileBrowser/src/FileBrowserView.mm
View File

@@ -1,4 +1,5 @@
#import "FileBrowserView.h"
#import "FileBrowserNotifications.h"
#import "FileItem.h"
#import "FileItemTableCellView.h"
#import "FileBrowserOutlineView.h"

9
Frameworks/FileBrowser/src/FileBrowserViewController.h
View File

@@ -1,4 +1,11 @@
@protocol OakFileBrowserDelegate;
#import "FileBrowserNotifications.h"
@class OakFileBrowser;
@protocol OakFileBrowserDelegate
- (void)fileBrowser:(OakFileBrowser*)aFileBrowser openURLs:(NSArray*)someURLs;
- (void)fileBrowser:(OakFileBrowser*)aFileBrowser closeURL:(NSURL*)anURL;
@end
@interface FileBrowserViewController : NSViewController
@property (nonatomic, weak) id <OakFileBrowserDelegate> delegate;

1
Frameworks/FileBrowser/src/FileBrowserViewController.mm
View File

@@ -11,7 +11,6 @@
#import <OakAppKit/OakFinderTag.h>
#import <OakAppKit/OakZoomingIcon.h>
#import <OakCommand/OakCommand.h>
#import <OakFileBrowser/OakFileBrowser.h>
#import <Preferences/Keys.h>
#import <bundles/bundles.h>
#import <ns/ns.h>

6
Frameworks/FileBrowser/src/FileItem.h
View File

@@ -1,8 +1,8 @@
#import <oak/misc.h>
#import <scm/status.h>
// Defined in OakFileBrowser/OakFSUtilities.h (private header)
extern NSURL* kURLLocationComputer;
extern NSURL* kURLLocationFavorites;
PUBLIC extern NSURL* const kURLLocationComputer;
PUBLIC extern NSURL* const kURLLocationFavorites;
@class OakFinderTag;

3
Frameworks/FileBrowser/src/FileItem.mm
View File

@@ -7,6 +7,9 @@
#import <Preferences/Keys.h>
#import <ns/ns.h>
NSURL* const kURLLocationComputer = [[NSURL alloc] initWithString:@"computer:///"];
NSURL* const kURLLocationFavorites = [[NSURL alloc] initFileURLWithPath:[NSHomeDirectory() stringByAppendingPathComponent:@"Library/Application Support/TextMate/Favorites"] isDirectory:YES];
@implementation NSURL (CompatibilityWrapper)
- (BOOL)tmHasDirectoryPath
{

4
Frameworks/OakAppKit/src/OakFileManager.mm
View File

@@ -1,4 +0,0 @@
#import "OakFileManager.h"
NSString* const OakFileManagerWillDeleteItemAtPath = @"OakFileManagerWillDeleteItemAtPath";
NSString* const OakFileManagerPathKey = @"directory";

4
Frameworks/OakFileBrowser/src/OakFSUtilities.h
View File

@@ -1,4 +0,0 @@
#import <oak/misc.h>
PUBLIC extern NSURL* kURLLocationComputer;
PUBLIC extern NSURL* kURLLocationFavorites;

18
Frameworks/OakFileBrowser/src/OakFSUtilities.mm
View File

@@ -1,18 +0,0 @@
#import "OakFSUtilities.h"
#import <io/io.h>
#import <OakFoundation/NSString Additions.h>
NSURL* kURLLocationComputer;
NSURL* kURLLocationHome;
NSURL* kURLLocationDesktop;
NSURL* kURLLocationFavorites;
NSURL* kURLLocationBundles;
__attribute__((constructor)) // executed after +loads and initializers in linked frameworks
static void initializeConstants ()
{
@autoreleasepool {
kURLLocationComputer = [[NSURL alloc] initWithString:@"computer:///"];
kURLLocationFavorites = [[NSURL alloc] initFileURLWithPath:[NSString stringWithCxxString:path::join(path::home(), "Library/Application Support/TextMate/Favorites")] isDirectory:YES];
}
}

11
Frameworks/OakFileBrowser/src/OakFileBrowser.h
View File

@@ -1,11 +0,0 @@
#import <oak/misc.h>
extern PUBLIC NSString* OakFileBrowserDidDuplicateURLs;
extern PUBLIC NSString* OakFileBrowserURLMapKey;
@class OakFileBrowser;
@protocol OakFileBrowserDelegate
- (void)fileBrowser:(OakFileBrowser*)aFileBrowser openURLs:(NSArray*)someURLs;
- (void)fileBrowser:(OakFileBrowser*)aFileBrowser closeURL:(NSURL*)anURL;
@end

4
Frameworks/OakFileBrowser/src/OakFileBrowser.mm
View File

@@ -1,4 +0,0 @@
#import "OakFileBrowser.h"
NSString* OakFileBrowserDidDuplicateURLs = @"OakFileBrowserDidDuplicateURLs";
NSString* OakFileBrowserURLMapKey = @"OakFileBrowserURLMapKey";