Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

JHWaveform #34

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Classes/Controllers/WindowController.m
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,6 @@ - (void)setupControllers

self.currentViewController = self.dropZoneViewController;
[self.currentViewController.view setFrame:self.masterView.bounds];
[self.currentViewController.view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
[self.masterView addSubview:self.currentViewController.view];
}

Expand Down
24 changes: 22 additions & 2 deletions Perpetual.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
938212DD1503041E00EEBEC6 /* NSString+TimeConversion.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+TimeConversion.h"; sourceTree = "<group>"; };
938212DE1503041E00EEBEC6 /* NSString+TimeConversion.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+TimeConversion.m"; sourceTree = "<group>"; };
9395B6AC14EB88A8002999D9 /* QuartzCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QuartzCore.framework; path = System/Library/Frameworks/QuartzCore.framework; sourceTree = SDKROOT; };
9395B6AF14EB8D91002999D9 /* Podfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Podfile; sourceTree = "<group>"; };
9395B6AF14EB8D91002999D9 /* Podfile */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = Podfile; sourceTree = "<group>"; xcLanguageSpecificationIdentifier = xcode.lang.ruby; };
939EF98F14FCA1DA00CDBA32 /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Window.xib; sourceTree = "<group>"; };
93A6238414F0B65200B907E3 /* NSString+base64.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSString+base64.h"; sourceTree = "<group>"; };
93A6238514F0B65200B907E3 /* NSString+base64.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSString+base64.m"; sourceTree = "<group>"; };
Expand Down Expand Up @@ -134,6 +134,13 @@
path = Assets;
sourceTree = "<group>";
};
936523D617A224C300612B21 /* Extensions */ = {
isa = PBXGroup;
children = (
);
path = Extensions;
sourceTree = "<group>";
};
9394227515038D9200440F23 /* Models */ = {
isa = PBXGroup;
children = (
Expand Down Expand Up @@ -285,6 +292,7 @@
9309191E14F07F07000D82ED /* Assets */,
93A6238714F0BDC600B907E3 /* Categories */,
93A623F714F0C88B00B907E3 /* Classes */,
936523D617A224C300612B21 /* Extensions */,
9AC739D914EAEAB6000A57AD /* Supporting Files */,
);
name = Perpetual;
Expand Down Expand Up @@ -330,7 +338,7 @@
9AC739C514EAEAB6000A57AD /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0430;
LastUpgradeCheck = 0460;
ORGANIZATIONNAME = "Revyver, Inc.";
};
buildConfigurationList = 9AC739C814EAEAB6000A57AD /* Build configuration list for PBXProject "Perpetual" */;
Expand Down Expand Up @@ -478,6 +486,10 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = NO;
GCC_C_LANGUAGE_STANDARD = gnu99;
GCC_DYNAMIC_NO_PIC = NO;
Expand All @@ -492,6 +504,7 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
ONLY_ACTIVE_ARCH = YES;
Expand All @@ -505,6 +518,10 @@
ALWAYS_SEARCH_USER_PATHS = NO;
ARCHS = "$(ARCHS_STANDARD_64_BIT)";
CLANG_ENABLE_OBJC_ARC = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
COPY_PHASE_STRIP = YES;
DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym";
GCC_C_LANGUAGE_STANDARD = gnu99;
Expand All @@ -513,6 +530,7 @@
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
GCC_WARN_ABOUT_RETURN_TYPE = YES;
GCC_WARN_UNINITIALIZED_AUTOS = YES;
GCC_WARN_UNUSED_VARIABLE = YES;
MACOSX_DEPLOYMENT_TARGET = 10.7;
SDKROOT = macosx;
Expand All @@ -525,6 +543,7 @@
baseConfigurationReference = DDB3CDEF03204F9F8C7160C4 /* Pods.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
COMBINE_HIDPI_IMAGES = YES;
DSTROOT = /tmp/xcodeproj.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Prefix.pch;
Expand All @@ -542,6 +561,7 @@
baseConfigurationReference = DDB3CDEF03204F9F8C7160C4 /* Pods.xcconfig */;
buildSettings = {
CODE_SIGN_IDENTITY = "3rd Party Mac Developer Application";
COMBINE_HIDPI_IMAGES = YES;
DSTROOT = /tmp/xcodeproj.dst;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
GCC_PREFIX_HEADER = Prefix.pch;
Expand Down
2 changes: 1 addition & 1 deletion Perpetual.xcworkspace/contents.xcworkspacedata

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 2 additions & 3 deletions Podfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
platform :osx
platform :osx, '10.7'

dependency 'INAppStoreWindow', :git => 'https://github.com/indragiek/INAppStoreWindow.git'
dependency 'SMDoubleSlider', :git => 'https://github.com/bryanveloso/SMDoubleSlider.git'
pod 'INAppStoreWindow', '~> 1.2'
11 changes: 7 additions & 4 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
PODS:
- INAppStoreWindow (1.0)
- SMDoubleSlider (2.0.2)
- INAppStoreWindow (1.2)

DEPENDENCIES:
- INAppStoreWindow (from `https://github.com/indragiek/INAppStoreWindow.git')
- SMDoubleSlider (from `https://github.com/bryanveloso/SMDoubleSlider.git')
- INAppStoreWindow (~> 1.2)

SPEC CHECKSUMS:
INAppStoreWindow: d00327caee47d951043169df9aaab952389defcb

COCOAPODS: 0.22.3
1 change: 1 addition & 0 deletions Pods/BuildHeaders/INAppStoreWindow/INAppStoreWindow.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 26 additions & 20 deletions Pods/INAppStoreWindow/INAppStoreWindow.h

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading