From 562c770df4e0e8483eff8eb1bd9535dcc9047601 Mon Sep 17 00:00:00 2001 From: Duncan Robertson Date: Fri, 10 Jan 2014 16:48:23 +0000 Subject: [PATCH 1/2] first part of adding votes always on option --- app/_views/album_art_view.rb | 24 +- ib.xcodeproj/project.pbxproj | 902 +++++++++--------- .../UserInterfaceState.xcuserstate | Bin 11465 -> 11907 bytes .../xcschemes/xcschememanagement.plist | 15 + resources/Preferences.xib | 46 +- 5 files changed, 518 insertions(+), 469 deletions(-) diff --git a/app/_views/album_art_view.rb b/app/_views/album_art_view.rb index e372981..371a7d8 100644 --- a/app/_views/album_art_view.rb +++ b/app/_views/album_art_view.rb @@ -10,21 +10,24 @@ def init v.addSubview(@vote_view) @vote_slider_in_progress = false + @vote_slider_visible = false - slidein_vote_view + slidein_vote_view if can_slide_in_vote? end end def slidein_vote_view - return if @vote_slider_in_progress + return if vote_slider_in_progress? new_frame = @vote_view.frame new_frame.origin.x += VOTE_VIEW_W @vote_slider_in_progress = true + NSAnimationContext.beginGrouping NSAnimationContext.currentContext.setCompletionHandler( lambda do + @vote_slider_visible = true timer = NSTimer.scheduledTimerWithTimeInterval( 5.0, target:self, @@ -71,7 +74,7 @@ def drawRect(dirtyRect) end def mouseEntered(event) - slidein_vote_view + slidein_vote_view unless always_show_votes? end def updateTrackingAreas @@ -94,4 +97,19 @@ def make_turd setImage(turd) end + def always_show_votes? + Persistence.get("alwaysShowVotes") + end + + def vote_slider_visible? + @vote_slider_visible + end + + def vote_slider_in_progress? + @vote_slider_in_progress + end + + def can_slide_in_vote? + end + end \ No newline at end of file diff --git a/ib.xcodeproj/project.pbxproj b/ib.xcodeproj/project.pbxproj index dee6938..cbd0cc7 100644 --- a/ib.xcodeproj/project.pbxproj +++ b/ib.xcodeproj/project.pbxproj @@ -10,31 +10,72 @@ 46 objects - 00342BDD299C426BA0F09701 + 004BD04E425040168B4721D7 - includeInIndex - 1 + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + CLANG_CXX_LANGUAGE_STANDARD + gnu++0x + CLANG_CXX_LIBRARY + libc++ + CLANG_ENABLE_MODULES + YES + CLANG_ENABLE_OBJC_ARC + YES + CLANG_WARN_BOOL_CONVERSION + YES + CLANG_WARN_CONSTANT_CONVERSION + YES + CLANG_WARN_DIRECT_OBJC_ISA_USAGE + YES_ERROR + CLANG_WARN_EMPTY_BODY + YES + CLANG_WARN_ENUM_CONVERSION + YES + CLANG_WARN_INT_CONVERSION + YES + CLANG_WARN_OBJC_ROOT_CLASS + YES_ERROR + COPY_PHASE_STRIP + NO + ENABLE_NS_ASSERTIONS + NO + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_WARN_64_TO_32_BIT_CONVERSION + YES + GCC_WARN_ABOUT_RETURN_TYPE + YES_ERROR + GCC_WARN_UNDECLARED_SELECTOR + YES + GCC_WARN_UNINITIALIZED_AUTOS + YES + GCC_WARN_UNUSED_FUNCTION + YES + GCC_WARN_UNUSED_VARIABLE + YES + VALIDATE_PRODUCT + YES + isa - PBXFileReference - lastKnownFileType - sourcecode.c.objc - path - Stubs.m - sourceTree - <group> + XCBuildConfiguration + name + Release - 00E9851F8AFA4BB9A7EFB67C + 02FC4F3815EE47DC9F60D95D includeInIndex 1 isa PBXFileReference path - k_logo_col_18x18.png + support.png sourceTree <group> - 126EB380B69F4FAC9DD1A74B + 05E0F3C68B00495897420164 includeInIndex 1 @@ -42,23 +83,14 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + MASShortcut+Monitoring.h path - ____Pods-environment.h - sourceTree - <group> - - 144B8815E2BF4417B582EC8A - - includeInIndex - 1 - isa - PBXFileReference - path - jukebox.png + MASShortcut/MASShortcut+Monitoring.h sourceTree <group> - 19AB52072B4B4F45AED62762 + 09429F50208947308AC467BE includeInIndex 1 @@ -67,13 +99,13 @@ lastKnownFileType sourcecode.c.h name - MASShortcutView+UserDefaults.h + MASShortcut+UserDefaults.h path - MASShortcut/MASShortcutView+UserDefaults.h + MASShortcut/MASShortcut+UserDefaults.h sourceTree <group> - 19BC4353BC2244BB9297E060 + 0BDBF235884645F8A57CDBED isa PBXFileReference @@ -86,7 +118,20 @@ sourceTree DEVELOPER_DIR - 1B51A59743864149ABE2B623 + 0D55DFBC5CCB45C194B37755 + + children + + EB94EF906FA442D49C037431 + + isa + PBXGroup + name + Products + sourceTree + <group> + + 13BB3625CE3F4E7597DD490C buildSettings @@ -115,11 +160,20 @@ CLANG_WARN_OBJC_ROOT_CLASS YES_ERROR COPY_PHASE_STRIP - NO - ENABLE_NS_ASSERTIONS - NO + YES GCC_C_LANGUAGE_STANDARD gnu99 + GCC_DYNAMIC_NO_PIC + NO + GCC_OPTIMIZATION_LEVEL + 0 + GCC_PREPROCESSOR_DEFINITIONS + + DEBUG=1 + $(inherited) + + GCC_SYMBOLS_PRIVATE_EXTERN + NO GCC_WARN_64_TO_32_BIT_CONVERSION YES GCC_WARN_ABOUT_RETURN_TYPE @@ -132,63 +186,30 @@ YES GCC_WARN_UNUSED_VARIABLE YES - VALIDATE_PRODUCT + ONLY_ACTIVE_ARCH YES isa XCBuildConfiguration name - Release - - 22ABEBFBFE394517B7EF3512 - - buildConfigurationList - 456957EFF0C04667B0B587A0 - buildPhases - - 3A627F5D75964FE697F29C07 - C6024F8B5B054506A84DC672 - - buildRules - - dependencies - - isa - PBXNativeTarget - name - ib - productName - ib - productReference - A325410144A84DECAA89626B - productType - com.apple.product-type.library.static + Debug - 24B88BFF53DD450797C75E79 + 14204E80D45D473AA0E96193 includeInIndex 1 - isa - PBXFileReference - path - support.png - sourceTree - <group> - - 28AF8D3E96D64976BCBBB1A4 - isa PBXFileReference lastKnownFileType - wrapper.framework + sourcecode.c.h name - Cocoa.framework + base64.h path - Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework + SocketRocket/base64.h sourceTree - DEVELOPER_DIR + <group> - 294C923CA8B342E884DB19CD + 1AF9E1A55B114E0E90F2532C includeInIndex 1 @@ -197,13 +218,13 @@ lastKnownFileType sourcecode.c.h name - base64.h + NSData+SRB64Additions.h path - SocketRocket/base64.h + SocketRocket/NSData+SRB64Additions.h sourceTree <group> - 2B5D235A63634D89AEC5F8EC + 1F65C441794E4E33A7EB11E4 includeInIndex 1 @@ -214,36 +235,7 @@ sourceTree <group> - 2D95D1C623F2417CA56280F9 - - isa - PBXFileReference - lastKnownFileType - wrapper.framework - name - CoreGraphics.framework - path - Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreGraphics.framework - sourceTree - DEVELOPER_DIR - - 329131F71AE24BCDA7449A0E - - children - - 28AF8D3E96D64976BCBBB1A4 - 19BC4353BC2244BB9297E060 - 2D95D1C623F2417CA56280F9 - C7D50B78258E41AAA181DA6A - - isa - PBXGroup - name - OS X - sourceTree - <group> - - 36E352D0962A4D5C8DBCB85C + 20B84943B7C84919B342CAB8 includeInIndex 1 @@ -258,34 +250,14 @@ sourceTree <group> - 37913342793D4201B20F4E2E - - fileRef - 19BC4353BC2244BB9297E060 - isa - PBXBuildFile - - 3A627F5D75964FE697F29C07 - - buildActionMask - 2147483647 - files - - 82AC034C233A4FCA8EB78AB0 - - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 3B1EDEDBC70340E99D1877FA + 25A483F8937349ABBF9CBD14 fileRef - 2D95D1C623F2417CA56280F9 + CCE62FB54BD04EB2BDCB8ABC isa PBXBuildFile - 43A9C901422042E1B5DD3BDE + 2738B79C0E4346AB8D79A63D includeInIndex 1 @@ -294,98 +266,190 @@ lastKnownFileType sourcecode.c.h path - ____Pods-SocketRocket-prefix.h + ____Pods-MASShortcut-prefix.h sourceTree <group> - 444137A6874745E6AFE1D082 + 29619A1C88EF409AB97E8346 - includeInIndex - 1 + children + + 42A3E26F7DF84BD3BAE29BB5 + isa - PBXFileReference - lastKnownFileType - sourcecode.c.h + PBXGroup name - MASShortcut+UserDefaults.h - path - MASShortcut/MASShortcut+UserDefaults.h + Frameworks sourceTree <group> - 456957EFF0C04667B0B587A0 + 297F7D6E8D3846E89A0FF996 - buildConfigurations + children - E7D17D17B624404B9404C6A0 - B37CF06DE41245438497A010 + D82C17F146E6472E93FA996E + 7EFCF4D8F55C49F4AE61F586 + 9F14BE74C5A749269068F8F2 + 91DB45AECE2244BE9C54C48E + CAB6D9FA8AD34B2A96630787 + 1F65C441794E4E33A7EB11E4 + 9CEBB5DCA7FC43A4B2E3466C + 02FC4F3815EE47DC9F60D95D + ABA8B896458D4CB89BCA0DFA + 3F61063121C048B8A3E423D9 + 79A3946F25FF40DBA6863D5D - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release isa - XCConfigurationList + PBXGroup + name + Resources + path + resources + sourceTree + <group> - 504E8CA0ECEF4255931EEA51 + 33E4BDDBED30493D92CC1FCE - attributes - - LastUpgradeCheck - 0500 - - buildConfigurationList - D47CA397F144400C9BDB0060 - compatibilityVersion - Xcode 3.2 - developmentRegion - English - hasScannedForEncodings - 0 isa - PBXProject - knownRegions - - en - - mainGroup - D5444D7854F14F82B69A94F0 - productRefGroup - BB447D4202E74DF794444E33 - projectDirPath - - projectReferences - - projectRoot - - targets - - 22ABEBFBFE394517B7EF3512 - + PBXFileReference + lastKnownFileType + wrapper.framework + name + CoreGraphics.framework + path + Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreGraphics.framework + sourceTree + DEVELOPER_DIR - 5FA2582996EA48EB927C5F30 + 3F61063121C048B8A3E423D9 includeInIndex 1 isa PBXFileReference path - pivotal.png + turd.png sourceTree <group> - 70E3BEC285E24226A41ABAA1 + 42A3E26F7DF84BD3BAE29BB5 - includeInIndex + children + + E242C64F3D494557BB2C60B3 + 0BDBF235884645F8A57CDBED + 33E4BDDBED30493D92CC1FCE + CCE62FB54BD04EB2BDCB8ABC + + isa + PBXGroup + name + OS X + sourceTree + <group> + + 481170E0866F44898C8DC31F + + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + COMBINE_HIDPI_IMAGES + YES + COPY_PHASE_STRIP + YES + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym + DSTROOT + /tmp/xcodeproj.dst + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_ENABLE_OBJC_EXCEPTIONS + YES + GCC_PRECOMPILE_PREFIX_HEADER + YES + GCC_VERSION + com.apple.compilers.llvm.clang.1_0 + INSTALL_PATH + $(BUILT_PRODUCTS_DIR) + MACOSX_DEPLOYMENT_TARGET + 10.7 + OTHER_CFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + + OTHER_CPLUSPLUSFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + + OTHER_LDFLAGS + + PRODUCT_NAME + $(TARGET_NAME) + SDKROOT + macosx + SKIP_INSTALL + YES + + isa + XCBuildConfiguration + name + Release + + 594A41BB889F420CAF2598B2 + + buildActionMask + 2147483647 + files + + EA9F6F4A77F541F2B3A1077A + 730429B416E7405DB32403BF + D4C2C2ADEC904A1195748A0D + 25A483F8937349ABBF9CBD14 + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 6177FCD4185442FB9F29AE5E + + buildActionMask + 2147483647 + files + + E1ACD7C52F6F43AC9A7A0C34 + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 643CCDC12CFA48B8BE34CFEF + + includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h + name + MASShortcutView+UserDefaults.h path - k_logo_bw_18x18.png + MASShortcut/MASShortcutView+UserDefaults.h sourceTree <group> - 73C70C59707D402E9C35BAE1 + 730429B416E7405DB32403BF + + fileRef + 0BDBF235884645F8A57CDBED + isa + PBXBuildFile + + 79A3946F25FF40DBA6863D5D includeInIndex 1 @@ -398,7 +462,7 @@ sourceTree <group> - 760CAEC75D3D4D25B45FAE46 + 7DBC9BF6AA184220A2B0C618 includeInIndex 1 @@ -411,41 +475,36 @@ sourceTree <group> - 82AC034C233A4FCA8EB78AB0 - - fileRef - 00342BDD299C426BA0F09701 - isa - PBXBuildFile - - 91E30869F54A44F183460124 + 7EFCF4D8F55C49F4AE61F586 includeInIndex 1 isa PBXFileReference path - timesheet.png + holiday.png sourceTree <group> - 93484FC2184C4E96953BF9B0 + 8A558B2D58884BE6819BAB4B includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h path - turd.png + ____Pods-environment.h sourceTree <group> - 953161F0478144E99AA953F2 + 8ED22446AB704BF391037001 children - 760CAEC75D3D4D25B45FAE46 - 00342BDD299C426BA0F09701 + 7DBC9BF6AA184220A2B0C618 + F5D9674720CA4DE5B311FCEA isa PBXGroup @@ -456,48 +515,54 @@ sourceTree <group> - 98D7C6E3D7AF416EB2034D80 + 91DB45AECE2244BE9C54C48E includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h - name - NSData+SRB64Additions.h path - SocketRocket/NSData+SRB64Additions.h + k_logo_bw_18x18.png sourceTree <group> - 993C800D1B7A47398DD1E760 + 9C58DB7C22234C7193556CA4 + + buildConfigurations + + 13BB3625CE3F4E7597DD490C + 004BD04E425040168B4721D7 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + 9CEBB5DCA7FC43A4B2E3466C includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h path - ____Pods-MASShortcut-prefix.h + pivotal.png sourceTree <group> - A325410144A84DECAA89626B + 9F14BE74C5A749269068F8F2 - explicitFileType - archive.ar includeInIndex - 0 + 1 isa PBXFileReference path - libib.a + jukebox.png sourceTree - BUILT_PRODUCTS_DIR + <group> - AB604D9B24524C7C9968B1E9 + A3057F96D26E429F9698BD02 includeInIndex 1 @@ -505,99 +570,62 @@ PBXFileReference lastKnownFileType sourcecode.c.h - name - MASShortcut+Monitoring.h path - MASShortcut/MASShortcut+Monitoring.h + ____Pods-SocketRocket-prefix.h sourceTree <group> - AC704A8A2CB041B285854C48 + A8727E6875704EC582F25CBF + + buildConfigurations + + 481170E0866F44898C8DC31F + BDB63548421845CFBEDB6518 + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + ABA8B896458D4CB89BCA0DFA includeInIndex 1 isa PBXFileReference path - campfire.png + timesheet.png sourceTree <group> - B1D6AADAA4B24932AB1B3BB3 + B7689E39274641AB9F8C798D - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - YES - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES_ERROR - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES_ERROR - COPY_PHASE_STRIP - YES - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_DYNAMIC_NO_PIC - NO - GCC_OPTIMIZATION_LEVEL - 0 - GCC_PREPROCESSOR_DEFINITIONS - - DEBUG=1 - $(inherited) - - GCC_SYMBOLS_PRIVATE_EXTERN - NO - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES_ERROR - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - ONLY_ACTIVE_ARCH - YES - + children + + 8A558B2D58884BE6819BAB4B + 2738B79C0E4346AB8D79A63D + A3057F96D26E429F9698BD02 + 05E0F3C68B00495897420164 + 09429F50208947308AC467BE + C548AE9A04C24991885F72FE + 643CCDC12CFA48B8BE34CFEF + CC8EDAAB474A4E6F8563F29C + 14204E80D45D473AA0E96193 + 1AF9E1A55B114E0E90F2532C + 20B84943B7C84919B342CAB8 + isa - XCBuildConfiguration + PBXGroup name - Debug - - B24B1E9AF8A646A6BF6FE9A4 - - includeInIndex - 1 - isa - PBXFileReference + Pods path - holiday.png + vendor/Pods/Headers sourceTree <group> - B37CF06DE41245438497A010 + BDB63548421845CFBEDB6518 buildSettings @@ -646,49 +674,48 @@ name Debug - BB447D4202E74DF794444E33 + C509F7998F1F4023803B6121 children - A325410144A84DECAA89626B + 0D55DFBC5CCB45C194B37755 + 29619A1C88EF409AB97E8346 + 297F7D6E8D3846E89A0FF996 + 8ED22446AB704BF391037001 + B7689E39274641AB9F8C798D isa PBXGroup - name - Products sourceTree <group> - C6024F8B5B054506A84DC672 + C548AE9A04C24991885F72FE - buildActionMask - 2147483647 - files - - CA4B343B93574EEEAE26111A - 37913342793D4201B20F4E2E - 3B1EDEDBC70340E99D1877FA - F3B5D4E20F2F471B8E56544B - + includeInIndex + 1 isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + MASShortcut.h + path + MASShortcut/MASShortcut.h + sourceTree + <group> - C7D50B78258E41AAA181DA6A + CAB6D9FA8AD34B2A96630787 + includeInIndex + 1 isa PBXFileReference - lastKnownFileType - wrapper.framework - name - CoreData.framework path - Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreData.framework + k_logo_col_18x18.png sourceTree - DEVELOPER_DIR + <group> - C84DD76396C44DA685862D38 + CC8EDAAB474A4E6F8563F29C includeInIndex 1 @@ -703,179 +730,152 @@ sourceTree <group> - CA4B343B93574EEEAE26111A + CCE62FB54BD04EB2BDCB8ABC - fileRef - 28AF8D3E96D64976BCBBB1A4 isa - PBXBuildFile + PBXFileReference + lastKnownFileType + wrapper.framework + name + CoreData.framework + path + Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreData.framework + sourceTree + DEVELOPER_DIR - D47CA397F144400C9BDB0060 + D4C2C2ADEC904A1195748A0D - buildConfigurations - - B1D6AADAA4B24932AB1B3BB3 - 1B51A59743864149ABE2B623 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release + fileRef + 33E4BDDBED30493D92CC1FCE isa - XCConfigurationList + PBXBuildFile - D5444D7854F14F82B69A94F0 + D82C17F146E6472E93FA996E - children - - BB447D4202E74DF794444E33 - DE9B582D690545F88599083D - E94F94F174344016AF3AEE6D - 953161F0478144E99AA953F2 - D601E0235F39494ABD6BB4BC - + includeInIndex + 1 isa - PBXGroup + PBXFileReference + path + campfire.png sourceTree <group> - D601E0235F39494ABD6BB4BC + E1ACD7C52F6F43AC9A7A0C34 - children - - 126EB380B69F4FAC9DD1A74B - 993C800D1B7A47398DD1E760 - 43A9C901422042E1B5DD3BDE - AB604D9B24524C7C9968B1E9 - 444137A6874745E6AFE1D082 - DD7BC784920F400B91AFB4C3 - 19AB52072B4B4F45AED62762 - C84DD76396C44DA685862D38 - 294C923CA8B342E884DB19CD - 98D7C6E3D7AF416EB2034D80 - 36E352D0962A4D5C8DBCB85C - + fileRef + F5D9674720CA4DE5B311FCEA isa - PBXGroup - name - Pods - path - vendor/Pods/Headers - sourceTree - <group> + PBXBuildFile - DD7BC784920F400B91AFB4C3 + E242C64F3D494557BB2C60B3 - includeInIndex - 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + wrapper.framework name - MASShortcut.h + Cocoa.framework path - MASShortcut/MASShortcut.h + Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework sourceTree - <group> + DEVELOPER_DIR - DE9B582D690545F88599083D + E30E8030DD93486A8285231E - children + attributes + + LastUpgradeCheck + 0500 + + buildConfigurationList + 9C58DB7C22234C7193556CA4 + compatibilityVersion + Xcode 3.2 + developmentRegion + English + hasScannedForEncodings + 0 + isa + PBXProject + knownRegions - 329131F71AE24BCDA7449A0E + en + + mainGroup + C509F7998F1F4023803B6121 + productRefGroup + 0D55DFBC5CCB45C194B37755 + projectDirPath + + projectReferences + + projectRoot + + targets + + F8A5EC05FD584912B241FD91 + + EA9F6F4A77F541F2B3A1077A + + fileRef + E242C64F3D494557BB2C60B3 isa - PBXGroup - name - Frameworks - sourceTree - <group> + PBXBuildFile - E7D17D17B624404B9404C6A0 + EB94EF906FA442D49C037431 - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - COMBINE_HIDPI_IMAGES - YES - COPY_PHASE_STRIP - YES - DEBUG_INFORMATION_FORMAT - dwarf-with-dsym - DSTROOT - /tmp/xcodeproj.dst - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_ENABLE_OBJC_EXCEPTIONS - YES - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_VERSION - com.apple.compilers.llvm.clang.1_0 - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - MACOSX_DEPLOYMENT_TARGET - 10.7 - OTHER_CFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_CPLUSPLUSFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_LDFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - SDKROOT - macosx - SKIP_INSTALL - YES - + explicitFileType + archive.ar + includeInIndex + 0 isa - XCBuildConfiguration - name - Release + PBXFileReference + path + libib.a + sourceTree + BUILT_PRODUCTS_DIR - E94F94F174344016AF3AEE6D + F5D9674720CA4DE5B311FCEA - children - - AC704A8A2CB041B285854C48 - B24B1E9AF8A646A6BF6FE9A4 - 144B8815E2BF4417B582EC8A - 70E3BEC285E24226A41ABAA1 - 00E9851F8AFA4BB9A7EFB67C - 2B5D235A63634D89AEC5F8EC - 5FA2582996EA48EB927C5F30 - 24B88BFF53DD450797C75E79 - 91E30869F54A44F183460124 - 93484FC2184C4E96953BF9B0 - 73C70C59707D402E9C35BAE1 - + includeInIndex + 1 isa - PBXGroup - name - Resources + PBXFileReference + lastKnownFileType + sourcecode.c.objc path - resources + Stubs.m sourceTree <group> - F3B5D4E20F2F471B8E56544B + F8A5EC05FD584912B241FD91 - fileRef - C7D50B78258E41AAA181DA6A + buildConfigurationList + A8727E6875704EC582F25CBF + buildPhases + + 6177FCD4185442FB9F29AE5E + 594A41BB889F420CAF2598B2 + + buildRules + + dependencies + isa - PBXBuildFile + PBXNativeTarget + name + ib + productName + ib + productReference + EB94EF906FA442D49C037431 + productType + com.apple.product-type.library.static rootObject - 504E8CA0ECEF4255931EEA51 + E30E8030DD93486A8285231E diff --git a/ib.xcodeproj/project.xcworkspace/xcuserdata/duncan.xcuserdatad/UserInterfaceState.xcuserstate b/ib.xcodeproj/project.xcworkspace/xcuserdata/duncan.xcuserdatad/UserInterfaceState.xcuserstate index 439b0e8c0da31af3de1818dd20464d983a28130a..09263177b60f7223198bd76ca4da3e14bc1b6abc 100644 GIT binary patch delta 6248 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 delta 6011 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 + C3900FF4548F4EE483480675 + + primary + + + EA05158828C240349470CD36 + + primary + + + F8A5EC05FD584912B241FD91 + + primary + + diff --git a/resources/Preferences.xib b/resources/Preferences.xib index de4d234..8f2a062 100644 --- a/resources/Preferences.xib +++ b/resources/Preferences.xib @@ -15,14 +15,14 @@ - + - + - + @@ -53,7 +53,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -78,7 +78,7 @@ - + @@ -87,7 +87,7 @@ - + @@ -96,7 +96,7 @@ - + @@ -105,7 +105,7 @@ - + @@ -114,7 +114,7 @@ - + @@ -133,7 +133,7 @@ + - + - + @@ -162,7 +178,7 @@ - + From 9835b652e54c87aa8282f3bef25f0590e9709226 Mon Sep 17 00:00:00 2001 From: Duncan Robertson Date: Tue, 14 Jan 2014 13:33:27 +0000 Subject: [PATCH 2/2] add always show votes and fix resize issue --- app/_views/album_art_view.rb | 57 +- app/_views/nowplaying_view.rb | 30 +- app/_views/vote_view.rb | 1 + app/_windows/jukebox_control_window.rb | 11 +- app/app_delegate.rb | 1 - app/config/constants.rb | 1 + app/controllers/preferences_controller.rb | 4 + ib.xcodeproj/Stubs.h | 1 + ib.xcodeproj/project.pbxproj | 888 +++++++++--------- .../UserInterfaceState.xcuserstate | Bin 11907 -> 11984 bytes .../xcschemes/xcschememanagement.plist | 15 + resources/Preferences.xib | 1 + 12 files changed, 527 insertions(+), 483 deletions(-) diff --git a/app/_views/album_art_view.rb b/app/_views/album_art_view.rb index 371a7d8..d279b0b 100644 --- a/app/_views/album_art_view.rb +++ b/app/_views/album_art_view.rb @@ -10,32 +10,42 @@ def init v.addSubview(@vote_view) @vote_slider_in_progress = false - @vote_slider_visible = false + @vote_toggle_state_active = always_show_votes? + slidein_vote_view - slidein_vote_view if can_slide_in_vote? + @update_observer = App.notification_center.observe JB_TOGGLE_VOTE_SLIDER do |n| + state = n.userInfo[:state] + @vote_toggle_state_active = state + handle_vote_toggle_update + end end end + def handle_vote_toggle_update + vote_toggle_state_active? ? slidein_vote_view : slideout_vote_view + end + def slidein_vote_view return if vote_slider_in_progress? new_frame = @vote_view.frame - new_frame.origin.x += VOTE_VIEW_W + new_frame.origin.x = 0 @vote_slider_in_progress = true NSAnimationContext.beginGrouping NSAnimationContext.currentContext.setCompletionHandler( lambda do - @vote_slider_visible = true - timer = NSTimer.scheduledTimerWithTimeInterval( - 5.0, - target:self, - selector:'slideout_vote_view', - userInfo:nil, - repeats: false - ) - NSRunLoop.mainRunLoop.addTimer(timer, forMode:NSRunLoopCommonModes) + if !vote_toggle_state_active? + timer = NSTimer.scheduledTimerWithTimeInterval( + 5.0, + target:self, + selector:'slideout_vote_view', + userInfo:nil, + repeats: false + ) + NSRunLoop.mainRunLoop.addTimer(timer, forMode:NSRunLoopCommonModes) + end end ) NSAnimationContext.currentContext.setDuration(0.5) @@ -45,12 +55,13 @@ def slidein_vote_view def slideout_vote_view new_frame = @vote_view.frame - new_frame.origin.x -= VOTE_VIEW_W + new_frame.origin.x = -VOTE_VIEW_W NSAnimationContext.beginGrouping NSAnimationContext.currentContext.setCompletionHandler( lambda do @vote_slider_in_progress = false + slidein_vote_view if vote_toggle_state_active? end ) NSAnimationContext.currentContext.setDuration(0.5) @@ -60,7 +71,6 @@ def slideout_vote_view def handle_vote(score, rating) @vote_view.do_vote(score, rating) - make_turd if !score.nil? && score < -6 slidein_vote_view @@ -74,7 +84,7 @@ def drawRect(dirtyRect) end def mouseEntered(event) - slidein_vote_view unless always_show_votes? + slidein_vote_view end def updateTrackingAreas @@ -98,18 +108,23 @@ def make_turd end def always_show_votes? - Persistence.get("alwaysShowVotes") - end - - def vote_slider_visible? - @vote_slider_visible + Persistence.get("alwaysShowVotes") == true ? 1 : 0 end def vote_slider_in_progress? @vote_slider_in_progress end - def can_slide_in_vote? + def vote_toggle_state_active? + @vote_toggle_state_active == 1 ? true : false + end + + def ok_to_slide_vote_in? + !vote_slider_in_progress? && @vote_toggle_state_active + end + + def ok_to_slide_vote_out? + vote_slider_in_progress? && @vote_toggle_state_active end end \ No newline at end of file diff --git a/app/_views/nowplaying_view.rb b/app/_views/nowplaying_view.rb index 8ece9a4..637799a 100644 --- a/app/_views/nowplaying_view.rb +++ b/app/_views/nowplaying_view.rb @@ -122,6 +122,11 @@ def draw_title_box v.setDrawsBackground(false) v.setSelectable(false) v.setTranslatesAutoresizingMaskIntoConstraints(false) + v.setContentCompressionResistancePriority( + NSLayoutPriorityDefaultLow, + forOrientation:NSLayoutConstraintOrientationHorizontal + ) + v.cell.setBackgroundStyle(NSBackgroundStyleRaised) end end @@ -132,6 +137,11 @@ def draw_artist_box v.setDrawsBackground(false) v.setSelectable(false) v.setTranslatesAutoresizingMaskIntoConstraints(false) + v.setContentCompressionResistancePriority( + NSLayoutPriorityDefaultLow, + forOrientation:NSLayoutConstraintOrientationHorizontal + ) + v.cell.setBackgroundStyle(NSBackgroundStyleRaised) end end @@ -142,6 +152,11 @@ def draw_album_box v.setDrawsBackground(false) v.setSelectable(false) v.setTranslatesAutoresizingMaskIntoConstraints(false) + v.setContentCompressionResistancePriority( + NSLayoutPriorityDefaultLow, + forOrientation:NSLayoutConstraintOrientationHorizontal + ) + v.cell.setBackgroundStyle(NSBackgroundStyleRaised) end end @@ -156,6 +171,11 @@ def draw_addedby_box v.setDrawsBackground(false) v.setSelectable(false) v.setTranslatesAutoresizingMaskIntoConstraints(false) + v.setContentCompressionResistancePriority( + NSLayoutPriorityDefaultLow, + forOrientation:NSLayoutConstraintOrientationHorizontal + ) + v.cell.setBackgroundStyle(NSBackgroundStyleRaised) end end @@ -169,7 +189,6 @@ def update_title 'NSParagraphStyle' => paragraph }) unless track.title.nil? @title.setAttributedStringValue(txt) - @title.invalidateIntrinsicContentSize @title.setToolTip(track.title) end @@ -184,15 +203,6 @@ def update_artist }) unless track.artist.nil? @artist.setAttributedStringValue(txt) @artist.invalidateIntrinsicContentSize - # @artistsetContentHuggingPriority( - # NSLayoutPriorityFittingSizeCompression-1.0, - # forOrientation:NSLayoutConstraintOrientationVertical - # ) - - # Think You Can Wait (from the Film Win Win) - # The National - # Think You Can Wait (from the Film Win Win) / The National - @artist.setToolTip(track.artist) end diff --git a/app/_views/vote_view.rb b/app/_views/vote_view.rb index 65c04bb..386c441 100644 --- a/app/_views/vote_view.rb +++ b/app/_views/vote_view.rb @@ -11,6 +11,7 @@ def init txt.setBezeled(false) txt.setDrawsBackground(false) txt.setAlignment(NSCenterTextAlignment) + txt.cell.setBackgroundStyle(NSBackgroundStyleRaised) end v.addSubview(@label) diff --git a/app/_windows/jukebox_control_window.rb b/app/_windows/jukebox_control_window.rb index 27f26f5..66249d7 100644 --- a/app/_windows/jukebox_control_window.rb +++ b/app/_windows/jukebox_control_window.rb @@ -21,11 +21,7 @@ def canBecomeMainWindow end def register_vote(button) - if VoteHandler.register(button.vote) - puts "vote registered" - else - puts "vote registerinf failed!" - end + VoteHandler.register(button.vote) end def build_views @@ -39,7 +35,8 @@ def build_views metrics_dict = { "padding" => 10, - "default_width" => 200 + "default_width" => 200, + "max_width" => 350 } views_dictionary.each do |key, view| @@ -60,7 +57,7 @@ def build_views views:views_dictionary ) constraints += NSLayoutConstraint.constraintsWithVisualFormat( - "H:|[now_playing(==default_width@750)]-5-[vote_buttons]-padding-|", + "H:|[now_playing(>=default_width,<=max_width)]-5-[vote_buttons]-padding-|", options:0, metrics:metrics_dict, views:views_dictionary diff --git a/app/app_delegate.rb b/app/app_delegate.rb index 37ce70a..5ed13ce 100644 --- a/app/app_delegate.rb +++ b/app/app_delegate.rb @@ -42,7 +42,6 @@ def build_jukebox_controls(sender) def hide_jukebox_controls update_jukebox_controls_button_state(NSOffState) - puts "@jukebox_controls: #{@jukebox_controls.inspect}" @jukebox_controls.close unless @jukebox_controls.nil? end diff --git a/app/config/constants.rb b/app/config/constants.rb index d254b8f..e2d39dd 100644 --- a/app/config/constants.rb +++ b/app/config/constants.rb @@ -21,5 +21,6 @@ JB_MESSAGE_RECEIVED="JukeboxMessageReceived" JB_UPDATED="JukeboxUpdated" JB_DO_VOTE="JukeboxDoVote" +JB_TOGGLE_VOTE_SLIDER="ToggleVoteSlider" CHOSEN_BY_TXT="Chosen by" \ No newline at end of file diff --git a/app/controllers/preferences_controller.rb b/app/controllers/preferences_controller.rb index b8ad779..6ccec8e 100644 --- a/app/controllers/preferences_controller.rb +++ b/app/controllers/preferences_controller.rb @@ -29,4 +29,8 @@ def awakeFromNib ) end + def toggle_always_show_votes(button) + App.notification_center.post(JB_TOGGLE_VOTE_SLIDER, nil, {state:button.state}) + end + end \ No newline at end of file diff --git a/ib.xcodeproj/Stubs.h b/ib.xcodeproj/Stubs.h index cd9b932..8d0e14d 100644 --- a/ib.xcodeproj/Stubs.h +++ b/ib.xcodeproj/Stubs.h @@ -103,6 +103,7 @@ -(IBAction) init; -(IBAction) awakeFromNib; +-(IBAction) toggle_always_show_votes:(id) button; @end diff --git a/ib.xcodeproj/project.pbxproj b/ib.xcodeproj/project.pbxproj index cbd0cc7..26361bf 100644 --- a/ib.xcodeproj/project.pbxproj +++ b/ib.xcodeproj/project.pbxproj @@ -10,87 +10,103 @@ 46 objects - 004BD04E425040168B4721D7 + 066CDA4D8EB6449F855F02AC - buildSettings - - ALWAYS_SEARCH_USER_PATHS - NO - CLANG_CXX_LANGUAGE_STANDARD - gnu++0x - CLANG_CXX_LIBRARY - libc++ - CLANG_ENABLE_MODULES - YES - CLANG_ENABLE_OBJC_ARC - YES - CLANG_WARN_BOOL_CONVERSION - YES - CLANG_WARN_CONSTANT_CONVERSION - YES - CLANG_WARN_DIRECT_OBJC_ISA_USAGE - YES_ERROR - CLANG_WARN_EMPTY_BODY - YES - CLANG_WARN_ENUM_CONVERSION - YES - CLANG_WARN_INT_CONVERSION - YES - CLANG_WARN_OBJC_ROOT_CLASS - YES_ERROR - COPY_PHASE_STRIP - NO - ENABLE_NS_ASSERTIONS - NO - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_WARN_64_TO_32_BIT_CONVERSION - YES - GCC_WARN_ABOUT_RETURN_TYPE - YES_ERROR - GCC_WARN_UNDECLARED_SELECTOR - YES - GCC_WARN_UNINITIALIZED_AUTOS - YES - GCC_WARN_UNUSED_FUNCTION - YES - GCC_WARN_UNUSED_VARIABLE - YES - VALIDATE_PRODUCT - YES - + fileRef + DF56046E7B574D818CFAED05 isa - XCBuildConfiguration + PBXBuildFile + + 09B29B12FE48426FB71A0948 + + children + + BBD77DA643A64CA1BC9837EA + 4854758623124BE0AC9BBAE1 + 83B64533F4CF496DA81E7988 + 79BFF00DF07B432F91659B67 + 95E21A00F98A40B18B3876CA + C170F2448BDF464AA752D1A9 + C21009BE7FD641899FDBA080 + AEAAE51D8A8047BABCA6091E + 61367EE7640A43A28E282577 + DCC2DD151C034A288A0A3B7D + 3A9910DDC9714432A49AFCA5 + + isa + PBXGroup name - Release + Pods + path + vendor/Pods/Headers + sourceTree + <group> - 02FC4F3815EE47DC9F60D95D + 111D6DA4C2F6477CAC141E69 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.objc path - support.png + Stubs.m sourceTree <group> - 05E0F3C68B00495897420164 + 1F414271A3EC4AE0B4E0CE78 includeInIndex 1 + isa + PBXFileReference + path + turd.png + sourceTree + <group> + + 2D4B95107FAD4D3189BD308B + + buildActionMask + 2147483647 + files + + 9B2CD2FC02BB4A68A8F12484 + + isa + PBXSourcesBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 2E32826FCE3C4444B0E47CD4 + + buildConfigurations + + 4C7BBDBBE08C43A59A6F3D85 + BF264D44E3484F00BF6C546B + + defaultConfigurationIsVisible + 0 + defaultConfigurationName + Release + isa + XCConfigurationList + + 38D70B184CFD4CAF97DECB04 + isa PBXFileReference lastKnownFileType - sourcecode.c.h + wrapper.framework name - MASShortcut+Monitoring.h + CoreData.framework path - MASShortcut/MASShortcut+Monitoring.h + Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreData.framework sourceTree - <group> + DEVELOPER_DIR - 09429F50208947308AC467BE + 3A9910DDC9714432A49AFCA5 includeInIndex 1 @@ -99,39 +115,39 @@ lastKnownFileType sourcecode.c.h name - MASShortcut+UserDefaults.h + SRWebSocket.h path - MASShortcut/MASShortcut+UserDefaults.h + SocketRocket/SRWebSocket.h sourceTree <group> - 0BDBF235884645F8A57CDBED + 3C65871CCA0A4C73AE5F2ADB isa PBXFileReference lastKnownFileType wrapper.framework name - QuartzCore.framework + CoreGraphics.framework path - Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/QuartzCore.framework + Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreGraphics.framework sourceTree DEVELOPER_DIR - 0D55DFBC5CCB45C194B37755 + 4854758623124BE0AC9BBAE1 - children - - EB94EF906FA442D49C037431 - + includeInIndex + 1 isa - PBXGroup - name - Products + PBXFileReference + lastKnownFileType + sourcecode.c.h + path + ____Pods-MASShortcut-prefix.h sourceTree <group> - 13BB3625CE3F4E7597DD490C + 4C7BBDBBE08C43A59A6F3D85 buildSettings @@ -194,7 +210,49 @@ name Debug - 14204E80D45D473AA0E96193 + 50D5D6571FDD4AAEA2A8DF91 + + children + + 5B598451874F4A7AA70690A1 + + isa + PBXGroup + name + Products + sourceTree + <group> + + 5771BB1904E34DACBD5ACB57 + + buildActionMask + 2147483647 + files + + 066CDA4D8EB6449F855F02AC + 7A906E8B37CB499E89FB9E45 + 6366E66F93E642058D9E009A + 83375796C851483F940C53E5 + + isa + PBXFrameworksBuildPhase + runOnlyForDeploymentPostprocessing + 0 + + 5B598451874F4A7AA70690A1 + + explicitFileType + archive.ar + includeInIndex + 0 + isa + PBXFileReference + path + libib.a + sourceTree + BUILT_PRODUCTS_DIR + + 61367EE7640A43A28E282577 includeInIndex 1 @@ -209,55 +267,73 @@ sourceTree <group> - 1AF9E1A55B114E0E90F2532C + 6366E66F93E642058D9E009A + + fileRef + 3C65871CCA0A4C73AE5F2ADB + isa + PBXBuildFile + + 653FC7C4F82742C892B58275 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h - name - NSData+SRB64Additions.h path - SocketRocket/NSData+SRB64Additions.h + holiday.png + sourceTree + <group> + + 66C3E590A78E410D852801F1 + + children + + 50D5D6571FDD4AAEA2A8DF91 + A0503A8F6CBA4A45B7F8D2DD + AC376AE042EF425BB99D473E + 8DF050F49A944EB5A4213379 + 09B29B12FE48426FB71A0948 + + isa + PBXGroup sourceTree <group> - 1F65C441794E4E33A7EB11E4 + 6E155C4E4D834C018845FC6C includeInIndex 1 isa PBXFileReference path - missing_artwork.png + k_logo_col_18x18.png sourceTree <group> - 20B84943B7C84919B342CAB8 + 700DD7B596CA40EEA7B55EAD includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h - name - SRWebSocket.h path - SocketRocket/SRWebSocket.h + campfire.png sourceTree <group> - 25A483F8937349ABBF9CBD14 + 70E469314A7F4D0794491D9A - fileRef - CCE62FB54BD04EB2BDCB8ABC + includeInIndex + 1 isa - PBXBuildFile + PBXFileReference + path + timesheet.png + sourceTree + <group> - 2738B79C0E4346AB8D79A63D + 79BFF00DF07B432F91659B67 includeInIndex 1 @@ -265,273 +341,203 @@ PBXFileReference lastKnownFileType sourcecode.c.h + name + MASShortcut+Monitoring.h path - ____Pods-MASShortcut-prefix.h + MASShortcut/MASShortcut+Monitoring.h sourceTree <group> - 29619A1C88EF409AB97E8346 + 7A906E8B37CB499E89FB9E45 - children - - 42A3E26F7DF84BD3BAE29BB5 - + fileRef + 989C742BF6424874A7F6777F isa - PBXGroup - name - Frameworks - sourceTree - <group> + PBXBuildFile - 297F7D6E8D3846E89A0FF996 + 83375796C851483F940C53E5 - children - - D82C17F146E6472E93FA996E - 7EFCF4D8F55C49F4AE61F586 - 9F14BE74C5A749269068F8F2 - 91DB45AECE2244BE9C54C48E - CAB6D9FA8AD34B2A96630787 - 1F65C441794E4E33A7EB11E4 - 9CEBB5DCA7FC43A4B2E3466C - 02FC4F3815EE47DC9F60D95D - ABA8B896458D4CB89BCA0DFA - 3F61063121C048B8A3E423D9 - 79A3946F25FF40DBA6863D5D - + fileRef + 38D70B184CFD4CAF97DECB04 isa - PBXGroup - name - Resources - path - resources - sourceTree - <group> + PBXBuildFile - 33E4BDDBED30493D92CC1FCE + 83B64533F4CF496DA81E7988 + includeInIndex + 1 isa PBXFileReference lastKnownFileType - wrapper.framework - name - CoreGraphics.framework + sourcecode.c.h path - Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreGraphics.framework + ____Pods-SocketRocket-prefix.h sourceTree - DEVELOPER_DIR + <group> - 3F61063121C048B8A3E423D9 + 899BE913B1BC4AA69CE36CFF includeInIndex 1 isa PBXFileReference path - turd.png + pivotal.png sourceTree <group> - 42A3E26F7DF84BD3BAE29BB5 + 8DF050F49A944EB5A4213379 children - E242C64F3D494557BB2C60B3 - 0BDBF235884645F8A57CDBED - 33E4BDDBED30493D92CC1FCE - CCE62FB54BD04EB2BDCB8ABC + D7343AD423A9430A8416FE6A + 111D6DA4C2F6477CAC141E69 isa PBXGroup name - OS X + Supporting Files + path + ib.xcodeproj sourceTree <group> - 481170E0866F44898C8DC31F + 95E21A00F98A40B18B3876CA - buildSettings + includeInIndex + 1 + isa + PBXFileReference + lastKnownFileType + sourcecode.c.h + name + MASShortcut+UserDefaults.h + path + MASShortcut/MASShortcut+UserDefaults.h + sourceTree + <group> + + 968666874E754B108B3A850F + + attributes - ALWAYS_SEARCH_USER_PATHS - NO - COMBINE_HIDPI_IMAGES - YES - COPY_PHASE_STRIP - YES - DEBUG_INFORMATION_FORMAT - dwarf-with-dsym - DSTROOT - /tmp/xcodeproj.dst - GCC_C_LANGUAGE_STANDARD - gnu99 - GCC_ENABLE_OBJC_EXCEPTIONS - YES - GCC_PRECOMPILE_PREFIX_HEADER - YES - GCC_VERSION - com.apple.compilers.llvm.clang.1_0 - INSTALL_PATH - $(BUILT_PRODUCTS_DIR) - MACOSX_DEPLOYMENT_TARGET - 10.7 - OTHER_CFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_CPLUSPLUSFLAGS - - -DNS_BLOCK_ASSERTIONS=1 - $(inherited) - - OTHER_LDFLAGS - - PRODUCT_NAME - $(TARGET_NAME) - SDKROOT - macosx - SKIP_INSTALL - YES + LastUpgradeCheck + 0500 + buildConfigurationList + 2E32826FCE3C4444B0E47CD4 + compatibilityVersion + Xcode 3.2 + developmentRegion + English + hasScannedForEncodings + 0 isa - XCBuildConfiguration - name - Release - - 594A41BB889F420CAF2598B2 - - buildActionMask - 2147483647 - files + PBXProject + knownRegions - EA9F6F4A77F541F2B3A1077A - 730429B416E7405DB32403BF - D4C2C2ADEC904A1195748A0D - 25A483F8937349ABBF9CBD14 + en - isa - PBXFrameworksBuildPhase - runOnlyForDeploymentPostprocessing - 0 - - 6177FCD4185442FB9F29AE5E - - buildActionMask - 2147483647 - files + mainGroup + 66C3E590A78E410D852801F1 + productRefGroup + 50D5D6571FDD4AAEA2A8DF91 + projectDirPath + + projectReferences + + projectRoot + + targets - E1ACD7C52F6F43AC9A7A0C34 + 9BC03126A2C04CEDA11D674B - isa - PBXSourcesBuildPhase - runOnlyForDeploymentPostprocessing - 0 - 643CCDC12CFA48B8BE34CFEF + 989C742BF6424874A7F6777F - includeInIndex - 1 isa PBXFileReference lastKnownFileType - sourcecode.c.h + wrapper.framework name - MASShortcutView+UserDefaults.h + QuartzCore.framework path - MASShortcut/MASShortcutView+UserDefaults.h + Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/QuartzCore.framework sourceTree - <group> - - 730429B416E7405DB32403BF - - fileRef - 0BDBF235884645F8A57CDBED - isa - PBXBuildFile + DEVELOPER_DIR - 79A3946F25FF40DBA6863D5D + 9954B7D74B544D1BA8122FD8 includeInIndex 1 isa PBXFileReference - lastKnownFileType - file.xib path - Preferences.xib + support.png sourceTree <group> - 7DBC9BF6AA184220A2B0C618 + 9B2CD2FC02BB4A68A8F12484 - includeInIndex - 1 + fileRef + 111D6DA4C2F6477CAC141E69 isa - PBXFileReference - lastKnownFileType - sourcecode.c.h - path - Stubs.h - sourceTree - <group> + PBXBuildFile - 7EFCF4D8F55C49F4AE61F586 + 9BC03126A2C04CEDA11D674B - includeInIndex - 1 + buildConfigurationList + AB376703AC374D0A9976DEED + buildPhases + + 2D4B95107FAD4D3189BD308B + 5771BB1904E34DACBD5ACB57 + + buildRules + + dependencies + isa - PBXFileReference - path - holiday.png - sourceTree - <group> + PBXNativeTarget + name + ib + productName + ib + productReference + 5B598451874F4A7AA70690A1 + productType + com.apple.product-type.library.static - 8A558B2D58884BE6819BAB4B + 9E9B75DDF12F4D679B645AB4 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.h path - ____Pods-environment.h + k_logo_bw_18x18.png sourceTree <group> - 8ED22446AB704BF391037001 + A0503A8F6CBA4A45B7F8D2DD children - 7DBC9BF6AA184220A2B0C618 - F5D9674720CA4DE5B311FCEA + EFC446AF6B3E46E88F074DE7 isa PBXGroup name - Supporting Files - path - ib.xcodeproj - sourceTree - <group> - - 91DB45AECE2244BE9C54C48E - - includeInIndex - 1 - isa - PBXFileReference - path - k_logo_bw_18x18.png + Frameworks sourceTree <group> - 9C58DB7C22234C7193556CA4 + AB376703AC374D0A9976DEED buildConfigurations - 13BB3625CE3F4E7597DD490C - 004BD04E425040168B4721D7 + D76258F2641C4FC4B03DF27F + CE0DDBB1F0F9472F9FA7C88B defaultConfigurationIsVisible 0 @@ -540,29 +546,47 @@ isa XCConfigurationList - 9CEBB5DCA7FC43A4B2E3466C + AC376AE042EF425BB99D473E - includeInIndex - 1 + children + + 700DD7B596CA40EEA7B55EAD + 653FC7C4F82742C892B58275 + E995FACC38FA4B19ABFA8394 + 9E9B75DDF12F4D679B645AB4 + 6E155C4E4D834C018845FC6C + F72B49FFB30F4C3CB5F2F4C7 + 899BE913B1BC4AA69CE36CFF + 9954B7D74B544D1BA8122FD8 + 70E469314A7F4D0794491D9A + 1F414271A3EC4AE0B4E0CE78 + EDE3AE35122D41FD8DA5EF18 + isa - PBXFileReference + PBXGroup + name + Resources path - pivotal.png + resources sourceTree <group> - 9F14BE74C5A749269068F8F2 + AEAAE51D8A8047BABCA6091E includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h + name + MASShortcutView.h path - jukebox.png + MASShortcut/MASShortcutView.h sourceTree <group> - A3057F96D26E429F9698BD02 + BBD77DA643A64CA1BC9837EA includeInIndex 1 @@ -571,61 +595,95 @@ lastKnownFileType sourcecode.c.h path - ____Pods-SocketRocket-prefix.h + ____Pods-environment.h sourceTree <group> - A8727E6875704EC582F25CBF + BF264D44E3484F00BF6C546B - buildConfigurations - - 481170E0866F44898C8DC31F - BDB63548421845CFBEDB6518 - - defaultConfigurationIsVisible - 0 - defaultConfigurationName - Release + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + CLANG_CXX_LANGUAGE_STANDARD + gnu++0x + CLANG_CXX_LIBRARY + libc++ + CLANG_ENABLE_MODULES + YES + CLANG_ENABLE_OBJC_ARC + YES + CLANG_WARN_BOOL_CONVERSION + YES + CLANG_WARN_CONSTANT_CONVERSION + YES + CLANG_WARN_DIRECT_OBJC_ISA_USAGE + YES_ERROR + CLANG_WARN_EMPTY_BODY + YES + CLANG_WARN_ENUM_CONVERSION + YES + CLANG_WARN_INT_CONVERSION + YES + CLANG_WARN_OBJC_ROOT_CLASS + YES_ERROR + COPY_PHASE_STRIP + NO + ENABLE_NS_ASSERTIONS + NO + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_WARN_64_TO_32_BIT_CONVERSION + YES + GCC_WARN_ABOUT_RETURN_TYPE + YES_ERROR + GCC_WARN_UNDECLARED_SELECTOR + YES + GCC_WARN_UNINITIALIZED_AUTOS + YES + GCC_WARN_UNUSED_FUNCTION + YES + GCC_WARN_UNUSED_VARIABLE + YES + VALIDATE_PRODUCT + YES + isa - XCConfigurationList + XCBuildConfiguration + name + Release - ABA8B896458D4CB89BCA0DFA + C170F2448BDF464AA752D1A9 includeInIndex 1 isa PBXFileReference + lastKnownFileType + sourcecode.c.h + name + MASShortcut.h path - timesheet.png + MASShortcut/MASShortcut.h sourceTree <group> - B7689E39274641AB9F8C798D + C21009BE7FD641899FDBA080 - children - - 8A558B2D58884BE6819BAB4B - 2738B79C0E4346AB8D79A63D - A3057F96D26E429F9698BD02 - 05E0F3C68B00495897420164 - 09429F50208947308AC467BE - C548AE9A04C24991885F72FE - 643CCDC12CFA48B8BE34CFEF - CC8EDAAB474A4E6F8563F29C - 14204E80D45D473AA0E96193 - 1AF9E1A55B114E0E90F2532C - 20B84943B7C84919B342CAB8 - + includeInIndex + 1 isa - PBXGroup + PBXFileReference + lastKnownFileType + sourcecode.c.h name - Pods + MASShortcutView+UserDefaults.h path - vendor/Pods/Headers + MASShortcut/MASShortcutView+UserDefaults.h sourceTree <group> - BDB63548421845CFBEDB6518 + CE0DDBB1F0F9472F9FA7C88B buildSettings @@ -674,22 +732,7 @@ name Debug - C509F7998F1F4023803B6121 - - children - - 0D55DFBC5CCB45C194B37755 - 29619A1C88EF409AB97E8346 - 297F7D6E8D3846E89A0FF996 - 8ED22446AB704BF391037001 - B7689E39274641AB9F8C798D - - isa - PBXGroup - sourceTree - <group> - - C548AE9A04C24991885F72FE + D7343AD423A9430A8416FE6A includeInIndex 1 @@ -697,25 +740,62 @@ PBXFileReference lastKnownFileType sourcecode.c.h - name - MASShortcut.h path - MASShortcut/MASShortcut.h + Stubs.h sourceTree <group> - CAB6D9FA8AD34B2A96630787 + D76258F2641C4FC4B03DF27F - includeInIndex - 1 + buildSettings + + ALWAYS_SEARCH_USER_PATHS + NO + COMBINE_HIDPI_IMAGES + YES + COPY_PHASE_STRIP + YES + DEBUG_INFORMATION_FORMAT + dwarf-with-dsym + DSTROOT + /tmp/xcodeproj.dst + GCC_C_LANGUAGE_STANDARD + gnu99 + GCC_ENABLE_OBJC_EXCEPTIONS + YES + GCC_PRECOMPILE_PREFIX_HEADER + YES + GCC_VERSION + com.apple.compilers.llvm.clang.1_0 + INSTALL_PATH + $(BUILT_PRODUCTS_DIR) + MACOSX_DEPLOYMENT_TARGET + 10.7 + OTHER_CFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + + OTHER_CPLUSPLUSFLAGS + + -DNS_BLOCK_ASSERTIONS=1 + $(inherited) + + OTHER_LDFLAGS + + PRODUCT_NAME + $(TARGET_NAME) + SDKROOT + macosx + SKIP_INSTALL + YES + isa - PBXFileReference - path - k_logo_col_18x18.png - sourceTree - <group> + XCBuildConfiguration + name + Release - CC8EDAAB474A4E6F8563F29C + DCC2DD151C034A288A0A3B7D includeInIndex 1 @@ -724,158 +804,78 @@ lastKnownFileType sourcecode.c.h name - MASShortcutView.h + NSData+SRB64Additions.h path - MASShortcut/MASShortcutView.h + SocketRocket/NSData+SRB64Additions.h sourceTree <group> - CCE62FB54BD04EB2BDCB8ABC + DF56046E7B574D818CFAED05 isa PBXFileReference lastKnownFileType wrapper.framework name - CoreData.framework + Cocoa.framework path - Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/CoreData.framework + Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework sourceTree DEVELOPER_DIR - D4C2C2ADEC904A1195748A0D - - fileRef - 33E4BDDBED30493D92CC1FCE - isa - PBXBuildFile - - D82C17F146E6472E93FA996E + E995FACC38FA4B19ABFA8394 includeInIndex 1 isa PBXFileReference path - campfire.png + jukebox.png sourceTree <group> - E1ACD7C52F6F43AC9A7A0C34 - - fileRef - F5D9674720CA4DE5B311FCEA - isa - PBXBuildFile - - E242C64F3D494557BB2C60B3 + EDE3AE35122D41FD8DA5EF18 + includeInIndex + 1 isa PBXFileReference lastKnownFileType - wrapper.framework - name - Cocoa.framework + file.xib path - Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.8.sdk/System/Library/Frameworks/Cocoa.framework + Preferences.xib sourceTree - DEVELOPER_DIR + <group> - E30E8030DD93486A8285231E + EFC446AF6B3E46E88F074DE7 - attributes - - LastUpgradeCheck - 0500 - - buildConfigurationList - 9C58DB7C22234C7193556CA4 - compatibilityVersion - Xcode 3.2 - developmentRegion - English - hasScannedForEncodings - 0 - isa - PBXProject - knownRegions - - en - - mainGroup - C509F7998F1F4023803B6121 - productRefGroup - 0D55DFBC5CCB45C194B37755 - projectDirPath - - projectReferences - - projectRoot - - targets + children - F8A5EC05FD584912B241FD91 + DF56046E7B574D818CFAED05 + 989C742BF6424874A7F6777F + 3C65871CCA0A4C73AE5F2ADB + 38D70B184CFD4CAF97DECB04 - - EA9F6F4A77F541F2B3A1077A - - fileRef - E242C64F3D494557BB2C60B3 - isa - PBXBuildFile - - EB94EF906FA442D49C037431 - - explicitFileType - archive.ar - includeInIndex - 0 isa - PBXFileReference - path - libib.a + PBXGroup + name + OS X sourceTree - BUILT_PRODUCTS_DIR + <group> - F5D9674720CA4DE5B311FCEA + F72B49FFB30F4C3CB5F2F4C7 includeInIndex 1 isa PBXFileReference - lastKnownFileType - sourcecode.c.objc path - Stubs.m + missing_artwork.png sourceTree <group> - F8A5EC05FD584912B241FD91 - - buildConfigurationList - A8727E6875704EC582F25CBF - buildPhases - - 6177FCD4185442FB9F29AE5E - 594A41BB889F420CAF2598B2 - - buildRules - - dependencies - - isa - PBXNativeTarget - name - ib - productName - ib - productReference - EB94EF906FA442D49C037431 - productType - com.apple.product-type.library.static - rootObject - E30E8030DD93486A8285231E + 968666874E754B108B3A850F diff --git a/ib.xcodeproj/project.xcworkspace/xcuserdata/duncan.xcuserdatad/UserInterfaceState.xcuserstate b/ib.xcodeproj/project.xcworkspace/xcuserdata/duncan.xcuserdatad/UserInterfaceState.xcuserstate index 09263177b60f7223198bd76ca4da3e14bc1b6abc..8f0db7283a833da62919b4381e49a1cb012581ff 100644 GIT binary patch delta 5875 zcmZ`+2Ut``*PgPyH+H$(?%ut7S3opk1&vW7AOd0mtWkonB9WpLOHg-Kll)&|jO7|N zMiT*hj6E7n?A;g(VvSv6i5hz^`R}eFhQF}S!=9aU&dixP?|aV7`2L6bPd4M1_|+6D z5;mFAvCzK;{0P>AonRN(4fcS&;2<~zj)F7bEI0?wgA3pixB+g0Ti_133m$@(;1&1_ z%Ao=(p$e*@1{$Cnvd{xL=!Fen1Z)G_!HzHyc8002E9?O?VQ<(E4uIJ(7v{kaU?Cg| zOJNxt1;@aT;iq=^8T~M};c~cwPk~+hEl^9;3dN#0)Ec!x zZ=<&89TblePzp*#Jy9>z8}&i`Q85~dhM^Kvipo$q8jePwkI|=yN7K+O^bPtJRig!H zAzFgIL(9<$vkI36eCZa5wH#C>pIJOJn5JUj#!<8u5V9*4){ zkMQSsBK{Ij$20Iuya+GGOYnDiDgGWW!)x#l_$T}`-iWv3-FOc^fNSsxd=_89SF!pU zzJu@Ld-xfCj$iQKqV_O>KaZwjKk@VB_$e&qi$!t#VNoo}{e{j-Y z$UBwbSJIAO%GsKL!=Sbb)PN(TJxL^;j{rGP2n!tpCxM{~90w;z2l8$eI0b$q9Z5V% z;2&5RK3>&416-^EAA`&~hs)qaC<;ndYAID z?12To4kaboqpF3mVvw1oqxdlzim3?&a1Rtzg8L+u(6!(ZcnqEhK|KY}z;p0|m#7(O zSCU4$kYU0ZwB&QudKy3xh^mGVB8W*h(w+3EhGHmzQj$(GNG3l`-8V%m%n5a*C!zn2 z8XBP$L@j_O7zWMI0>dFidXe6w59v$#k@prr8?*x!u#ko{=}(G=%UhRq2@3?o79a-9xF!GWF!-Mk!^-&!vLqRt82T}SkCDem zz{&7Sfp2gMoCgh7!p3(uR&$`X5@-kxVj#G)eV}$8h==>(ukZjdkuS((GL>}ZDbsf{@H`Y$7k?gS1E|NCv=?MS{`d0F(uwHUK?D6M%0C zkmmYzj!($Q9+;Xv&{vS9(+R)Q2N#b>%O0Memt9s|(q9-z$juj|4kfXl4GYZMwT}LH4NP^0JH) zpYQLSqIRf*P}op=vZfNfOMc*oxMJF)M3fX9>_pa9qRwO;;WD~p=NHwvbV1#Lp&F&3 zuBaRNk*p^hs!pZ_TtXaE`nq86eo^ghZ)15pmj zMLx2TY$BV<7P6IWBik3EJTw^PqYuy!RDcS}4ziQ%CP&FH4C!IA zm(-Fy{I8DIQD1_BYBU|qKr_ic@+&z==o<93;4=ix>DxJ1;C=p}d|!zW#eP1<8II?o zN`9!5##N|_FLJVNf~ND(9CCo{@6*FqT3lX|<12kV!y;k$5ZT`&f8dc&9e#|KqVGWp zsUb%Q$kMgrW7J+g&qldJ6htf0sw|x`zGp^!aZY)#;G`DkWS8X^7geFv{0*l=gnmG4 zc@-TkLhC@LAT(6JmzZDRYf$RyI-8{YuV} z--S|sm2kaNeS^w+=KDtU>5-o|I3#uJn;Jq{m*QNXuuhN=Lksdlst_Q9Jg8fz7M%>P za}*sz$I%ILo?IXo$)$N9LV(k0zzEomAeZ^39zvnZpkVGBC|yO@g9yDwuJC!ByA%2o z-Kp!(=q|ZNxYs*=AarQ-5IrK-$)EppX!I1l5E?FehMto@$c-xW61^ff$*tEN+W*g% z*!JU+Lf!Z8Xt5Z}{_Th5SV3-+J0#)F=Kq(E7VGL2QEbFvLZsM4?pIKCj6 zP(oh*i%K{FCkCkm*nn_pcok$4i3puJP7%n2Q*jrZM*a#w5Pk z;|~O~RMJuM*P{ivkZw)HD{Gb0}{8`9YLlW5b#V)~?1E3CJU*IW1hsBfd%zs9ri9Q+ObHULcl7#4u$0JH>PcmPrha3!u1 zC=`L`;{^d|4G1?d;YuBVLb}~SyqSVMY2?uCqFi5Y=Q3YmX|N&i?@{S|TZ-oG6eE<7 zP{+s1@k(H*#47^OR*6>ypq(US>9m4-&+LM7UulPsXPxm{{9_Q=>jKbGiPs09lW;=a z>sF`UgtxqzYij_yNJ5=z2j2ObBtmS#y2QVtEPlKf|MJFRe*m&?91h|`^;vZUAN?nV z#{!V6OW{dSTa8cQ-|*=G^afyL07k#b<2ih>UTQAk%K_LR03(9CRL}D1EkvJ_3OZP{0iuf)=1PXeT`K7NfPoqi(P8pgStm%9H4<@SwYhE~Dqz zjo-rW3a_+8oFu%|QgNE_TI+!`_?2Fxe-y3|AhcXK%VYSKFuzsQT$Cb874;FlFB&My z6%7&_@Vf*_^J50_@($SiA~a0QX!cnS>%_jl&q1gmHa6A zNwPz-UvgM-R`R>#s^q%lhUA{)f#i|oiR78oByA||B+Za!N_$FsOS7dTq+_KMq%);o zNoPrCOXo`$O4mp?OSek5OLt0lOZQ4^rN^Wvq^G2(rDvt*r8lIHWlmYFEK4?6RxTSS z8!!7v_K9qgY^rRU%s*W=Q#N0=K(GGZOhYF++E2IjALZ#3s+=_;ZCW@wt=8Bezj*28j zvLaQ{U6HQHRP<8#6eAV074sF#6sr|m6gw5W6?+v2{E9=08bz(*sN$^Rs^XF2rIJ#* zm7KDHGE&)E8Lv!J_Eo;89H4w(IZ!!MS*cv6{6V=+xnB8`a+`98a+h+Ca-Z_B@`UoG zic;BCoGL;UrHWR?sS;I5s$^BFDoxc*)kBq~%2ws5e5yQEzG{f7P{pg3tB$E&sO@Th z2X(T#P+hDZrY=>Nt4F9usVmfD)P8k9Jzo8>`oGklswb!?swb&us;kuV)SJ}1)hE^G z)z{Vc)DJWUjZNdwbkHPgQZ+f60!@)-y5?I=rDmgMmu8RVw&scEnbxFrXld=++5~MU z?Lh4iZJ~CCcCNNcds2H*ds)Z&b}t^sDr@^)K|V48VX4?F^}gOhYe2 zA45Mwf5RZdV8aK70z;8us9}O(m0^qFn&GbDx#5Ko8+As?Xfyg9M%u_2qm0qU#>OVb zrpD&Rw#Gzby0NFRx3QnGzcI^LXdG%BV;pDv$oPqIf^nj8l5vW0zHy`RqVc-%p7Eja zvGJ)1nUp5ANo&%ZjHWP?+vG8MO%W!asl-%f8g3eC`oXl#w8ON^w8wPRbj5Vd^oQxD z=}*%g(>=fGf$340G)x|*3{!_`!}MXsu&^*o7!?)~mKruVY)07nuxDnoImX<@+|%60 z+|S(K{DFCl*>4V*$D2Pk|Cjkw^91um^CWYXd7gQJd6D@$^D^^F^J?>2^N;2Y=3VBK z=BpNqCCbvrQedgDOtUPothVg3?6K^#?6(}S_zziXEVY(nmJ^m6mRpwFmb;ewmWP(d zmZz5ImY0^l!VTdK!{frch4%{|7CtR}QTXccE#ce4cZTl?-xt0=`~d|i5hbDIl#)_Y z28yPw^?^scUkvXk64ddk6TY# zf3u#kp0i%F-mu=X-nNNs7Ms@=XUnwpvh}g`v-P)S*{0ZL*(z<-w)wV&w#BwpwvD#U zwym}!w$rxfc3`LN5q5u+J=)&V-p<~^-qD_DPq$~F- zoFmau;rNf^GsowSFB~%*vmCP>-#FGfwmbGa4mb`uY8U-yK&ScO1{0 zVyD9yy){>^$qd;JoC#;=Jbk z!}*F<(i&Pv8|g6GLc3^=Za_!U4e40AE!~dpKqt~kbTXYv_oWNz;k2LroSs7S^q2H3 zdN%zHJ(pfWuco)qTj_1|4*D=%OCO_8(!bGX=)3eY`Y#uBVVBrta9LcG%jR;q{BD=W z<#jc2#kmq)DXuQAuC5GMPgieOUsr*v-1Uj;Yu691L#`vPqpstwQ?C227Yt^!OjG6^ zrajY=N#Kqi+N#0+MJF(a7|nK2Au#xWC^iOeKsCNqnf&CF*OF-w^5nGMX( z%qC_FbCNmDoMkRBm;B64<~DPexzD_Cd)*D)neGAZkKCWSm%D# zkGoH~&$!RIZ@TZg@4FwmpSfQKpSUb$RV>9iSr_YO8?aGqBlayemQ7%j*)D81Hk0km z_GA0A!`Nx;I(7$pn5|`xv!~cI?0NPQdxyQx`X8}R*k|lZ5AYxl&|6xJ-Hk%m-BIXTp2fl8^w+0{9J(hjGMwu<7RNPxY^udZW*_NTlF5dj@!U(Bw(gG=BtxB_l~+u#m(3Z8-I;01UI zF%&>441u9g1GP{G4bTo9&*(9!>Q13fivJNI0w#$3n2%W!cX9GxB`~KFX39aiA#jtd@Kq_@1Pje9JN3# z(fg=9>WsRet|$SeqJd}-N<)KDIvRq8q8v05<)Z>L3XMaP5J5B09JCNEL!Y2eQ7Kx5 zR-=t*6WWZnpo8dVbO@EB3UnA9K}XRsbR3;Um(Wdg3*AGH&|~xry+p4t#K?z5ScX+t zgALe>?U=2lvG(xF7D1hvMOQ6ds2s;t#P86FdWd zglFP8crN}gUWPxxpW@H(S9mR6hu7l`cr)ICcj0|_KR$qu;G_5$uEMABIeZcSfvd6f zHok*v@MHXhTZLj_3RjI5;W!eGKrNqNEoqj z&xL#BseSu)h#KEDDkE+L_nnA^W6Caz=0Mach8rpA6tx|Mmx8Te8)->emx3~|gR~_b z2wMfZ0y#(ki69B=B7o>gt8{f+uBXt$y^<)o&03A@hv0CVe-97VN~5Ge#(VAqKZEeq zU_UqjegX%{yQCd?kG#Jc90KJa3>+ryNi2yYA8`4h%SV7S;Qaq;{2RCsG>#`71IC1P z#eF;Vm#rt2r~6NC7U^gi(`HH)sGaXma214?fNIjY1Y9Fs8!q5hFw-vS>X3;3@LiHkyksa>E>BJD5C|Pla)`Yy;m)u-2wwxcz^*U>Cc-4xjSM5XWH=c? z^2o?Fum|i3T)@RY`;dH6z_T!ne~#jLYEiNrr+*rc1` z77)I2Wk5zW>scr%0V;y)DsmV~R)ctW6dr@eiI#j!7Lr9ImD6cANMO@oPYveEwej*e z-sKbW1yPZ>GJ`G(qUONkPjBF-bNJ?6KN}sOT-u$B6p}AguOVwPOU7gJL=JaL3-mIIg6>9tc1Zc+x z*hW%Zu?3C>ma(V?3UN+{~WoYVG8J z&^DVA>6jc76BFrZ9TPL9PIJ*{G^Rd$5&4Ovyb0z*#q_^m_h$w_jG58K+)uYQZSqTL{T9omMrqcXGu zeT{aaZ_u}B7dcJNkhA0$a*q5;&XeEBg>~pV^gVC}#1Z|7_M!cJ4Sy$p^IgD8q#sg# z==MXFFDRRumoc$mY*C;*>1us_mfZ@nz3ItC8Tr{6gZccs0Q67SIAXzo!BeU zectB*dYJmQSID2Fn%ieK;wR{zMHV|QMNhd`W>;Lm@;Q1)u94~iy}e@!#uoC8TN~gt zKYW8!^USLXo?#K78y0{>q9Zp+?J0=GSis-4!!~}h!HkF7!bm6w4hRi)l6xiCMecKljnQ$q5pEn93?mOpa5#BL z*goAda`WGG18#!f0immKQ``(klSkw+d9n(}02gjS{s~Y)$#d*oQ$~OME}tZBN1oQ7 zzPLT^48p&{u{aKYfIHxL+>yTmJ|oY`3-Xe@BCq`re1*Hecl2W@(IeZ3S1hEnOznFnX z;Jg4cfXfeMekcqugM`&OjONLK3-K6S|h*t6Mws3P`s zweGEaMMpPp#p_qAmi79D=iy@h4v6RDkMRP$&=1vq7~+SaeyCZE7hw+ez)Sp4>xVSS z_d|xT{gb>yi&ApE zbNmHffmiyW&JXo|Xz)YhYW|k%!mELk?|#1iCN9B7e0U?sTlu!~Tky6zUBuh{(ELUi z@z?x;hIis`{Ltcu_Ig>wyYZfX%NPCu@AX5gAKFMt{W@H+{u}?+Jp2Yau0k)s;Ll^g_jd9^K_-q4J$G_s=0v6}}&{Kjh_+g{KCEABC z1(LsvulOOq?1;C?U&S}-@(8B!7ryC-jr}m3PorKBU9q`C8f1SL-*4dc0Q0Ph^uwsS zgYVx;>53i16*xq`;1w{@JJFjRydIA87M{Y-@bkXB&=z?K1QK8Z42S?NKwHortw3M$ zO23=`emsg!p(=ESSJDgUBLC(11lw=~|1lWLH)cHU#5Z9APQu;!kHakN#W^^a@0yXg z0FUN-V=Nxeb8Z7Zh%0^gFZ^7f7c>)e7IYEx6$}y#77P(&3UUP_1S16ng3*FCf)hfi zP%ktI%|e^dA!LM2g{_1ggdK&Qg9N@nrEd@dEL3@#o?%#4E+?#2duliVuhniVuk^ z#7D%(#OK84#TUdE#h1ia#MR=v;^z`Z(oT{k$&*Z!%#_TM%$CfNaFV5xWs*-N%O&e1 z>m?f`n|zYplD(3Bk^_=*$zjP+$#KbVlHVnNNG?ll(g^-zvZ*v$nlGI!ogtkmoh_Xs zohMx){jc;B>1Wcmo~#CCR$WddddK2FlW8>9P!2 zmMl*;RyIxck!+T1j%=RnW7%i2&t)rQC9+>+zG~SW*HxTkoac%&35)k<3F@hQWU;mSy5 z6J@q?q;itdubi&@NI6USv2vkuk#ezesq%B>YGsA;s`7^Np7NpcvGO04P!+1us`M(O zidI=vHdTZwO4U>qt%^~#P_ilU5^i851esx#G($*95Om&QpkrPWg*{( z{1EaoR1_)+eJ`|AXqV7wp>sp$hgOAN2z{Z!8kbMgM$<{tS<^+6py{Vc)eO?4Yce!h zn$emfjbAfUGg~u9vp`d<;WSG$>oof`*EDxDk2Oy<&owW#A}ys2(Q33htwC$jdbDBM zaBZYES36ESK|4wNp>~({XKlImu=c3-SM5#hZEcPAZ|!~UL+xYjKiX$HxlXC0biNRs zMyJymbS9lyXVpdOdg}6YpXv7KUg>Fl3w;3xa`j7Op^#9S%)z8;2 z&=>1D{TlsR{d)aI{bv1E{dWBh{Z9S2`rY~}{Wbl417m1m$To~O%rq=EtTB`sb{f7l zd}r8W*lQ>^95b9SoHA4yF8K^s4c85S8EOoF8}1t(8j(?F)En)_NMp1y#@NEx*4WPY zzA@I=)tF)&XiPJv8?%i=jl+z?jZ=*!#-EI*j2DfUj8}}+#%snK#+$|`#;3;T#+Sy| zCTPMYp~+&3Fui9QWSVQ*V*1{+*R;>{lj&zux#_&=y6L9rw#j$bbkFp_^w{)-R?%kK zMmuO1&C-qN=5!0XCEc3tNOz$V=x%fmx)(i|PN#>^nREeNNEgxL>524YdImk0o=-2J zi)oHtNq1+m@$;Q~CY)x&^whp!=+X&kz+XCA% z+o!hWwl%gbwr#dD+fLg7+d=;O$6WIKjBavdWaBOOZ|rH(HhU-=yC9UC2+9c7Lm9fuqh zjw6m^j?<2_j&qLR9KSoIPN%bt^8;r`XJ=t113!I~!Mb7EYna=+> z=Q$TRi=B&|OP$M{Uplurk2)_oUobS|VY)K|nW4-uW;m0_YB%uHrB zQ_L)8d`p>S%qC_lQ^tJFe8cQw_A?dCQRW0w$(&|>XZ~O=GdG#rObzpddB(h8Ub_@7 zl}qgkbv1Y8x(Z!mT@zfBT#H;QTx(q$T$^3nTsvHQTtB)FxDL9?U58y&u3N6hZs1nB z^=^~f;-2Kx1nia5OR>mq=9cyDF*kr#Y#y7> zPGc9a3)y0pV^^}P*fs1rb|br)-OnCjPqJ0)S@s-zmA%Q{W;@rg57@`-Q}($>=uvsh q9*2kVxIK+Mk)EcWXio=El4r0d%aa?tXaIz2pZG=Xv+loV#Qy+}XCjXP diff --git a/ib.xcodeproj/xcuserdata/duncan.xcuserdatad/xcschemes/xcschememanagement.plist b/ib.xcodeproj/xcuserdata/duncan.xcuserdatad/xcschemes/xcschememanagement.plist index 2eb4284..f8f7924 100644 --- a/ib.xcodeproj/xcuserdata/duncan.xcuserdatad/xcschemes/xcschememanagement.plist +++ b/ib.xcodeproj/xcuserdata/duncan.xcuserdatad/xcschemes/xcschememanagement.plist @@ -27,6 +27,21 @@ primary + 7712566F02B8460BAAB92966 + + primary + + + 83493AEE5C0D45A7884E3E8E + + primary + + + 9BC03126A2C04CEDA11D674B + + primary + + C3900FF4548F4EE483480675 primary diff --git a/resources/Preferences.xib b/resources/Preferences.xib index 8f2a062..d79343a 100644 --- a/resources/Preferences.xib +++ b/resources/Preferences.xib @@ -156,6 +156,7 @@ +