Skip to content

Added support for arm64 (Apple Silicon) and dark mode #21

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.

Sign up for GitHub

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

Open
jkeller13 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Added support for arm64 (Apple Silicon) and dark mode #21

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
0 English.lproj/MainMenu.nib/designable.nib → Base.lproj/MainMenu.nib/designable.nib
View file
Open in desktop
File renamed without changes.
0 English.lproj/MainMenu.nib/keyedobjects.nib → Base.lproj/MainMenu.nib/keyedobjects.nib
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion Info.plist
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<key>CFBundleExecutable</key>
<string>Pashua</string>
<key>CFBundleIdentifier</key>
<string>net.bluem.pashua</string>
<string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
<key>CFBundleInfoDictionaryVersion</key>
<string>6.0</string>
<key>CFBundlePackageType</key>
Expand Down
69 changes: 42 additions & 27 deletions Pashua.xcodeproj/project.pbxproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,13 @@
/* End PBXBuildFile section */

/* Begin PBXFileReference section */
089C165DFE840E0CC02AAC07 /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/InfoPlist.strings; sourceTree = "<group>"; };
0E46289026558F7700230A06 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
0E46289226558F7700230A06 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/dict.strings; sourceTree = "<group>"; };
0E46289326558F7C00230A06 /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = de.lproj/MainMenu.nib; sourceTree = "<group>"; };
0E46289426558F7C00230A06 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/dict.strings; sourceTree = "<group>"; };
0E46289526558F7F00230A06 /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr; path = fr.lproj/MainMenu.nib; sourceTree = "<group>"; };
0E46289626558F7F00230A06 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/dict.strings; sourceTree = "<group>"; };
0E46289726558F8100230A06 /* Base */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Base; path = Base.lproj/MainMenu.nib; sourceTree = "<group>"; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = "<absolute>"; };
13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = "<absolute>"; };
22083B112065539900EA6FAD /* PshFilesystemBrowser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PshFilesystemBrowser.h; path = Elements/PshFilesystemBrowser.h; sourceTree = "<group>"; };
Expand Down Expand Up @@ -89,7 +95,6 @@
22EE715F19F1039600D59652 /* NSView+CBAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = "NSView+CBAdditions.h"; path = "Categories/NSView+CBAdditions.h"; sourceTree = "<group>"; };
22EE716019F1039600D59652 /* NSView+CBAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSView+CBAdditions.m"; path = "Categories/NSView+CBAdditions.m"; sourceTree = "<group>"; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = "<group>"; };
29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = "<group>"; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = "<absolute>"; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = "<absolute>"; };
32CA4F630368D1EE00C91783 /* Pashua_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pashua_Prefix.pch; sourceTree = "<group>"; };
Expand Down Expand Up @@ -143,11 +148,6 @@
356164650930B862009D59D3 /* PshOpenBrowser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PshOpenBrowser.h; path = Elements/PshOpenBrowser.h; sourceTree = "<group>"; };
356165A30930C8AA009D59D3 /* FSBrowserButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FSBrowserButton.m; sourceTree = "<group>"; };
356165A40930C8AA009D59D3 /* FSBrowserButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FSBrowserButton.h; sourceTree = "<group>"; };
3575F349093286CB00B5AF9E /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/dict.strings; sourceTree = "<group>"; };
3575F35B0932874000B5AF9E /* German */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = German; path = German.lproj/dict.strings; sourceTree = "<group>"; };
3575F35C0932874300B5AF9E /* French */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = French; path = French.lproj/dict.strings; sourceTree = "<group>"; };
3575F569093293F100B5AF9E /* German */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = German; path = German.lproj/MainMenu.nib; sourceTree = "<group>"; };
3575F56A093293F600B5AF9E /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/MainMenu.nib; sourceTree = "<group>"; };
3575F5B90932972700B5AF9E /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = "<absolute>"; };
35B1F02A093248B700E7A53B /* PshButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PshButton.h; path = Elements/PshButton.h; sourceTree = "<group>"; };
35B1F02B093248B700E7A53B /* PshButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PshButton.m; path = Elements/PshButton.m; sourceTree = "<group>"; };
Expand Down Expand Up @@ -381,18 +381,19 @@
29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject;
attributes = {
LastUpgradeCheck = 0920;
LastUpgradeCheck = 1250;
ORGANIZATIONNAME = "Carsten Blüm";
};
buildConfigurationList = 351B25600900EAF100ED6EA5 /* Build configuration list for PBXProject "Pashua" */;
compatibilityVersion = "Xcode 3.2";
developmentRegion = English;
developmentRegion = en;
hasScannedForEncodings = 1;
knownRegions = (
English,
Japanese,
French,
German,
en,
ja,
de,
fr,
Base,
);
mainGroup = 29B97314FDCFA39411CA2CEA /* Pashua */;
projectDirPath = "";
Expand Down Expand Up @@ -504,27 +505,27 @@
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
089C165DFE840E0CC02AAC07 /* English */,
0E46289026558F7700230A06 /* en */,
);
name = InfoPlist.strings;
sourceTree = "<group>";
};
29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
isa = PBXVariantGroup;
children = (
29B97319FDCFA39411CA2CEA /* English */,
3575F569093293F100B5AF9E /* German */,
3575F56A093293F600B5AF9E /* French */,
0E46289326558F7C00230A06 /* de */,
0E46289526558F7F00230A06 /* fr */,
0E46289726558F8100230A06 /* Base */,
);
name = MainMenu.nib;
sourceTree = "<group>";
};
3575F3570932873800B5AF9E /* dict.strings */ = {
isa = PBXVariantGroup;
children = (
3575F349093286CB00B5AF9E /* English */,
3575F35B0932874000B5AF9E /* German */,
3575F35C0932874300B5AF9E /* French */,
0E46289226558F7700230A06 /* en */,
0E46289426558F7C00230A06 /* de */,
0E46289626558F7F00230A06 /* fr */,
);
name = dict.strings;
sourceTree = "<group>";
Expand All @@ -536,10 +537,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = NO;
GCC_DYNAMIC_NO_PIC = NO;
GCC_ENABLE_FIX_AND_CONTINUE = YES;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = YES;
GCC_OPTIMIZATION_LEVEL = 0;
Expand All @@ -551,10 +553,10 @@
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.9;
ONLY_ACTIVE_ARCH = YES;
PREBINDING = NO;
PRODUCT_BUNDLE_IDENTIFIER = net.bluem.pashua;
PRODUCT_NAME = Pashua;
SDKROOT = macosx;
VALID_ARCHS = "i386 x86_64";
VALID_ARCHS = "i386 x86_64 arm64";
WRAPPER_EXTENSION = app;
ZERO_LINK = YES;
};
Expand All @@ -564,10 +566,11 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
COPY_PHASE_STRIP = YES;
GCC_ENABLE_CPP_EXCEPTIONS = YES;
GCC_ENABLE_FIX_AND_CONTINUE = NO;
GCC_ENABLE_OBJC_EXCEPTIONS = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -578,10 +581,10 @@
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.9;
ONLY_ACTIVE_ARCH = NO;
PREBINDING = NO;
PRODUCT_BUNDLE_IDENTIFIER = net.bluem.pashua;
PRODUCT_NAME = Pashua;
SDKROOT = macosx;
VALID_ARCHS = "i386 x86_64";
VALID_ARCHS = "i386 x86_64 arm64";
WRAPPER_EXTENSION = app;
ZERO_LINK = NO;
};
Expand All @@ -591,6 +594,8 @@
isa = XCBuildConfiguration;
buildSettings = {
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
CLANG_ENABLE_OBJC_WEAK = YES;
CODE_SIGN_IDENTITY = "-";
COMBINE_HIDPI_IMAGES = YES;
GCC_GENERATE_DEBUGGING_SYMBOLS = NO;
GCC_PRECOMPILE_PREFIX_HEADER = YES;
Expand All @@ -601,9 +606,10 @@
INSTALL_PATH = "$(HOME)/Applications";
MACOSX_DEPLOYMENT_TARGET = 10.9;
ONLY_ACTIVE_ARCH = NO;
PRODUCT_BUNDLE_IDENTIFIER = net.bluem.pashua;
PRODUCT_NAME = Pashua;
SDKROOT = macosx;
VALID_ARCHS = "i386 x86_64";
VALID_ARCHS = "i386 x86_64 arm64";
WRAPPER_EXTENSION = app;
};
name = Default;
Expand All @@ -617,12 +623,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -654,12 +663,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down Expand Up @@ -689,12 +701,15 @@
CLANG_WARN_BOOL_CONVERSION = YES;
CLANG_WARN_COMMA = YES;
CLANG_WARN_CONSTANT_CONVERSION = YES;
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
CLANG_WARN_EMPTY_BODY = YES;
CLANG_WARN_ENUM_CONVERSION = YES;
CLANG_WARN_INFINITE_RECURSION = YES;
CLANG_WARN_INT_CONVERSION = YES;
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
CLANG_WARN_STRICT_PROTOTYPES = YES;
CLANG_WARN_SUSPICIOUS_MOVE = YES;
Expand Down
0 German.lproj/MainMenu.nib/designable.nib → de.lproj/MainMenu.nib/designable.nib
View file
Open in desktop
File renamed without changes.
0 German.lproj/MainMenu.nib/keyedobjects.nib → de.lproj/MainMenu.nib/keyedobjects.nib
View file
Open in desktop
File renamed without changes.
0 German.lproj/dict.strings → de.lproj/dict.strings
View file
Open in desktop
File renamed without changes.
0 English.lproj/InfoPlist.strings → en.lproj/InfoPlist.strings
View file
Open in desktop
File renamed without changes.
0 English.lproj/dict.strings → en.lproj/dict.strings
View file
Open in desktop
File renamed without changes.
0 French.lproj/MainMenu.nib/designable.nib → fr.lproj/MainMenu.nib/designable.nib
View file
Open in desktop
File renamed without changes.
0 French.lproj/MainMenu.nib/keyedobjects.nib → fr.lproj/MainMenu.nib/keyedobjects.nib
View file
Open in desktop
File renamed without changes.
0 French.lproj/dict.strings → fr.lproj/dict.strings
View file
Open in desktop
File renamed without changes.