Skip to content

Minor cleanups #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ElDeveloper wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Minor cleanups #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion MFCore/MFMainController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

#import <Cocoa/Cocoa.h>

@interface MFMainController : NSObject <NSFileManagerDelegate> {
@interface MFMainController : NSObject <NSFileManagerDelegate, NSApplicationDelegate> {
}

+ (MFMainController *)sharedController;
Expand Down
20 changes: 20 additions & 0 deletions MacFusion2.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1787,6 +1787,7 @@
D42E15590CE03A8200C81814 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand Down Expand Up @@ -1846,6 +1847,7 @@
D45B70EB0E1B3DFF0036043E /* Release-Signed */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand Down Expand Up @@ -1919,6 +1921,7 @@
D45B70EE0E1B3DFF0036043E /* Release-Signed */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_LOADER = "${TARGET_BUILD_DIR}/macfusionAgent.app/Contents/MacOS/macfusionAgent";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand Down Expand Up @@ -1988,6 +1991,7 @@
D45B70F10E1B3DFF0036043E /* Release-Signed */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
Expand All @@ -2008,6 +2012,7 @@
D45B70F20E1B3DFF0036043E /* Release-Signed */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand All @@ -2032,6 +2037,7 @@
D45B70F30E1B3DFF0036043E /* Release-Signed */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand Down Expand Up @@ -2114,6 +2120,7 @@
D45B70F70E1B3E050036043E /* Debug-Signed */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand Down Expand Up @@ -2187,6 +2194,7 @@
D45B70FA0E1B3E050036043E /* Debug-Signed */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_LOADER = "${TARGET_BUILD_DIR}/macfusionAgent.app/Contents/MacOS/macfusionAgent";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand Down Expand Up @@ -2256,6 +2264,7 @@
D45B70FD0E1B3E050036043E /* Debug-Signed */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
Expand All @@ -2276,6 +2285,7 @@
D45B70FE0E1B3E050036043E /* Debug-Signed */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand All @@ -2300,6 +2310,7 @@
D45B70FF0E1B3E050036043E /* Debug-Signed */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand Down Expand Up @@ -2351,6 +2362,7 @@
D48DB9820D70D7A4008A62BB /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand All @@ -2375,6 +2387,7 @@
D48DB9830D70D7A4008A62BB /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
Expand All @@ -2400,6 +2413,7 @@
D4B14BB90CE03CC4003195A3 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_LOADER = "${TARGET_BUILD_DIR}/macfusionAgent.app/Contents/MacOS/macfusionAgent";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand All @@ -2424,6 +2438,7 @@
D4B14D6F0CE19545003195A3 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
Expand All @@ -2444,6 +2459,7 @@
D4DB42070D3E863200C99914 /* Release */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand Down Expand Up @@ -2475,6 +2491,7 @@
D4DB42080D3E863200C99914 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
Expand Down Expand Up @@ -2687,6 +2704,7 @@
D4FC0DC80CF23DE30029B133 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand Down Expand Up @@ -2716,6 +2734,7 @@
D4FC0DC90CF23DE30029B133 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
BUNDLE_LOADER = "${TARGET_BUILD_DIR}/macfusionAgent.app/Contents/MacOS/macfusionAgent";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
Expand All @@ -2740,6 +2759,7 @@
D4FC0DCB0CF23DE30029B133 /* Debug */ = {
isa = XCBuildConfiguration;
buildSettings = {
ALWAYS_SEARCH_USER_PATHS = NO;
CLANG_LINK_OBJC_RUNTIME = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
Expand Down
2 changes: 1 addition & 1 deletion Menuling/MFMenulingAppDelegate.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@

@class MFClient, MFQuickMountController;

@interface MFMenulingAppDelegate : NSObject <MFClientFSDelegateProtocol, MFClientDelegateProtocol, NSMenuDelegate> {
@interface MFMenulingAppDelegate : NSObject <MFClientFSDelegateProtocol, MFClientDelegateProtocol, NSMenuDelegate, NSApplicationDelegate> {
NSStatusItem* statusItem;
MFClient* client;
MFQuickMountController* qmController;
Expand Down
4 changes: 2 additions & 2 deletions Menuling/MGFadingWindow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
// limitations under the License.

#import <Cocoa/Cocoa.h>
#import <QuartzCore/QuartzCore.h>


@interface MGFadingWindow : NSPanel {
@interface MGFadingWindow : NSPanel <CAAnimationDelegate> {
BOOL closing;
}

Expand Down
1 change: 1 addition & 0 deletions Settings/MFFilesystemCell.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
- (NSRect)progressIndicatorRectInRect:(NSRect)rect;
- (void)clearImageForFS:(MFClientFS*)fs;
- (NSImage*)iconToDraw;
- (NSRect)rectForIconBox;

@property(readwrite) BOOL editPushed;
@property(readwrite) BOOL mountPushed;
Expand Down
6 changes: 4 additions & 2 deletions Settings/MFFilesystemCell.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,6 @@ - (id)init
- (NSRect)insetRectWithFrame:(NSRect)frame
{
return frame;
NSRect insetRect = NSInsetRect(frame, 10, 0);
return insetRect;
}
- (NSRect)iconBoxWithFrame:(NSRect)frame
{
Expand Down Expand Up @@ -79,6 +77,10 @@ - (void)clearImageForFS:(MFClientFS*)fs
[icons removeObjectForKey: fs];
}

- (NSRect)rectForIconBox{
return NSMakeRect(0, 0, IMAGE_SIZE, IMAGE_SIZE);
}

# pragma mark Drawing
- (void)drawInteriorWithFrame:(NSRect)cellFrame inView:(NSView*)controlView
{
Expand Down
2 changes: 1 addition & 1 deletion Settings/MFFilesystemTableView.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,7 +228,7 @@ - (NSImage *)dragImageForRowsWithIndexes:(NSIndexSet *)theRowIndexes
NSInteger fsRowIndex = [theRowIndexes firstIndex];
MFFilesystemCell* cell = (MFFilesystemCell*)[self preparedCellAtColumn:0 row: fsRowIndex];
NSImage* icon = [cell iconToDraw];
[icon setFlipped: NO];
[icon drawInRect:[cell rectForIconBox] fromRect:NSZeroRect operation:NSCompositeSourceIn fraction:1.0 respectFlipped:YES hints:nil];
return icon;
}

Expand Down
3 changes: 1 addition & 2 deletions Settings/MFSettingsController.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
MFLogViewerController, MGActionButton;


@interface MFSettingsController : NSObject <MFClientFSDelegateProtocol>
@interface MFSettingsController : NSObject <MFClientFSDelegateProtocol, NSApplicationDelegate>
{
IBOutlet NSArrayController* filesystemArrayController;
IBOutlet NSArrayController* pluginArrayController;
Expand All @@ -36,7 +36,6 @@ MFLogViewerController, MGActionButton;
}

- (IBAction)newFSPopupClicked:(id)sender;
- (IBAction)showAboutWindow:(id)sender;
- (IBAction)showPreferences:(id)sender;
- (IBAction)startMenuItem:(id)sender;
- (IBAction)showLogViewer:(id)sender;
Expand Down
2 changes: 1 addition & 1 deletion Settings/MFSettingsController.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -343,7 +343,7 @@ - (IBAction)toggleSelectedFS:(id)sender {

- (IBAction)revealConfigForSelectedFS:(id)sender {
for(MFClientFS *fs in [self selectedFilesystems]) {
[[NSWorkspace sharedWorkspace] selectFile:fs.filePath inFileViewerRootedAtPath:nil];
[[NSWorkspace sharedWorkspace] selectFile:fs.filePath inFileViewerRootedAtPath:@""];
}
}

Expand Down