From 9ba441b0022d12c38c8623fe4358dbdf4c9901f0 Mon Sep 17 00:00:00 2001 From: michael starke Date: Tue, 4 Feb 2014 20:05:24 +0100 Subject: [PATCH] Added Sparkle to project (nothing integrated) --- .gitmodules | 3 + HNHUi | 2 +- KeePassKit | 2 +- MacPass.xcodeproj/project.pbxproj | 149 ++++++++++++++++++++++++++- MacPass/Base.lproj/MainMenu.xib | 9 +- MacPass/ContextBar.xib | 7 +- MacPass/MPContextBarViewController.m | 4 + Sparkle | 1 + 8 files changed, 169 insertions(+), 8 deletions(-) create mode 160000 Sparkle diff --git a/.gitmodules b/.gitmodules index b008e046..19491809 100644 --- a/.gitmodules +++ b/.gitmodules @@ -13,3 +13,6 @@ [submodule "DDHotKey"] path = DDHotKey url = https://github.com/davedelong/DDHotKey.git +[submodule "Sparkle"] + path = Sparkle + url = https://github.com/mstarke/Sparkle.git diff --git a/HNHUi b/HNHUi index 61feaeb1..39772b8e 160000 --- a/HNHUi +++ b/HNHUi @@ -1 +1 @@ -Subproject commit 61feaeb15171a73b9678cca936c1087f66be9084 +Subproject commit 39772b8e11b5d1d809615cb0648549992d9662ec diff --git a/KeePassKit b/KeePassKit index dd4bb1d7..9d55d337 160000 --- a/KeePassKit +++ b/KeePassKit @@ -1 +1 @@ -Subproject commit dd4bb1d77ebb34c047aa0f1bb5e874b301b874ea +Subproject commit 9d55d3370ef6e4948e3605d9ca1b4eb4bac9a3a9 diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index fc9452a4..93cb1a4f 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -137,6 +137,7 @@ 4C5CD36217D15DCA000B7F38 /* KPKRandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5CD35E17D15DCA000B7F38 /* KPKRandomStream.m */; }; 4C5CD36317D15DCA000B7F38 /* KPKSalsa20RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5CD36017D15DCA000B7F38 /* KPKSalsa20RandomStream.m */; }; 4C5FA86D17A5F26800C781C9 /* KPKDataStreamWriter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5FA86C17A5F26800C781C9 /* KPKDataStreamWriter.m */; }; + 4C5FD083189989B7006374C9 /* NSButton+HNHTextColor.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5FD082189989B7006374C9 /* NSButton+HNHTextColor.m */; }; 4C5FE9AE17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C5FE9AD17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.m */; }; 4C61EA0316D2FD0800AC519E /* MPOutlineViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C61EA0216D2FD0800AC519E /* MPOutlineViewController.m */; }; 4C61EA0516D2FFE200AC519E /* OutlineView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C61EA0416D2FFE200AC519E /* OutlineView.xib */; }; @@ -223,6 +224,8 @@ 4CC299FF176F99E50050C939 /* MPRequestHandlerService.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC299FE176F99E50050C939 /* MPRequestHandlerService.m */; }; 4CC29A02176F9D140050C939 /* MPTestAssociateRequestHandler.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC29A01176F9D140050C939 /* MPTestAssociateRequestHandler.m */; }; 4CC3AABD175F4983003EF01B /* HNHRoundedTextFieldCell.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC3AAB9175F4983003EF01B /* HNHRoundedTextFieldCell.m */; }; + 4CC5D36418A1162D00AF7FA8 /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4CC5D35B18A1162100AF7FA8 /* Sparkle.framework */; }; + 4CC5D36718A1333000AF7FA8 /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 4CC5D35B18A1162100AF7FA8 /* Sparkle.framework */; }; 4CC6DB7A17D23719002C6091 /* KPKNode+IconImage.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6DB7917D23719002C6091 /* KPKNode+IconImage.m */; }; 4CC6DB7D17D23DCE002C6091 /* KPKUTIs.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC6DB7C17D23DCE002C6091 /* KPKUTIs.m */; }; 4CC7EA1B17807E7E0089D4F3 /* HNHRoundedTextFieldCellHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CC7EA1A17807E7E0089D4F3 /* HNHRoundedTextFieldCellHelper.m */; }; @@ -281,6 +284,57 @@ 4CFDDDE9185E92A600A9E7F1 /* HNHTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4CFDDDE8185E92A600A9E7F1 /* HNHTextView.m */; }; /* End PBXBuildFile section */ +/* Begin PBXContainerItemProxy section */ + 4CC5D35A18A1162100AF7FA8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4CC5D35218A1162100AF7FA8 /* Sparkle.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 8DC2EF5B0486A6940098B216; + remoteInfo = Sparkle; + }; + 4CC5D35C18A1162100AF7FA8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4CC5D35218A1162100AF7FA8 /* Sparkle.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 61B5F90209C4CEE200B25A18; + remoteInfo = "Sparkle Test App"; + }; + 4CC5D35E18A1162100AF7FA8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4CC5D35218A1162100AF7FA8 /* Sparkle.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 612279D90DB5470200AB99EA; + remoteInfo = "Sparkle Unit Tests"; + }; + 4CC5D36018A1162100AF7FA8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4CC5D35218A1162100AF7FA8 /* Sparkle.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 5D06E8D00FD68C7C005AE3F6; + remoteInfo = BinaryDelta; + }; + 4CC5D36218A1162100AF7FA8 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 4CC5D35218A1162100AF7FA8 /* Sparkle.xcodeproj */; + proxyType = 2; + remoteGlobalIDString = 55C14BB7136EEF1500649790; + remoteInfo = finish_installation; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 4CC5D36618A1332000AF7FA8 /* CopyFiles */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + 4CC5D36718A1333000AF7FA8 /* Sparkle.framework in CopyFiles */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + /* Begin PBXFileReference section */ 4C00E33617D8FA3500F37192 /* DDHotKeyCenter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DDHotKeyCenter.h; path = DDHotKey/DDHotKeyCenter.h; sourceTree = ""; }; 4C00E33717D8FA3500F37192 /* DDHotKeyCenter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DDHotKeyCenter.m; path = DDHotKey/DDHotKeyCenter.m; sourceTree = ""; }; @@ -530,6 +584,8 @@ 4C5CD36017D15DCA000B7F38 /* KPKSalsa20RandomStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKSalsa20RandomStream.m; sourceTree = ""; }; 4C5FA86B17A5F26800C781C9 /* KPKDataStreamWriter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKDataStreamWriter.h; sourceTree = ""; }; 4C5FA86C17A5F26800C781C9 /* KPKDataStreamWriter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = KPKDataStreamWriter.m; sourceTree = ""; }; + 4C5FD081189989B7006374C9 /* NSButton+HNHTextColor.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSButton+HNHTextColor.h"; path = "Categories/NSButton+HNHTextColor.h"; sourceTree = ""; }; + 4C5FD082189989B7006374C9 /* NSButton+HNHTextColor.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSButton+HNHTextColor.m"; path = "Categories/NSButton+HNHTextColor.m"; sourceTree = ""; }; 4C5FE9AC17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPSelectedAttachmentTableCellView.h; sourceTree = ""; }; 4C5FE9AD17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPSelectedAttachmentTableCellView.m; sourceTree = ""; }; 4C61EA0116D2FD0800AC519E /* MPOutlineViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPOutlineViewController.h; sourceTree = ""; }; @@ -686,6 +742,7 @@ 4CC29A01176F9D140050C939 /* MPTestAssociateRequestHandler.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPTestAssociateRequestHandler.m; sourceTree = ""; }; 4CC3AAB8175F4983003EF01B /* HNHRoundedTextFieldCell.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHRoundedTextFieldCell.h; sourceTree = ""; }; 4CC3AAB9175F4983003EF01B /* HNHRoundedTextFieldCell.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHRoundedTextFieldCell.m; sourceTree = ""; }; + 4CC5D35218A1162100AF7FA8 /* Sparkle.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = Sparkle.xcodeproj; path = Sparkle/Sparkle.xcodeproj; sourceTree = ""; }; 4CC6DB7817D23719002C6091 /* KPKNode+IconImage.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KPKNode+IconImage.h"; sourceTree = ""; }; 4CC6DB7917D23719002C6091 /* KPKNode+IconImage.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "KPKNode+IconImage.m"; sourceTree = ""; }; 4CC6DB7B17D23DCE002C6091 /* KPKUTIs.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KPKUTIs.h; sourceTree = ""; }; @@ -810,6 +867,7 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( + 4CC5D36418A1162D00AF7FA8 /* Sparkle.framework in Frameworks */, 4C00E33B17D8FAC100F37192 /* Carbon.framework in Frameworks */, 4CAD748E15B88AC100104512 /* libz.dylib in Frameworks */, 4C8FECC816D57E3200BF26CF /* QuartzCore.framework in Frameworks */, @@ -1252,9 +1310,19 @@ path = Icons; sourceTree = ""; }; + 4C5FD07D18998893006374C9 /* Categories */ = { + isa = PBXGroup; + children = ( + 4C5FD081189989B7006374C9 /* NSButton+HNHTextColor.h */, + 4C5FD082189989B7006374C9 /* NSButton+HNHTextColor.m */, + ); + name = Categories; + sourceTree = ""; + }; 4C77E35715B84A240093A587 = { isa = PBXGroup; children = ( + 4CC5D35218A1162100AF7FA8 /* Sparkle.xcodeproj */, 4C00E33917D8FA3B00F37192 /* DDHotKey */, 4C245A64176E1E3C0086100E /* CocoaHTTPServer */, 4CC3AAB6175F4983003EF01B /* HNHUi */, @@ -1453,6 +1521,7 @@ 4CC3AAB6175F4983003EF01B /* HNHUi */ = { isa = PBXGroup; children = ( + 4C5FD07D18998893006374C9 /* Categories */, 4C46E09C17673A0A00DA62E8 /* HNHShadowBox.h */, 4C46E09D17673A0A00DA62E8 /* HNHShadowBox.m */, 4CC7EA1917807E7E0089D4F3 /* HNHRoundedTextFieldCellHelper.h */, @@ -1495,6 +1564,18 @@ path = HNHUi; sourceTree = ""; }; + 4CC5D35318A1162100AF7FA8 /* Products */ = { + isa = PBXGroup; + children = ( + 4CC5D35B18A1162100AF7FA8 /* Sparkle.framework */, + 4CC5D35D18A1162100AF7FA8 /* Sparkle Test App.app */, + 4CC5D35F18A1162100AF7FA8 /* Sparkle Unit Tests.octest */, + 4CC5D36118A1162100AF7FA8 /* BinaryDelta */, + 4CC5D36318A1162100AF7FA8 /* Autoupdate.app */, + ); + name = Products; + sourceTree = ""; + }; 4CD3ABAD178F71B50073F5C5 /* KeePassKit */ = { isa = PBXGroup; children = ( @@ -1749,6 +1830,8 @@ 4C77E35E15B84A240093A587 /* Sources */, 4C77E35F15B84A240093A587 /* Frameworks */, 4C77E36015B84A240093A587 /* Resources */, + 4CC5D36618A1332000AF7FA8 /* CopyFiles */, + 4CC5D36818A1353400AF7FA8 /* ShellScript */, ); buildRules = ( ); @@ -1788,6 +1871,12 @@ mainGroup = 4C77E35715B84A240093A587; productRefGroup = 4C77E36315B84A240093A587 /* Products */; projectDirPath = ""; + projectReferences = ( + { + ProductGroup = 4CC5D35318A1162100AF7FA8 /* Products */; + ProjectRef = 4CC5D35218A1162100AF7FA8 /* Sparkle.xcodeproj */; + }, + ); projectRoot = ""; targets = ( 4C77E36115B84A240093A587 /* MacPass */, @@ -1796,6 +1885,44 @@ }; /* End PBXProject section */ +/* Begin PBXReferenceProxy section */ + 4CC5D35B18A1162100AF7FA8 /* Sparkle.framework */ = { + isa = PBXReferenceProxy; + fileType = wrapper.framework; + path = Sparkle.framework; + remoteRef = 4CC5D35A18A1162100AF7FA8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4CC5D35D18A1162100AF7FA8 /* Sparkle Test App.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + path = "Sparkle Test App.app"; + remoteRef = 4CC5D35C18A1162100AF7FA8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4CC5D35F18A1162100AF7FA8 /* Sparkle Unit Tests.octest */ = { + isa = PBXReferenceProxy; + fileType = wrapper.cfbundle; + path = "Sparkle Unit Tests.octest"; + remoteRef = 4CC5D35E18A1162100AF7FA8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4CC5D36118A1162100AF7FA8 /* BinaryDelta */ = { + isa = PBXReferenceProxy; + fileType = "compiled.mach-o.executable"; + path = BinaryDelta; + remoteRef = 4CC5D36018A1162100AF7FA8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; + 4CC5D36318A1162100AF7FA8 /* Autoupdate.app */ = { + isa = PBXReferenceProxy; + fileType = wrapper.application; + path = Autoupdate.app; + remoteRef = 4CC5D36218A1162100AF7FA8 /* PBXContainerItemProxy */; + sourceTree = BUILT_PRODUCTS_DIR; + }; +/* End PBXReferenceProxy section */ + /* Begin PBXResourcesBuildPhase section */ 4C45FB17178E09ED0010007D /* Resources */ = { isa = PBXResourcesBuildPhase; @@ -1898,6 +2025,19 @@ shellPath = /bin/sh; shellScript = "# Run the unit tests in this test bundle.\n\"${SYSTEM_DEVELOPER_DIR}/Tools/RunUnitTests\"\n"; }; + 4CC5D36818A1353400AF7FA8 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "LOCATION=\"${BUILT_PRODUCTS_DIR}\"/\"${FRAMEWORKS_FOLDER_PATH}\"\nIDENTITY=\"Mac Developer: Michael Starke\"\n#IDENTITY=\"Developer ID Application: The Iconfactory\"\ncodesign --verbose --force --sign \"$IDENTITY\" \"$LOCATION/Sparkle.framework/Versions/A\""; + }; /* End PBXShellScriptBuildPhase section */ /* Begin PBXSourcesBuildPhase section */ @@ -2023,6 +2163,7 @@ 4CC7EA1B17807E7E0089D4F3 /* HNHRoundedTextFieldCellHelper.m in Sources */, 4C5FE9AE17843CE20001D5A8 /* MPSelectedAttachmentTableCellView.m in Sources */, 4C3666411787327E00B249F1 /* MPDocument+Attachments.m in Sources */, + 4C5FD083189989B7006374C9 /* NSButton+HNHTextColor.m in Sources */, 4CD6C5AE1789FDE6000891F6 /* HNHRoundedSecureTextField.m in Sources */, 4C10412C178CDD44001B5239 /* NSDate+Humanized.m in Sources */, 4CD3ABBA178F71B50073F5C5 /* KPKTree.m in Sources */, @@ -2256,6 +2397,7 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "Developer ID Application"; COPY_PHASE_STRIP = NO; GCC_C_LANGUAGE_STANDARD = gnu99; GCC_DYNAMIC_NO_PIC = NO; @@ -2292,6 +2434,7 @@ CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; + CODE_SIGN_IDENTITY = "Developer ID Application"; COPY_PHASE_STRIP = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_C_LANGUAGE_STANDARD = gnu99; @@ -2314,7 +2457,8 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = ""; + CODE_SIGN_IDENTITY = "Developer ID Application"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "MacPass/MacPass-Prefix.pch"; @@ -2330,7 +2474,8 @@ isa = XCBuildConfiguration; buildSettings = { CLANG_ENABLE_OBJC_ARC = YES; - "CODE_SIGN_IDENTITY[sdk=macosx*]" = ""; + CODE_SIGN_IDENTITY = "Developer ID Application"; + "CODE_SIGN_IDENTITY[sdk=macosx*]" = "Developer ID Application"; COMBINE_HIDPI_IMAGES = YES; GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = "MacPass/MacPass-Prefix.pch"; diff --git a/MacPass/Base.lproj/MainMenu.xib b/MacPass/Base.lproj/MainMenu.xib index ae6899a3..0b417055 100644 --- a/MacPass/Base.lproj/MainMenu.xib +++ b/MacPass/Base.lproj/MainMenu.xib @@ -1,5 +1,5 @@ - + @@ -23,6 +23,12 @@ + + + + + + @@ -293,5 +299,6 @@ + \ No newline at end of file diff --git a/MacPass/ContextBar.xib b/MacPass/ContextBar.xib index c2133548..78855d74 100644 --- a/MacPass/ContextBar.xib +++ b/MacPass/ContextBar.xib @@ -35,8 +35,8 @@ - - + + @@ -71,7 +71,7 @@ - + @@ -86,6 +86,7 @@ + diff --git a/MacPass/MPContextBarViewController.m b/MacPass/MPContextBarViewController.m index 732e4aba..f8120032 100644 --- a/MacPass/MPContextBarViewController.m +++ b/MacPass/MPContextBarViewController.m @@ -11,6 +11,8 @@ #import "KPKEntry.h" #import "MPEntryFilterHelper.h" +#import "NSButton+HNHTextColor.h" + typedef NS_ENUM(NSUInteger, MPContextTab) { MPContextTabFilter, MPContextTabTrash, @@ -84,6 +86,8 @@ typedef NS_ENUM(NSUInteger, MPContextTab) { self.trashBar.inactiveGradient = [[NSGradient alloc] initWithColors:inactiveColors]; [[self view] bind:NSSelectedIndexBinding toObject:self withKeyPath:@"activeTab" options:nil]; + self.emptyTrashButton.textColor = [NSColor whiteColor]; + if(self.nextKeyView) { [self.exitHistoryButton setNextKeyView:self.nextKeyView]; [self.emptyTrashButton setNextKeyView:self.nextKeyView]; diff --git a/Sparkle b/Sparkle new file mode 160000 index 00000000..0912251e --- /dev/null +++ b/Sparkle @@ -0,0 +1 @@ +Subproject commit 0912251ec27598d040b3d25470b1f18f10fd4781