diff --git a/MFAdvancedViewController.m b/MFAdvancedViewController.m index 4cdc70c..3eddbef 100644 --- a/MFAdvancedViewController.m +++ b/MFAdvancedViewController.m @@ -18,9 +18,9 @@ - (IBAction)chooseIcon:(id)sender { NSOpenPanel *panel = [NSOpenPanel openPanel]; [panel setAllowsMultipleSelection:NO]; [panel setAllowedFileTypes:[NSArray arrayWithObject: @"icns"]]; - NSInteger returnValue = [panel runModalForTypes:[NSArray arrayWithObject: @"icns"]]; - if (returnValue == NSOKButton && [[panel filenames] count] > 0) { - NSString *filename = [[panel filenames] objectAtIndex:0]; + NSInteger returnValue = [panel runModal]; + if (returnValue == NSOKButton && [[panel URLs] count] > 0) { + NSString *filename = [[[panel URLs] objectAtIndex:0] path]; NSImage *iconImage = [[NSImage alloc] initWithContentsOfFile:filename]; if (iconImage) { [(MFClientFS*)[self representedObject] setIconImage:iconImage]; diff --git a/MFCore.m b/MFCore.m index 0123289..7a3f0f8 100644 --- a/MFCore.m +++ b/MFCore.m @@ -215,18 +215,12 @@ void mfcCheckIntegrity() { // 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"]; - for(NSNumber *pid in macfusionAppsPIDs) { - kill( [pid intValue], SIGKILL ); - } + NSArray *runningApps = [[NSWorkspace sharedWorkspace] runningApplications]; + for (NSRunningApplication *app in runningApps) { + if ([app.bundleIdentifier isEqualToString:kMFMainBundleIdentifier] && + ![app.bundleURL.path isEqualToString:mfcMainBundlePath()]) + [app terminate]; + } } # pragma mark Trashing diff --git a/MFServerPlugin.h b/MFServerPlugin.h index f9913cd..549c3b6 100644 --- a/MFServerPlugin.h +++ b/MFServerPlugin.h @@ -21,5 +21,5 @@ } + (MFServerPlugin *)pluginFromBundleAtPath:(NSString *)path; - +- (MFPlugin *)initWithPath:(NSString *)path; @end diff --git a/MacFusion2.xcodeproj/project.pbxproj b/MacFusion2.xcodeproj/project.pbxproj index fe73023..6fe1c2a 100644 --- a/MacFusion2.xcodeproj/project.pbxproj +++ b/MacFusion2.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 44; + objectVersion = 46; objects = { /* Begin PBXAggregateTarget section */ @@ -1228,8 +1228,11 @@ /* Begin PBXProject section */ 08FB7793FE84155DC02AAC07 /* Project object */ = { isa = PBXProject; + attributes = { + LastUpgradeCheck = 0420; + }; buildConfigurationList = 1DEB927808733DD40010E9CD /* Build configuration list for PBXProject "MacFusion2" */; - compatibilityVersion = "Xcode 3.0"; + compatibilityVersion = "Xcode 3.2"; developmentRegion = English; hasScannedForEncodings = 1; knownRegions = ( @@ -1580,12 +1583,10 @@ 1DEB927A08733DD40010E9CD /* Release */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - PREBINDING = NO; SDKROOT = ""; }; name = Release; @@ -1594,11 +1595,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1611,7 +1610,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = new_sshfs_askpass; ZERO_LINK = NO; }; @@ -1623,7 +1621,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; @@ -1637,7 +1634,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = new_sshfs_askpass; }; name = Debug; @@ -1647,7 +1643,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = Plugins; ZERO_LINK = NO; }; @@ -1671,7 +1666,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1685,7 +1679,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = MFCore; ZERO_LINK = NO; }; @@ -1694,13 +1687,11 @@ D45B70EA0E1B3DFF0036043E /* Release-Signed */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_64_BIT_PRE_XCODE_3_1 = "x86_64 i386 ppc"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; ONLY_ACTIVE_ARCH = NO; - PREBINDING = NO; SDKROOT = ""; }; name = "Release-Signed"; @@ -1713,7 +1704,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1727,7 +1717,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = MFCore; ZERO_LINK = NO; }; @@ -1737,11 +1726,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1754,7 +1741,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = ftpfs_askpass; ZERO_LINK = NO; }; @@ -1766,7 +1752,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1780,7 +1765,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = ftpfs; WRAPPER_EXTENSION = mfplugin; ZERO_LINK = NO; @@ -1793,7 +1777,6 @@ BUNDLE_LOADER = "${TARGET_BUILD_DIR}/macfusionAgent.app/Contents/MacOS/macfusionAgent"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1807,7 +1790,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = sshfs; WRAPPER_EXTENSION = mfplugin; ZERO_LINK = NO; @@ -1818,11 +1800,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1835,7 +1815,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = new_sshfs_askpass; ZERO_LINK = NO; }; @@ -1847,7 +1826,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = supported; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1861,7 +1839,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = macfusionAgent; ZERO_LINK = NO; }; @@ -1872,7 +1849,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1884,7 +1860,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = mfctl; ZERO_LINK = NO; }; @@ -1895,7 +1870,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1909,7 +1883,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = MacfusionMenuling; WRAPPER_EXTENSION = app; ZERO_LINK = NO; @@ -1925,7 +1898,6 @@ "$(inherited)", "\"$(SRCROOT)\"", ); - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -1939,7 +1911,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = Macfusion; WRAPPER_EXTENSION = app; ZERO_LINK = NO; @@ -1951,7 +1922,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = All; ZERO_LINK = NO; }; @@ -1962,7 +1932,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = Plugins; ZERO_LINK = NO; }; @@ -1971,12 +1940,11 @@ D45B70F60E1B3E050036043E /* Debug-Signed */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)"; - PREBINDING = NO; + ONLY_ACTIVE_ARCH = YES; SDKROOT = ""; }; name = "Debug-Signed"; @@ -1989,7 +1957,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2003,7 +1970,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = MFCore; ZERO_LINK = NO; }; @@ -2013,11 +1979,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2030,7 +1994,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = ftpfs_askpass; ZERO_LINK = NO; }; @@ -2042,7 +2005,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2056,7 +2018,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = ftpfs; WRAPPER_EXTENSION = mfplugin; ZERO_LINK = NO; @@ -2069,7 +2030,6 @@ BUNDLE_LOADER = "${TARGET_BUILD_DIR}/macfusionAgent.app/Contents/MacOS/macfusionAgent"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2083,7 +2043,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = sshfs; WRAPPER_EXTENSION = mfplugin; ZERO_LINK = NO; @@ -2094,11 +2053,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2111,7 +2068,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = new_sshfs_askpass; ZERO_LINK = NO; }; @@ -2123,7 +2079,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = supported; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2137,7 +2092,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = macfusionAgent; ZERO_LINK = NO; }; @@ -2148,7 +2102,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2160,7 +2113,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = mfctl; ZERO_LINK = NO; }; @@ -2171,7 +2123,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2185,7 +2136,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = MacfusionMenuling; WRAPPER_EXTENSION = app; ZERO_LINK = NO; @@ -2201,7 +2151,6 @@ "$(inherited)", "\"$(SRCROOT)\"", ); - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2215,7 +2164,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = Macfusion; WRAPPER_EXTENSION = app; ZERO_LINK = NO; @@ -2227,7 +2175,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = All; ZERO_LINK = NO; }; @@ -2238,7 +2185,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = Plugins; ZERO_LINK = NO; }; @@ -2249,7 +2195,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2263,7 +2208,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = MacfusionMenuling; WRAPPER_EXTENSION = app; ZERO_LINK = NO; @@ -2275,7 +2219,6 @@ buildSettings = { COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; @@ -2290,7 +2233,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = MacfusionMenuling; WRAPPER_EXTENSION = app; ZERO_LINK = YES; @@ -2303,7 +2245,6 @@ BUNDLE_LOADER = "${TARGET_BUILD_DIR}/macfusionAgent.app/Contents/MacOS/macfusionAgent"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2317,7 +2258,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = sshfs; WRAPPER_EXTENSION = mfplugin; ZERO_LINK = NO; @@ -2329,7 +2269,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2341,7 +2280,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = mfctl; ZERO_LINK = NO; }; @@ -2356,7 +2294,6 @@ "$(inherited)", "\"$(SRCROOT)\"", ); - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2370,7 +2307,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = Macfusion; WRAPPER_EXTENSION = app; ZERO_LINK = NO; @@ -2386,7 +2322,6 @@ "\"$(SRCROOT)\"", ); GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; @@ -2401,7 +2336,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = Macfusion; WRAPPER_EXTENSION = app; ZERO_LINK = YES; @@ -2414,7 +2348,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2428,7 +2361,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = ftpfs; WRAPPER_EXTENSION = mfplugin; ZERO_LINK = NO; @@ -2441,7 +2373,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; @@ -2456,7 +2387,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = ftpfs; WRAPPER_EXTENSION = mfplugin; }; @@ -2466,11 +2396,9 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - ARCHS = "$(ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1)"; - ARCHS_STANDARD_32_BIT_PRE_XCODE_3_1 = "ppc i386"; + ARCHS = "$(ARCHS_STANDARD_32_BIT)"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2483,7 +2411,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = ftpfs_askpass; ZERO_LINK = NO; }; @@ -2496,7 +2423,6 @@ ARCHS = "$(NATIVE_ARCH)"; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; @@ -2510,7 +2436,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = ftpfs_askpass; }; name = Debug; @@ -2521,7 +2446,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = supported; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2535,7 +2459,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = macfusionAgent; ZERO_LINK = NO; }; @@ -2547,7 +2470,6 @@ ALWAYS_SEARCH_USER_PATHS = NO; COPY_PHASE_STRIP = NO; GCC_DYNAMIC_NO_PIC = NO; - GCC_ENABLE_FIX_AND_CONTINUE = YES; GCC_ENABLE_OBJC_GC = supported; GCC_MODEL_TUNING = G5; GCC_OPTIMIZATION_LEVEL = 0; @@ -2562,7 +2484,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = macfusionAgent; }; name = Debug; @@ -2572,7 +2493,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = All; ZERO_LINK = NO; }; @@ -2581,12 +2501,11 @@ D4FC0DC60CF23DE30029B133 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { - ARCHS = "$(ONLY_ACTIVE_ARCH_PRE_XCODE_3_1)"; + ARCHS = "$(ARCHS_STANDARD_32_64_BIT)"; GCC_VERSION = com.apple.compilers.llvm.clang.1_0; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; - ONLY_ACTIVE_ARCH_PRE_XCODE_3_1 = "$(NATIVE_ARCH_ACTUAL)"; - PREBINDING = NO; + ONLY_ACTIVE_ARCH = YES; SDKROOT = ""; }; name = Debug; @@ -2599,7 +2518,6 @@ DYLIB_COMPATIBILITY_VERSION = 1; DYLIB_CURRENT_VERSION = 1; FRAMEWORK_VERSION = A; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2613,7 +2531,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = MFCore; ZERO_LINK = NO; }; @@ -2625,7 +2542,6 @@ BUNDLE_LOADER = "${TARGET_BUILD_DIR}/macfusionAgent.app/Contents/MacOS/macfusionAgent"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2639,7 +2555,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = sshfs; WRAPPER_EXTENSION = mfplugin; ZERO_LINK = NO; @@ -2651,7 +2566,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; GCC_ENABLE_OBJC_GC = required; GCC_MODEL_TUNING = G5; GCC_PRECOMPILE_PREFIX_HEADER = YES; @@ -2663,7 +2577,6 @@ "-framework", AppKit, ); - PREBINDING = NO; PRODUCT_NAME = mfctl; ZERO_LINK = NO; }; @@ -2674,7 +2587,6 @@ buildSettings = { COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - GCC_ENABLE_FIX_AND_CONTINUE = NO; PRODUCT_NAME = All; ZERO_LINK = NO; }; diff --git a/Settings/MFSettingsController.m b/Settings/MFSettingsController.m index b1c84a4..619ca66 100644 --- a/Settings/MFSettingsController.m +++ b/Settings/MFSettingsController.m @@ -94,13 +94,13 @@ - (BOOL)setup { return YES; } else { BOOL agentRunning = NO; - NSArray *runningApplicationIdentifiers = [[[NSWorkspace sharedWorkspace] launchedApplications] valueForKey:@"NSApplicationBundleIdentifier"]; - for(NSString *id in runningApplicationIdentifiers) { - if ([id isEqualToString:kMFAgentBundleIdentifier]) { + NSArray *runningApplications = [[NSWorkspace sharedWorkspace] runningApplications]; + for (NSRunningApplication *app in runningApplications) { + if ([app.bundleIdentifier isEqualToString:kMFAgentBundleIdentifier]) { agentRunning = YES; break; } - } + } if (agentRunning) { // Agent is running. Wait a bit for it to set up IPC diff --git a/Settings/main.xib b/Settings/main.xib index c4d4bc0..c0610ce 100644 --- a/Settings/main.xib +++ b/Settings/main.xib @@ -1,21 +1,39 @@ - + 1050 - 9E17 - 670 - 949.33 - 352.00 - + 11C74 + 1938 + 1138.23 + 567.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 1938 + + YES - - - + NSScroller + NSArrayController + NSMenuItem + NSMenu + NSScrollView + NSTextFieldCell + NSButton + NSButtonCell + NSTableView + NSCustomObject + NSView + NSWindowTemplate + NSTableColumn YES com.apple.InterfaceBuilder.CocoaPlugin + + PluginDependencyRecalculationVersion + + YES @@ -79,7 +97,7 @@ - UHJlZmVyZW5jZXPigKY + Preferences… , 1048576 2147483647 @@ -307,7 +325,7 @@ YES - RmluZOKApg + Find… f 1048576 2147483647 @@ -372,7 +390,7 @@ YES - U2hvdyBTcGVsbGluZ+KApg + Show Spelling… : 1048576 2147483647 @@ -513,7 +531,7 @@ - Q3VzdG9taXplIFRvb2xiYXLigKY + Customize Toolbar… 1048576 2147483647 @@ -637,12 +655,12 @@ 15 2 - {{196, 179}, {490, 331}} + {{344, 652}, {490, 331}} 603979776 Macfusion NSWindow - {3.40282e+38, 3.40282e+38} + {350, 100} @@ -654,6 +672,8 @@ 292 {{29, -2}, {32, 25}} + + YES -2080244224 @@ -661,7 +681,7 @@ LucidaGrande - 1.300000e+01 + 13 1044 @@ -682,6 +702,8 @@ 292 {{59, -2}, {32, 25}} + + YES -2080244224 @@ -706,6 +728,8 @@ 294 {{89, -2}, {402, 25}} + + YES -2080244224 @@ -726,6 +750,8 @@ 292 {{-1, -2}, {32, 25}} + + YES -2080244224 @@ -757,9 +783,11 @@ YES - 319 + 274 {490, 310} + + YES @@ -770,16 +798,16 @@ YES main - 3.210000e+02 - 4.000000e+01 - 1.000000e+03 + 310 + 40 + 1000 - 75628032 - 0 + 75628096 + 2048 LucidaGrande - 1.100000e+01 + 11 3100 @@ -808,7 +836,7 @@ controlBackgroundColor 3 - MC42NjY2NjY2OQA + MC42NjY2NjY2NjY3AA @@ -824,12 +852,12 @@ edit - 8.000000e+01 - 1.000000e+01 - 3.402823e+38 + 80 + 10 + 3.4028229999999999e+38 - 75628032 - 0 + 75628096 + 2048 @@ -849,7 +877,7 @@ Edit LucidaGrande - 1.200000e+01 + 12 16 @@ -860,19 +888,17 @@ 200 25 - 2 - YES YES mount - 8.000000e+01 - 1.000000e+01 - 3.402823e+38 + 80 + 10 + 3.4028229999999999e+38 - 75628032 - 0 + 75628096 + 2048 @@ -891,21 +917,24 @@ 200 25 - 2 - YES YES - 3.000000e+00 - 2.000000e+00 + 3 + 2 6 System _sourceListBackgroundColor - 1 - MC44MzkyMTU3IDAuODY2NjY2NjcgMC44OTgwMzkyMgA + 6 + System + alternateSelectedControlColor + + 1 + MCAwIDEAA + @@ -917,17 +946,22 @@ MC41AA - 5.000000e+01 - 448823296 - 1 + 50 + 448790528 + + + 5 15 0 YES 1 + 1 + 1 {{1, 1}, {490, 310}} + @@ -938,25 +972,30 @@ -2147483392 {{476, 1}, {15, 295}} + + _doScroller: - 9.966997e-01 + 0.99669969999999997 -2147483392 {{1, 296}, {475, 15}} + + 1 _doScroller: - 9.800000e-01 + 0.97999999999999998 {{-1, 20}, {492, 312}} + - 562 + 133682 @@ -965,11 +1004,14 @@ {490, 331} + + {{0, 0}, {1920, 1178}} {350, 122} - {3.40282e+38, 3.40282e+38} + {10000000000000, 10000000000000} MacfusionMain + YES @@ -1076,6 +1118,22 @@ YES + + + delegate + + + + 380 + + + + orderFrontStandardAboutPanel: + + + + 142 + performMiniaturize: @@ -1092,14 +1150,6 @@ 39 - - - orderFrontStandardAboutPanel: - - - - 142 - toggleContinuousSpellChecking: @@ -1301,12 +1351,12 @@ 370 - - delegate - - + + performClose: + + - 380 + 728 @@ -1316,6 +1366,134 @@ 414 + + + pluginArrayController + + + + 458 + + + + filesystemTableView + + + + 507 + + + + showPreferences: + + + + 539 + + + + startMenuItem: + + + + 542 + + + + showLogViewer: + + + + 614 + + + + toggleSelectedFS: + + + + 701 + + + + editSelectedFS: + + + + 702 + + + + revealConfigForSelectedFS: + + + + 704 + + + + deleteSelectedFS: + + + + 707 + + + + filterLogForSelectedFS: + + + + 710 + + + + revealSelectedFS: + + + + 712 + + + + deleteSelectedFS: + + + + 714 + + + + toggleSelectedFS: + + + + 720 + + + + newFSActionButton + + + + 726 + + + + openMainSite: + + + + 734 + + + + openSupportSite: + + + + 735 + delegate @@ -1324,6 +1502,22 @@ 440 + + + contentArray: client.persistentFilesystems + + + + + + contentArray: client.persistentFilesystems + contentArray + client.persistentFilesystems + 2 + + + 520 + contentArray: client.plugins @@ -1342,19 +1536,11 @@ - pluginArrayController - - - - 458 - - - - filesystemTableView - - + menu + + - 507 + 559 @@ -1369,14 +1555,14 @@ arrangedObjects.displayDictionary YES - + YES NSConditionallySetsEditable NSNullPlaceholder YES - + None @@ -1385,46 +1571,6 @@ 519 - - - contentArray: client.persistentFilesystems - - - - - - contentArray: client.persistentFilesystems - contentArray - client.persistentFilesystems - 2 - - - 520 - - - - showPreferences: - - - - 539 - - - - startMenuItem: - - - - 542 - - - - menu - - - - 559 - delegate @@ -1433,14 +1579,6 @@ 575 - - - showLogViewer: - - - - 614 - argument: selectedObjects @@ -1454,7 +1592,7 @@ selectedObjects YES - + YES NSConditionallySetsEnabled NSInvokesSeparatelyWithArrayObjects @@ -1462,8 +1600,8 @@ YES - - + + editFilesystem: @@ -1485,14 +1623,14 @@ self YES - + YES NSConditionallySetsEnabled NSSelectorName YES - + editFilesystem: @@ -1518,70 +1656,6 @@ 698 - - - toggleSelectedFS: - - - - 701 - - - - editSelectedFS: - - - - 702 - - - - revealConfigForSelectedFS: - - - - 704 - - - - deleteSelectedFS: - - - - 707 - - - - filterLogForSelectedFS: - - - - 710 - - - - revealSelectedFS: - - - - 712 - - - - deleteSelectedFS: - - - - 714 - - - - toggleSelectedFS: - - - - 720 - menu @@ -1590,22 +1664,6 @@ 721 - - - newFSActionButton - - - - 726 - - - - performClose: - - - - 728 - delegate @@ -1622,22 +1680,6 @@ 732 - - - openMainSite: - - - - 734 - - - - openSupportSite: - - - - 735 - @@ -1654,7 +1696,7 @@ -2 - RmlsZSdzIE93bmVyA + File's Owner -1 @@ -2357,146 +2399,71 @@ YES - + YES -1.IBPluginDependency -2.IBPluginDependency -3.IBPluginDependency 103.IBPluginDependency - 103.ImportedFromIB2 - 106.IBEditorWindowLastContentRect 106.IBPluginDependency - 106.ImportedFromIB2 - 106.editorWindowContentRectSynchronizationRect 111.IBPluginDependency - 111.ImportedFromIB2 129.IBPluginDependency - 129.ImportedFromIB2 - 130.IBEditorWindowLastContentRect 130.IBPluginDependency - 130.ImportedFromIB2 - 130.editorWindowContentRectSynchronizationRect 131.IBPluginDependency - 131.ImportedFromIB2 134.IBPluginDependency - 134.ImportedFromIB2 136.IBPluginDependency - 136.ImportedFromIB2 143.IBPluginDependency - 143.ImportedFromIB2 144.IBPluginDependency - 144.ImportedFromIB2 145.IBPluginDependency - 145.ImportedFromIB2 149.IBPluginDependency - 149.ImportedFromIB2 150.IBPluginDependency - 150.ImportedFromIB2 19.IBPluginDependency - 19.ImportedFromIB2 195.IBPluginDependency - 195.ImportedFromIB2 196.IBPluginDependency - 196.ImportedFromIB2 197.IBPluginDependency - 197.ImportedFromIB2 198.IBPluginDependency - 198.ImportedFromIB2 199.IBPluginDependency - 199.ImportedFromIB2 200.IBPluginDependency - 200.ImportedFromIB2 - 200.editorWindowContentRectSynchronizationRect 201.IBPluginDependency - 201.ImportedFromIB2 202.IBPluginDependency - 202.ImportedFromIB2 203.IBPluginDependency - 203.ImportedFromIB2 204.IBPluginDependency - 204.ImportedFromIB2 - 205.IBEditorWindowLastContentRect 205.IBPluginDependency - 205.ImportedFromIB2 - 205.editorWindowContentRectSynchronizationRect 206.IBPluginDependency - 206.ImportedFromIB2 207.IBPluginDependency - 207.ImportedFromIB2 208.IBPluginDependency - 208.ImportedFromIB2 209.IBPluginDependency - 209.ImportedFromIB2 210.IBPluginDependency - 210.ImportedFromIB2 211.IBPluginDependency - 211.ImportedFromIB2 212.IBPluginDependency - 212.ImportedFromIB2 - 212.editorWindowContentRectSynchronizationRect 213.IBPluginDependency - 213.ImportedFromIB2 214.IBPluginDependency - 214.ImportedFromIB2 215.IBPluginDependency - 215.ImportedFromIB2 216.IBPluginDependency - 216.ImportedFromIB2 217.IBPluginDependency - 217.ImportedFromIB2 218.IBPluginDependency - 218.ImportedFromIB2 219.IBPluginDependency - 219.ImportedFromIB2 220.IBPluginDependency - 220.ImportedFromIB2 - 220.editorWindowContentRectSynchronizationRect 221.IBPluginDependency - 221.ImportedFromIB2 23.IBPluginDependency - 23.ImportedFromIB2 236.IBPluginDependency - 236.ImportedFromIB2 239.IBPluginDependency - 239.ImportedFromIB2 - 24.IBEditorWindowLastContentRect 24.IBPluginDependency - 24.ImportedFromIB2 - 24.editorWindowContentRectSynchronizationRect - 29.IBEditorWindowLastContentRect 29.IBPluginDependency - 29.ImportedFromIB2 - 29.WindowOrigin - 29.editorWindowContentRectSynchronizationRect 295.IBPluginDependency - 296.IBEditorWindowLastContentRect 296.IBPluginDependency - 296.editorWindowContentRectSynchronizationRect 297.IBPluginDependency 298.IBPluginDependency 346.IBPluginDependency - 346.ImportedFromIB2 348.IBPluginDependency - 348.ImportedFromIB2 349.IBPluginDependency - 349.ImportedFromIB2 - 349.editorWindowContentRectSynchronizationRect 350.IBPluginDependency - 350.ImportedFromIB2 351.IBPluginDependency - 351.ImportedFromIB2 354.IBPluginDependency - 354.ImportedFromIB2 371.IBPluginDependency - 375.IBEditorWindowLastContentRect 375.IBPluginDependency - 375.IBViewEditorWindowController.showingBoundsRectangles - 375.IBViewEditorWindowController.showingLayoutRectangles 375.IBWindowTemplateEditedContentRect 375.NSWindowTemplate.visibleAtLaunch - 375.editorWindowContentRectSynchronizationRect - 375.windowTemplate.hasMinSize - 375.windowTemplate.minSize 376.IBPluginDependency 376.IBViewIntegration.shadowBlurRadius 376.IBViewIntegration.shadowColor @@ -2518,26 +2485,21 @@ 499.CustomClassName 499.IBPluginDependency 5.IBPluginDependency - 5.ImportedFromIB2 501.IBPluginDependency 504.IBPluginDependency 540.IBPluginDependency 541.IBPluginDependency - 543.IBEditorWindowLastContentRect 543.IBPluginDependency 544.IBPluginDependency 546.IBPluginDependency 548.IBPluginDependency 56.IBPluginDependency - 56.ImportedFromIB2 - 57.IBEditorWindowLastContentRect 57.IBPluginDependency - 57.ImportedFromIB2 - 57.editorWindowContentRectSynchronizationRect 58.IBPluginDependency - 58.ImportedFromIB2 613.IBPluginDependency 615.IBPluginDependency + 622.IBPluginDependency + 624.IBPluginDependency 631.IBPluginDependency 632.CustomClassName 632.IBPluginDependency @@ -2551,7 +2513,6 @@ 731.IBPluginDependency 733.IBPluginDependency 92.IBPluginDependency - 92.ImportedFromIB2 YES @@ -2559,145 +2520,70 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - {{702, 793}, {191, 43}} com.apple.InterfaceBuilder.CocoaPlugin - - {{596, 852}, {216, 23}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{247, 1448}, {64, 6}} com.apple.InterfaceBuilder.CocoaPlugin - - {{436, 809}, {64, 6}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{440, 714}, {275, 83}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{537, 593}, {243, 243}} com.apple.InterfaceBuilder.CocoaPlugin - - {{197, 734}, {243, 243}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {167, 43}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{440, 714}, {241, 103}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{631, 723}, {211, 113}} com.apple.InterfaceBuilder.CocoaPlugin - - {{525, 802}, {197, 73}} - {{433, 836}, {330, 20}} com.apple.InterfaceBuilder.CocoaPlugin - - {74, 862} - {{11, 836}, {438, 20}} com.apple.InterfaceBuilder.CocoaPlugin - {{581, 793}, {234, 43}} com.apple.InterfaceBuilder.CocoaPlugin - {{475, 832}, {234, 43}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{440, 714}, {177, 63}} com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{433, 235}, {490, 331}} com.apple.InterfaceBuilder.CocoaPlugin - - {{433, 235}, {490, 331}} - - {{110, 338}, {483, 286}} - - {350, 100} + com.apple.InterfaceBuilder.CocoaPlugin - + - - + + com.apple.InterfaceBuilder.CocoaPlugin MFInertButton com.apple.InterfaceBuilder.CocoaPlugin @@ -2714,24 +2600,19 @@ MFFilesystemTableView com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - {{477, 349}, {213, 123}} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - - {{445, 603}, {288, 233}} com.apple.InterfaceBuilder.CocoaPlugin - - {{23, 794}, {245, 183}} com.apple.InterfaceBuilder.CocoaPlugin - + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -2747,27 +2628,18 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - YES - - YES - - - YES - + + YES - - YES - - - YES - + + 735 @@ -2780,7 +2652,7 @@ NSTableView IBProjectSource - Settings/MFFilesystemTableView.h + ./Classes/MFFilesystemTableView.h @@ -2788,7 +2660,7 @@ NSButton IBProjectSource - Settings/MFInertButton.h + ./Classes/MFInertButton.h @@ -2796,7 +2668,7 @@ NSButtonCell IBProjectSource - Settings/MFMountToggleButtonCell.h + ./Classes/MFMountToggleButtonCell.h @@ -2804,7 +2676,7 @@ NSObject YES - + YES deleteSelectedFS: duplicateSelectedFS: @@ -2837,9 +2709,83 @@ id + + YES + + YES + deleteSelectedFS: + duplicateSelectedFS: + editSelectedFS: + filterLogForSelectedFS: + newFSPopupClicked: + openMainSite: + openSupportSite: + revealConfigForSelectedFS: + revealSelectedFS: + showLogViewer: + showPreferences: + startMenuItem: + toggleSelectedFS: + + + YES + + deleteSelectedFS: + id + + + duplicateSelectedFS: + id + + + editSelectedFS: + id + + + filterLogForSelectedFS: + id + + + newFSPopupClicked: + id + + + openMainSite: + id + + + openSupportSite: + id + + + revealConfigForSelectedFS: + id + + + revealSelectedFS: + id + + + showLogViewer: + id + + + showPreferences: + id + + + startMenuItem: + id + + + toggleSelectedFS: + id + + + YES - + YES filesystemArrayController filesystemTableView @@ -2854,9 +2800,38 @@ NSArrayController + + YES + + YES + filesystemArrayController + filesystemTableView + newFSActionButton + pluginArrayController + + + YES + + filesystemArrayController + NSArrayController + + + filesystemTableView + MFFilesystemTableView + + + newFSActionButton + MGActionButton + + + pluginArrayController + NSArrayController + + + IBProjectSource - Settings/MFSettingsController.h + ./Classes/MFSettingsController.h @@ -2864,73 +2839,7 @@ NSButton IBProjectSource - Settings/MGActionButton.h - - - - - YES - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/RSS.h - - - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUAppcast.h - - - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUAutomaticUpdateAlert.h - - - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUInstaller.h - - - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUProbingUpdateDriver.h - - - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUUnarchiver.h - - - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUUpdateAlert.h - - - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUUpdatePermissionPrompt.h - - - - NSObject - - IBDocumentRelativeSource - ../Sparkle.framework/Versions/A/Headers/SUUpdater.h + ./Classes/MGActionButton.h @@ -2940,16 +2849,61 @@ checkForUpdates: id + + checkForUpdates: + + checkForUpdates: + id + + delegate id - + + delegate + + delegate + id + + + + IBProjectSource + ./Classes/SUUpdater.h + 0 - ../MacFusion2.xcodeproj + IBCocoaFramework + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES 3 + + YES + + YES + ActionGear + NSMenuCheckmark + NSMenuMixedState + NSRemoveTemplate + Plus + + + YES + {20, 14} + {9, 8} + {7, 2} + {8, 8} + {32, 23} + +