:100755 100755 b35e59b effdb0d M HexFiend_2.xcodeproj/project.pbxproj :100644 100644 ba8331c bacecc2 M app/sources/DataInspectorScrollView.m :100644 100644 a24fffb 55ceffc M app/sources/DiffTextViewContainer.m :100644 100644 520d976 9307117 M app/sources/HFClickableTextField.m :100644 100644 cd2b968 a2b3783 M app/sources/TextDividerRepresenter.m :100644 100644 a7d44cf a327692 M framework/sources/HFColumnView.m :100644 100644 7f2322b d3f6129 M framework/sources/HFFunctions.m :100644 100644 81e66b0 1acd966 M framework/sources/HFLineCountingView.m :100644 100644 8f0cbc1 4b99a81 M framework/sources/HFRepresenterTextView.m :100644 100644 cf917c6 55e4d9a M framework/sources/HFTextRepresenter.m diff --git a/HexFiend_2.xcodeproj/project.pbxproj b/HexFiend_2.xcodeproj/project.pbxproj index b35e59b..effdb0d 100755 --- a/HexFiend_2.xcodeproj/project.pbxproj +++ b/HexFiend_2.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 53; + objectVersion = 50; objects = { /* Begin PBXAggregateTarget section */ @@ -112,7 +112,7 @@ A59BC59C2002113F0066860F /* HFTemplateNode.m in Sources */ = {isa = PBXBuildFile; fileRef = A59BC59B2002113F0066860F /* HFTemplateNode.m */; }; A59BC59F2002E63C0066860F /* HFTemplateController.m in Sources */ = {isa = PBXBuildFile; fileRef = A59BC59E2002E63C0066860F /* HFTemplateController.m */; }; A59DFE67200BE7A800FEA540 /* BinaryTemplateController.xib in Resources */ = {isa = PBXBuildFile; fileRef = A59DFE65200BE7A800FEA540 /* BinaryTemplateController.xib */; }; - A5A34C1B26AD271900506AE7 /* Sparkle in Frameworks */ = {isa = PBXBuildFile; productRef = A5A34C1A26AD271900506AE7 /* Sparkle */; }; + A5A34C1B26AD271900506AE7 /* (null) in Frameworks */ = {isa = PBXBuildFile; }; A5AE0C1D21E1D7570044014E /* HFColumnView.h in Headers */ = {isa = PBXBuildFile; fileRef = A5AE0C1B21E1D7570044014E /* HFColumnView.h */; settings = {ATTRIBUTES = (Public, ); }; }; A5AE0C1E21E1D7570044014E /* HFColumnView.m in Sources */ = {isa = PBXBuildFile; fileRef = A5AE0C1C21E1D7570044014E /* HFColumnView.m */; }; A5CEA41C20D5DF4400BCA488 /* HFStringEncoding.h in Headers */ = {isa = PBXBuildFile; fileRef = A5CEA41A20D5DF4400BCA488 /* HFStringEncoding.h */; settings = {ATTRIBUTES = (Public, ); }; }; @@ -698,7 +698,7 @@ A5D8C8F220E9E58000103D60 /* libz.1.tbd in Frameworks */, A59BC5942001FD0F0066860F /* Tcl.framework in Frameworks */, 795F46C314BAADB600EB2F7D /* DiskArbitration.framework in Frameworks */, - A5A34C1B26AD271900506AE7 /* Sparkle in Frameworks */, + A5A34C1B26AD271900506AE7 /* (null) in Frameworks */, 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */, 94ECCBC01BDF7DD2007FF44E /* HexFiend.framework in Frameworks */, ); @@ -1494,9 +1494,6 @@ D039DC001481C17C00364FA6 /* PBXTargetDependency */, ); name = HexFiend_2; - packageProductDependencies = ( - A5A34C1A26AD271900506AE7 /* Sparkle */, - ); productInstallPath = "$(HOME)/Applications"; productName = HexFiend_2; productReference = 8D1107320486CEB800E47090 /* Hex Fiend.app */; @@ -1626,7 +1623,7 @@ }; }; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "HexFiend_2" */; - compatibilityVersion = "Xcode 11.4"; + compatibilityVersion = "Xcode 9.3"; developmentRegion = en; hasScannedForEncodings = 1; knownRegions = ( @@ -1634,9 +1631,6 @@ Base, ); mainGroup = 29B97314FDCFA39411CA2CEA /* HexFiend_2 */; - packageReferences = ( - A5A34C1926AD271900506AE7 /* XCRemoteSwiftPackageReference "Sparkle" */, - ); projectDirPath = ""; projectRoot = ../..; targets = ( @@ -2488,6 +2482,7 @@ INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "@loader_path/../Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_DYLIB_INSTALL_NAME = "@loader_path/../Frameworks/HexFiend.framework/Versions/A/HexFiend"; OTHER_CFLAGS = ( "-fblocks", @@ -2513,6 +2508,7 @@ INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "@loader_path/../Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_DYLIB_INSTALL_NAME = "@loader_path/../Frameworks/HexFiend.framework/Versions/A/HexFiend"; OTHER_CFLAGS = ( "-fblocks", @@ -2538,6 +2534,7 @@ INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "@loader_path/../Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_DYLIB_INSTALL_NAME = "@loader_path/../Frameworks/HexFiend.framework/Versions/A/HexFiend"; OTHER_CFLAGS = ( "-fblocks", @@ -2562,6 +2559,7 @@ INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "@loader_path/../Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_DYLIB_INSTALL_NAME = "@loader_path/../Frameworks/HexFiend.framework/Versions/A/HexFiend"; OTHER_CFLAGS = ( "-fblocks", @@ -2587,6 +2585,7 @@ INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "@loader_path/../Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_DYLIB_INSTALL_NAME = "@loader_path/../Frameworks/HexFiend.framework/Versions/A/HexFiend"; OTHER_CFLAGS = ( "-fblocks", @@ -2612,6 +2611,7 @@ INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "@loader_path/../Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_DYLIB_INSTALL_NAME = "@loader_path/../Frameworks/HexFiend.framework/Versions/A/HexFiend"; OTHER_CFLAGS = ( "-fblocks", @@ -2637,6 +2637,7 @@ INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; INSTALL_PATH = "@loader_path/../Frameworks"; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_DYLIB_INSTALL_NAME = "@loader_path/../Frameworks/HexFiend.framework/Versions/A/HexFiend"; OTHER_CFLAGS = ( "-fblocks", @@ -2739,6 +2740,7 @@ INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -2747,11 +2749,7 @@ "-fblocks", "$(inherited)", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - Sparkle, - ); + OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.ridiculousfish.HexFiend; PRODUCT_NAME = "Hex Fiend"; WRAPPER_EXTENSION = app; @@ -2901,6 +2899,7 @@ INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -2909,11 +2908,7 @@ "-fblocks", "$(inherited)", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - Sparkle, - ); + OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.ridiculousfish.HexFiend; PRODUCT_NAME = "Hex Fiend"; WRAPPER_EXTENSION = app; @@ -3060,6 +3055,7 @@ INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -3068,11 +3064,7 @@ "-fblocks", "$(inherited)", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - Sparkle, - ); + OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.ridiculousfish.HexFiend; PRODUCT_NAME = "Hex Fiend"; WRAPPER_EXTENSION = app; @@ -3239,6 +3231,7 @@ INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -3429,6 +3422,7 @@ INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -3624,6 +3618,7 @@ INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -3632,11 +3627,7 @@ "-fblocks", "$(inherited)", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - Sparkle, - ); + OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.ridiculousfish.HexFiend; PRODUCT_NAME = "Hex Fiend"; WRAPPER_EXTENSION = app; @@ -3807,6 +3798,7 @@ INFOPLIST_OTHER_PREPROCESSOR_FLAGS = "-traditional"; INFOPLIST_PREFIX_HEADER = version.h; INFOPLIST_PREPROCESS = YES; + IPHONEOS_DEPLOYMENT_TARGET = 11.4; LD_RUNPATH_SEARCH_PATHS = ( "$(inherited)", "@executable_path/../Frameworks", @@ -3815,11 +3807,7 @@ "-fblocks", "$(inherited)", ); - OTHER_LDFLAGS = ( - "$(inherited)", - "-framework", - Sparkle, - ); + OTHER_LDFLAGS = "$(inherited)"; PRODUCT_BUNDLE_IDENTIFIER = com.ridiculousfish.HexFiend; PRODUCT_NAME = "Hex Fiend"; WRAPPER_EXTENSION = app; @@ -3984,25 +3972,6 @@ defaultConfigurationName = Release; }; /* End XCConfigurationList section */ - -/* Begin XCRemoteSwiftPackageReference section */ - A5A34C1926AD271900506AE7 /* XCRemoteSwiftPackageReference "Sparkle" */ = { - isa = XCRemoteSwiftPackageReference; - repositoryURL = "https://github.com/sparkle-project/Sparkle"; - requirement = { - kind = exactVersion; - version = 1.26.0; - }; - }; -/* End XCRemoteSwiftPackageReference section */ - -/* Begin XCSwiftPackageProductDependency section */ - A5A34C1A26AD271900506AE7 /* Sparkle */ = { - isa = XCSwiftPackageProductDependency; - package = A5A34C1926AD271900506AE7 /* XCRemoteSwiftPackageReference "Sparkle" */; - productName = Sparkle; - }; -/* End XCSwiftPackageProductDependency section */ }; rootObject = 29B97313FDCFA39411CA2CEA /* Project object */; } diff --git a/app/sources/DataInspectorScrollView.m b/app/sources/DataInspectorScrollView.m index ba8331c..bacecc2 100644 --- a/app/sources/DataInspectorScrollView.m +++ b/app/sources/DataInspectorScrollView.m @@ -14,7 +14,7 @@ NSColor *separatorColor = [NSColor lightGrayColor]; if (HFDarkModeEnabled()) { if (@available(macOS 10.14, *)) { - separatorColor = [NSColor separatorColor]; +// separatorColor = [NSColor separatorColor]; } } [separatorColor set]; diff --git a/app/sources/DiffTextViewContainer.m b/app/sources/DiffTextViewContainer.m index a24fffb..55ceffc 100644 --- a/app/sources/DiffTextViewContainer.m +++ b/app/sources/DiffTextViewContainer.m @@ -173,7 +173,7 @@ NSColor *dividerColor = [NSColor darkGrayColor]; if (darkMode) { if (@available(macOS 10.14, *)) { - dividerColor = [NSColor separatorColor]; +// dividerColor = [NSColor separatorColor]; } } [dividerColor set]; diff --git a/app/sources/HFClickableTextField.m b/app/sources/HFClickableTextField.m index 520d976..9307117 100644 --- a/app/sources/HFClickableTextField.m +++ b/app/sources/HFClickableTextField.m @@ -11,7 +11,7 @@ @implementation HFClickableTextField - (void)awakeFromNib { - self.textColor = NSColor.linkColor; +// self.textColor = NSColor.linkColor; } - (void)viewDidMoveToWindow { diff --git a/app/sources/TextDividerRepresenter.m b/app/sources/TextDividerRepresenter.m index cd2b968..a2b3783 100644 --- a/app/sources/TextDividerRepresenter.m +++ b/app/sources/TextDividerRepresenter.m @@ -45,7 +45,7 @@ NSColor *dividerColor = [NSColor darkGrayColor]; if (darkMode) { if (@available(macOS 10.14, *)) { - dividerColor = [NSColor separatorColor]; +// dividerColor = [NSColor separatorColor]; } } [dividerColor set]; diff --git a/framework/sources/HFColumnView.m b/framework/sources/HFColumnView.m index a7d44cf..a327692 100644 --- a/framework/sources/HFColumnView.m +++ b/framework/sources/HFColumnView.m @@ -12,7 +12,7 @@ - (NSColor *)borderColor { if (@available(macOS 10.14, *)) { - return [NSColor separatorColor]; +// return [NSColor separatorColor]; } return [NSColor darkGrayColor]; } diff --git a/framework/sources/HFFunctions.m b/framework/sources/HFFunctions.m index 7f2322b..d3f6129 100644 --- a/framework/sources/HFFunctions.m +++ b/framework/sources/HFFunctions.m @@ -943,9 +943,10 @@ BOOL HFDarkModeEnabled(void) { return NO; #else if (@available(macOS 10.14, *)) { - if ([NSAppearance.currentAppearance.name isEqualToString:NSAppearanceNameDarkAqua]) { +/* if ([NSAppearance.currentAppearance.name isEqualToString:NSAppearanceNameDarkAqua]) { return YES; } +*/ } return NO; #endif diff --git a/framework/sources/HFLineCountingView.m b/framework/sources/HFLineCountingView.m index 81e66b0..1acd966 100644 --- a/framework/sources/HFLineCountingView.m +++ b/framework/sources/HFLineCountingView.m @@ -56,7 +56,7 @@ static const CGFloat kShadowWidth = 6; - (NSColor *)borderColor { if (@available(macOS 10.14, *)) { - return [NSColor separatorColor]; +// return [NSColor separatorColor]; } return [NSColor darkGrayColor]; } diff --git a/framework/sources/HFRepresenterTextView.m b/framework/sources/HFRepresenterTextView.m index 8f0cbc1..4b99a81 100644 --- a/framework/sources/HFRepresenterTextView.m +++ b/framework/sources/HFRepresenterTextView.m @@ -541,7 +541,7 @@ enum LineCoverage_t { - (NSColor *)inactiveTextSelectionColor { if (HFDarkModeEnabled()) { if (@available(macOS 10.14, *)) { - return [NSColor unemphasizedSelectedTextBackgroundColor]; +// return [NSColor unemphasizedSelectedTextBackgroundColor]; } } return [NSColor colorWithCalibratedWhite: (CGFloat)(212./255.) alpha:1]; diff --git a/framework/sources/HFTextRepresenter.m b/framework/sources/HFTextRepresenter.m index cf917c6..55e4d9a 100644 --- a/framework/sources/HFTextRepresenter.m +++ b/framework/sources/HFTextRepresenter.m @@ -34,7 +34,7 @@ const BOOL useHFBlue = [NSUserDefaults.standardUserDefaults boolForKey:@"UseBlueAlternatingColor"]; if (@available(macOS 10.14, *)) { if (HFDarkModeEnabled() || !useHFBlue) { - return [NSColor alternatingContentBackgroundColors]; +// return [NSColor alternatingContentBackgroundColors]; } } NSColor *color1 = [NSColor colorWithCalibratedWhite:1.0 alpha:1.0];