diff --git a/English.lproj/MainMenu.nib/designable.nib b/Base.lproj/MainMenu.nib/designable.nib
similarity index 100%
rename from English.lproj/MainMenu.nib/designable.nib
rename to Base.lproj/MainMenu.nib/designable.nib
diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/Base.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from English.lproj/MainMenu.nib/keyedobjects.nib
rename to Base.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/Info.plist b/Info.plist
index 1367b89..51e3f8e 100644
--- a/Info.plist
+++ b/Info.plist
@@ -7,7 +7,7 @@
CFBundleExecutable
Pashua
CFBundleIdentifier
- net.bluem.pashua
+ $(PRODUCT_BUNDLE_IDENTIFIER)
CFBundleInfoDictionaryVersion
6.0
CFBundlePackageType
diff --git a/Pashua.xcodeproj/project.pbxproj b/Pashua.xcodeproj/project.pbxproj
index e7c3998..3664af1 100644
--- a/Pashua.xcodeproj/project.pbxproj
+++ b/Pashua.xcodeproj/project.pbxproj
@@ -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 = ""; };
+ 0E46289026558F7700230A06 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; };
+ 0E46289226558F7700230A06 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/dict.strings; sourceTree = ""; };
+ 0E46289326558F7C00230A06 /* de */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = de; path = de.lproj/MainMenu.nib; sourceTree = ""; };
+ 0E46289426558F7C00230A06 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/dict.strings; sourceTree = ""; };
+ 0E46289526558F7F00230A06 /* fr */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = fr; path = fr.lproj/MainMenu.nib; sourceTree = ""; };
+ 0E46289626558F7F00230A06 /* fr */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = fr; path = fr.lproj/dict.strings; sourceTree = ""; };
+ 0E46289726558F8100230A06 /* Base */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = Base; path = Base.lproj/MainMenu.nib; sourceTree = ""; };
1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Cocoa.framework; path = /System/Library/Frameworks/Cocoa.framework; sourceTree = ""; };
13E42FB307B3F0F600E4EEF1 /* CoreData.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreData.framework; path = /System/Library/Frameworks/CoreData.framework; sourceTree = ""; };
22083B112065539900EA6FAD /* PshFilesystemBrowser.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PshFilesystemBrowser.h; path = Elements/PshFilesystemBrowser.h; sourceTree = ""; };
@@ -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 = ""; };
22EE716019F1039600D59652 /* NSView+CBAdditions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = "NSView+CBAdditions.m"; path = "Categories/NSView+CBAdditions.m"; sourceTree = ""; };
29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; };
- 29B97319FDCFA39411CA2CEA /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/MainMenu.nib; sourceTree = ""; };
29B97324FDCFA39411CA2CEA /* AppKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AppKit.framework; path = /System/Library/Frameworks/AppKit.framework; sourceTree = ""; };
29B97325FDCFA39411CA2CEA /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = /System/Library/Frameworks/Foundation.framework; sourceTree = ""; };
32CA4F630368D1EE00C91783 /* Pashua_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Pashua_Prefix.pch; sourceTree = ""; };
@@ -143,11 +148,6 @@
356164650930B862009D59D3 /* PshOpenBrowser.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PshOpenBrowser.h; path = Elements/PshOpenBrowser.h; sourceTree = ""; };
356165A30930C8AA009D59D3 /* FSBrowserButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = FSBrowserButton.m; sourceTree = ""; };
356165A40930C8AA009D59D3 /* FSBrowserButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = FSBrowserButton.h; sourceTree = ""; };
- 3575F349093286CB00B5AF9E /* English */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = English; path = English.lproj/dict.strings; sourceTree = ""; };
- 3575F35B0932874000B5AF9E /* German */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = German; path = German.lproj/dict.strings; sourceTree = ""; };
- 3575F35C0932874300B5AF9E /* French */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.plist.strings; name = French; path = French.lproj/dict.strings; sourceTree = ""; };
- 3575F569093293F100B5AF9E /* German */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = German; path = German.lproj/MainMenu.nib; sourceTree = ""; };
- 3575F56A093293F600B5AF9E /* French */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = French; path = French.lproj/MainMenu.nib; sourceTree = ""; };
3575F5B90932972700B5AF9E /* Carbon.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Carbon.framework; path = /System/Library/Frameworks/Carbon.framework; sourceTree = ""; };
35B1F02A093248B700E7A53B /* PshButton.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = PshButton.h; path = Elements/PshButton.h; sourceTree = ""; };
35B1F02B093248B700E7A53B /* PshButton.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = PshButton.m; path = Elements/PshButton.m; sourceTree = ""; };
@@ -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 = "";
@@ -504,7 +505,7 @@
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */ = {
isa = PBXVariantGroup;
children = (
- 089C165DFE840E0CC02AAC07 /* English */,
+ 0E46289026558F7700230A06 /* en */,
);
name = InfoPlist.strings;
sourceTree = "";
@@ -512,9 +513,9 @@
29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = {
isa = PBXVariantGroup;
children = (
- 29B97319FDCFA39411CA2CEA /* English */,
- 3575F569093293F100B5AF9E /* German */,
- 3575F56A093293F600B5AF9E /* French */,
+ 0E46289326558F7C00230A06 /* de */,
+ 0E46289526558F7F00230A06 /* fr */,
+ 0E46289726558F8100230A06 /* Base */,
);
name = MainMenu.nib;
sourceTree = "";
@@ -522,9 +523,9 @@
3575F3570932873800B5AF9E /* dict.strings */ = {
isa = PBXVariantGroup;
children = (
- 3575F349093286CB00B5AF9E /* English */,
- 3575F35B0932874000B5AF9E /* German */,
- 3575F35C0932874300B5AF9E /* French */,
+ 0E46289226558F7700230A06 /* en */,
+ 0E46289426558F7C00230A06 /* de */,
+ 0E46289626558F7F00230A06 /* fr */,
);
name = dict.strings;
sourceTree = "";
@@ -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;
@@ -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;
};
@@ -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;
@@ -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;
};
@@ -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;
@@ -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;
@@ -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;
@@ -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;
@@ -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;
diff --git a/German.lproj/MainMenu.nib/designable.nib b/de.lproj/MainMenu.nib/designable.nib
similarity index 100%
rename from German.lproj/MainMenu.nib/designable.nib
rename to de.lproj/MainMenu.nib/designable.nib
diff --git a/German.lproj/MainMenu.nib/keyedobjects.nib b/de.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from German.lproj/MainMenu.nib/keyedobjects.nib
rename to de.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/German.lproj/dict.strings b/de.lproj/dict.strings
similarity index 100%
rename from German.lproj/dict.strings
rename to de.lproj/dict.strings
diff --git a/English.lproj/InfoPlist.strings b/en.lproj/InfoPlist.strings
similarity index 100%
rename from English.lproj/InfoPlist.strings
rename to en.lproj/InfoPlist.strings
diff --git a/English.lproj/dict.strings b/en.lproj/dict.strings
similarity index 100%
rename from English.lproj/dict.strings
rename to en.lproj/dict.strings
diff --git a/French.lproj/MainMenu.nib/designable.nib b/fr.lproj/MainMenu.nib/designable.nib
similarity index 100%
rename from French.lproj/MainMenu.nib/designable.nib
rename to fr.lproj/MainMenu.nib/designable.nib
diff --git a/French.lproj/MainMenu.nib/keyedobjects.nib b/fr.lproj/MainMenu.nib/keyedobjects.nib
similarity index 100%
rename from French.lproj/MainMenu.nib/keyedobjects.nib
rename to fr.lproj/MainMenu.nib/keyedobjects.nib
diff --git a/French.lproj/dict.strings b/fr.lproj/dict.strings
similarity index 100%
rename from French.lproj/dict.strings
rename to fr.lproj/dict.strings