Fix bugs. Polish UI. Remove sparkle framework temporarily

MFClientFSUI.m

@@ -20,7 +20,6 @@
 #import "MFClientFSUI.h"
 #import "MFAdvancedViewController.h"
 #import "MGTransitioningTabView.h"
-#import "MGTestView.h"
 
 NSString* kMFUIMainViewKey=@"main";
 NSString* kMFUIAdvancedViewKey=@"advanced";
@@ -102,7 +101,7 @@ - (NSView*)addTopViewToView:(NSView*)originalView
 	[newView setFrameSize: newViewSize];
 	[newView addSubview: [topViewController view]];
 	[newView addSubview: originalView];
-	[[topViewController view] setFrameOrigin: NSMakePoint( 0,  originalViewFrame.size.height)];
+	[[topViewController view] setFrameOrigin: NSMakePoint( -11,  originalViewFrame.size.height)];
 	[newView setAutoresizingMask: NSViewHeightSizable | NSViewWidthSizable];
 	return newView;
 }

MFCore.h

@@ -36,6 +36,7 @@ BOOL mfcSetStateForAgentLoginItem(BOOL state);
 BOOL mfcClientIsUIElement();
 void mfcLaunchAgent();
 void mfcLaunchMenuling();
+void mfcKaboomMacfusion();
 
 // FUSE versioning
 NSString* mfcGetMacFuseVersion();

MFCore.m

@@ -221,6 +221,27 @@ void mfcCheckIntegrity()
 	}
 }
 
+# pragma mark Process Killing
+
+// Kill all Macfusion Processes other than me
+void mfcKaboomMacfusion()
+{
+	NSPredicate* macfusionAppsPredicate = [NSPredicate
+										   predicateWithFormat: 
+										   @"self.NSApplicationBundleIdentifier CONTAINS \
+										   org.mgorbach.macfusion2 AND self.NSApplicationPath != %@", 
+										   mfcMainBundlePath()];
+
+	NSArray* macfusionApps = [[[NSWorkspace sharedWorkspace] launchedApplications] filteredArrayUsingPredicate:
+							  macfusionAppsPredicate];
+	NSArray* macfusionAppsPIDs = [macfusionApps valueForKey: @"NSApplicationProcessIdentifier"];
+	NSLog(@"Killing pids %@", macfusionAppsPIDs);
+	for(NSNumber* pid in macfusionAppsPIDs)
+	{
+		kill( [pid intValue], SIGKILL );
+	}
+}
+
 # pragma mark Trashing
 
 void trashFSEventCallBack(ConstFSEventStreamRef streamRef, 

MFEditingController.m

@@ -125,19 +125,21 @@ - (void)editSheetDidEnd:(NSWindow*)sheet returnCode:(NSInteger)code contextInfo:
 - (NSView*)wrapViewInOKCancel:(NSView*)innerView
 {
 	NSInteger buttonWidth = 80;
-	NSInteger buttonHeight = 25;
-	NSInteger buttonRightPadding = 5;
+	NSInteger buttonHeight = 32;
+	NSInteger buttonRightPadding = 10;
 	NSInteger buttonBottomPadding = 5;
 	NSInteger buttonXDistance = 0;
+	NSInteger ySpacingShift = 8;
 	NSInteger buttonAreaHeight = 2*buttonBottomPadding + buttonHeight;
+	NSInteger margin = 20;
 
 	NSView* outerView = [[NSView alloc] init];
 
-	[outerView setFrameSize: NSMakeSize([innerView frame].size.width, 
+	[outerView setFrameSize: NSMakeSize([innerView frame].size.width + margin, 
 										[innerView frame].size.height +  buttonAreaHeight)];
 
 	[outerView addSubview: innerView];
-	[innerView setFrame: NSMakeRect(0, buttonAreaHeight, [innerView frame].size.width, 
+	[innerView setFrame: NSMakeRect(margin/2, buttonAreaHeight - ySpacingShift, [innerView frame].size.width, 
 									[innerView frame].size.height)];
 
 	NSRect okButtonFrame = NSMakeRect([outerView frame].size.width-buttonRightPadding-buttonWidth, 

MFLogViewerTableView.m

@@ -39,7 +39,8 @@ - (id) initWithCoder: (NSCoder *) decoder
 		 [MFLogViewerTableCell new]];
 		[self addObserver:self
 			   forKeyPath:@"logMessages"
-				  options:(NSKeyValueObservingOptions)0 context:self];
+				  options:(NSKeyValueObservingOptions)0
+				  context:self];
 	}
 
 	return self;

Resources/MacfusionMain-Info.plist

@@ -35,10 +35,14 @@
 	<string>6.0</string>
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
+	<key>SUFeedURL</key>
+	<string>http://macfusionapp.org/appcast.xml</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
+	<key>SUCheckForUpdates</key>
+	<true/>
 	<key>CFBundleVersion</key>
-	<string>2.0 Beta 4</string>
+	<string>2.0 Beta 5</string>
 	<key>NSMainNibFile</key>
 	<string>main</string>
 	<key>NSPrincipalClass</key>

Resources/topView.xib

@@ -2,9 +2,9 @@
 <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.02">
 	<data>
 		<int key="IBDocument.SystemTarget">1050</int>
-		<string key="IBDocument.SystemVersion">9C7010</string>
-		<string key="IBDocument.InterfaceBuilderVersion">648</string>
-		<string key="IBDocument.AppKitVersion">949.26</string>
+		<string key="IBDocument.SystemVersion">9D34</string>
+		<string key="IBDocument.InterfaceBuilderVersion">670</string>
+		<string key="IBDocument.AppKitVersion">949.33</string>
 		<string key="IBDocument.HIToolboxVersion">352.00</string>
 		<object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
 			<bool key="EncodedWithXMLCoder">YES</bool>
@@ -34,7 +34,7 @@
 					<object class="NSTextField" id="761970304">
 						<reference key="NSNextResponder" ref="1005"/>
 						<int key="NSvFlags">268</int>
-						<string key="NSFrame">{{20, 20}, {224, 22}}</string>
+						<string key="NSFrame">{{20, 20}, {214, 22}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSTextFieldCell" key="NSCell" id="636741428">
@@ -83,7 +83,7 @@
 								<string>NeXT TIFF v4.0 pasteboard type</string>
 							</object>
 						</object>
-						<string key="NSFrame">{{252, 7}, {48, 48}}</string>
+						<string key="NSFrame">{{279, 7}, {48, 48}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSImageCell" key="NSCell" id="233289082">
@@ -97,7 +97,7 @@
 						<bool key="NSEditable">YES</bool>
 					</object>
 				</object>
-				<string key="NSFrameSize">{320, 62}</string>
+				<string key="NSFrameSize">{332, 62}</string>
 				<reference key="NSSuperview"/>
 				<string key="NSClassName">NSView</string>
 			</object>
@@ -237,7 +237,7 @@
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>com.apple.InterfaceBuilderKit</string>
 					<string>com.apple.InterfaceBuilderKit</string>
-					<string>{{494, 684}, {320, 62}}</string>
+					<string>{{494, 684}, {332, 62}}</string>
 					<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
 					<string>{628, 654}</string>
 					<string>{{797, 991}, {320, 62}}</string>