From: Robert Sesek Date: Wed, 6 Aug 2008 20:35:29 +0000 (-0400) Subject: Switching from NIB to XIB file formats X-Git-Tag: 1.1~4 X-Git-Url: https://src.bluestatic.org/?a=commitdiff_plain;h=6a7b923569de56c8fb3656ee42dbaa602a3dbe89;p=printdrop.git Switching from NIB to XIB file formats --- diff --git a/English.lproj/MainMenu.nib/keyedobjects.nib b/English.lproj/MainMenu.nib/keyedobjects.nib deleted file mode 100644 index 77d2b43..0000000 Binary files a/English.lproj/MainMenu.nib/keyedobjects.nib and /dev/null differ diff --git a/English.lproj/MainMenu.nib/designable.nib b/English.lproj/MainMenu.xib similarity index 96% rename from English.lproj/MainMenu.nib/designable.nib rename to English.lproj/MainMenu.xib index c3066be..280dcc8 100644 --- a/English.lproj/MainMenu.nib/designable.nib +++ b/English.lproj/MainMenu.xib @@ -41,7 +41,7 @@ NSImage NSMenuCheckmark - + NSImage NSMenuMixedState @@ -56,7 +56,7 @@ 2147483647 - + @@ -67,7 +67,7 @@ 1048576 2147483647 - + @@ -76,15 +76,15 @@ 1048576 2147483647 - + - + Q2hlY2sgRm9yIFVwZGF0ZXPigKY 2147483647 - + @@ -95,7 +95,7 @@ 1048576 2147483647 - + @@ -104,7 +104,7 @@ 1048576 2147483647 - + submenuAction: Services @@ -123,7 +123,7 @@ 1048576 2147483647 - + @@ -132,7 +132,7 @@ 1048576 2147483647 - + @@ -141,7 +141,7 @@ 1572864 2147483647 - + @@ -150,7 +150,7 @@ 1048576 2147483647 - + @@ -161,7 +161,7 @@ 1048576 2147483647 - + @@ -170,7 +170,7 @@ 1048576 2147483647 - + _NSAppleMenu @@ -183,7 +183,7 @@ 1048576 2147483647 - + submenuAction: File @@ -196,7 +196,7 @@ 1048576 2147483647 - + @@ -205,7 +205,7 @@ 1048576 2147483647 - + @@ -214,7 +214,7 @@ 1048576 2147483647 - + submenuAction: Open Recent @@ -227,7 +227,7 @@ 1048576 2147483647 - + _NSRecentDocumentsMenu @@ -242,7 +242,7 @@ 1048576 2147483647 - + @@ -251,7 +251,7 @@ 1048576 2147483647 - + @@ -260,7 +260,7 @@ 1048576 2147483647 - + @@ -269,7 +269,7 @@ 1179648 2147483647 - + @@ -277,7 +277,7 @@ 2147483647 - + @@ -288,7 +288,7 @@ 1048576 2147483647 - + @@ -297,7 +297,7 @@ 1179648 2147483647 - + @@ -307,7 +307,7 @@ 1048576 2147483647 - + @@ -319,7 +319,7 @@ 1048576 2147483647 - + submenuAction: Edit @@ -332,7 +332,7 @@ 1048576 2147483647 - + @@ -341,7 +341,7 @@ 1179648 2147483647 - + @@ -352,7 +352,7 @@ 1048576 2147483647 - + @@ -361,7 +361,7 @@ 1048576 2147483647 - + @@ -370,7 +370,7 @@ 1048576 2147483647 - + @@ -379,7 +379,7 @@ 1048576 2147483647 - + @@ -388,7 +388,7 @@ 1048576 2147483647 - + @@ -397,7 +397,7 @@ 1048576 2147483647 - + @@ -408,7 +408,7 @@ 1048576 2147483647 - + @@ -417,7 +417,7 @@ 1048576 2147483647 - + submenuAction: Find @@ -430,7 +430,7 @@ 1048576 2147483647 - + 1 @@ -440,7 +440,7 @@ 1048576 2147483647 - + 2 @@ -450,7 +450,7 @@ 1179648 2147483647 - + 3 @@ -460,7 +460,7 @@ 1048576 2147483647 - + 7 @@ -470,7 +470,7 @@ 1048576 2147483647 - + @@ -482,7 +482,7 @@ 1048576 2147483647 - + submenuAction: Spelling and Grammar @@ -495,7 +495,7 @@ 1048576 2147483647 - + @@ -504,7 +504,7 @@ 1048576 2147483647 - + @@ -513,7 +513,7 @@ 1048576 2147483647 - + @@ -522,7 +522,7 @@ 1048576 2147483647 - + @@ -534,7 +534,7 @@ 1048576 2147483647 - + submenuAction: Substitutions @@ -547,7 +547,7 @@ 1048576 2147483647 - + 1 @@ -557,7 +557,7 @@ 1048576 2147483647 - + 2 @@ -567,7 +567,7 @@ 1179648 2147483647 - + 3 @@ -580,7 +580,7 @@ 1048576 2147483647 - + submenuAction: Speech @@ -593,7 +593,7 @@ 1048576 2147483647 - + @@ -602,7 +602,7 @@ 1048576 2147483647 - + @@ -617,7 +617,7 @@ 1048576 2147483647 - + submenuAction: Format @@ -630,7 +630,7 @@ 1048576 2147483647 - + @@ -639,7 +639,7 @@ 1179648 2147483647 - + @@ -651,7 +651,7 @@ 1048576 2147483647 - + submenuAction: View @@ -664,7 +664,7 @@ 1572864 2147483647 - + @@ -673,7 +673,7 @@ 1048576 2147483647 - + @@ -685,7 +685,7 @@ 1048576 2147483647 - + submenuAction: Window @@ -698,7 +698,7 @@ 1048576 2147483647 - + @@ -707,7 +707,7 @@ 1048576 2147483647 - + @@ -718,7 +718,7 @@ 1048576 2147483647 - + @@ -727,7 +727,7 @@ 1048576 2147483647 - + _NSWindowsMenu @@ -740,7 +740,7 @@ 1048576 2147483647 - + submenuAction: Help @@ -753,7 +753,7 @@ 1048576 2147483647 - + @@ -923,7 +923,7 @@ 2147483647 1 - + _popUpItemAction: @@ -940,7 +940,7 @@ 1048576 2147483647 - + _popUpItemAction: @@ -951,7 +951,7 @@ 1048576 2147483647 - + _popUpItemAction: @@ -1204,7 +1204,7 @@ YES YES - + SUUpdater @@ -1712,8 +1712,8 @@ checkForUpdates: - - + + 537 @@ -2090,7 +2090,7 @@ - + @@ -2618,12 +2618,12 @@ 535 - + 536 - + @@ -3223,7 +3223,7 @@ NSObject - + IBDocumentRelativeSource ../Sparkle.framework/Versions/A/Headers/SUUpdater.h @@ -3239,7 +3239,7 @@ delegate id - + diff --git a/PrintDrop.xcodeproj/project.pbxproj b/PrintDrop.xcodeproj/project.pbxproj index 622430b..8aaa93e 100644 --- a/PrintDrop.xcodeproj/project.pbxproj +++ b/PrintDrop.xcodeproj/project.pbxproj @@ -12,6 +12,7 @@ 1E1626560D7388110067F3B4 /* AppController.m in Sources */ = {isa = PBXBuildFile; fileRef = 1E1626550D7388110067F3B4 /* AppController.m */; }; 1EDFC4E80E4A3EC0000E08AE /* Sparkle.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EDFC4E70E4A3EC0000E08AE /* Sparkle.framework */; }; 1EDFC5130E4A3ED9000E08AE /* Sparkle.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 1EDFC4E70E4A3EC0000E08AE /* Sparkle.framework */; }; + 1EDFC52B0E4A4224000E08AE /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 1EDFC5290E4A4224000E08AE /* MainMenu.xib */; }; 1EE1E3E50D7482E7002999AD /* gradient.png in Resources */ = {isa = PBXBuildFile; fileRef = 1EE1E3E30D7482E7002999AD /* gradient.png */; }; 1EE1E4710D748AE4002999AD /* libgcrypt.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EE1E4580D748AE4002999AD /* libgcrypt.h */; }; 1EE1E4720D748AE4002999AD /* libssh2.h in Headers */ = {isa = PBXBuildFile; fileRef = 1EE1E4590D748AE4002999AD /* libssh2.h */; }; @@ -38,7 +39,6 @@ 1EE1E4880D748AE4002999AD /* userauth.c in Sources */ = {isa = PBXBuildFile; fileRef = 1EE1E4700D748AE4002999AD /* userauth.c */; }; 1EE1E48C0D748B19002999AD /* liblibssh2.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 1EE1E4500D748AC9002999AD /* liblibssh2.a */; }; 1EE653530D75F5AC00D7A7FA /* Printers.plist in Resources */ = {isa = PBXBuildFile; fileRef = 1EE653510D75F5AC00D7A7FA /* Printers.plist */; }; - 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */ = {isa = PBXBuildFile; fileRef = 29B97318FDCFA39411CA2CEA /* MainMenu.nib */; }; 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; }; 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; @@ -78,6 +78,7 @@ 1E1626540D7388110067F3B4 /* AppController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppController.h; path = Source/AppController.h; sourceTree = ""; }; 1E1626550D7388110067F3B4 /* AppController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppController.m; path = Source/AppController.m; sourceTree = ""; }; 1EDFC4E70E4A3EC0000E08AE /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; path = Sparkle.framework; sourceTree = ""; }; + 1EDFC52A0E4A4224000E08AE /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/MainMenu.xib; sourceTree = ""; }; 1EE1E3E40D7482E7002999AD /* English */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = English; path = English.lproj/gradient.png; sourceTree = ""; }; 1EE1E4500D748AC9002999AD /* liblibssh2.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = liblibssh2.a; sourceTree = BUILT_PRODUCTS_DIR; }; 1EE1E4580D748AE4002999AD /* libgcrypt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = libgcrypt.h; sourceTree = ""; }; @@ -105,7 +106,6 @@ 1EE1E4700D748AE4002999AD /* userauth.c */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.c; path = userauth.c; sourceTree = ""; }; 1EE653520D75F5AC00D7A7FA /* English */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = English; path = English.lproj/Printers.plist; 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 /* PrintDrop_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = PrintDrop_Prefix.pch; sourceTree = ""; }; @@ -251,7 +251,7 @@ 1EE1E3E30D7482E7002999AD /* gradient.png */, 8D1107310486CEB800E47090 /* Info.plist */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, - 29B97318FDCFA39411CA2CEA /* MainMenu.nib */, + 1EDFC5290E4A4224000E08AE /* MainMenu.xib */, ); name = Resources; sourceTree = ""; @@ -346,10 +346,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 8D11072A0486CEB800E47090 /* MainMenu.nib in Resources */, 8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */, 1EE1E3E50D7482E7002999AD /* gradient.png in Resources */, 1EE653530D75F5AC00D7A7FA /* Printers.plist in Resources */, + 1EDFC52B0E4A4224000E08AE /* MainMenu.xib in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -425,6 +425,14 @@ name = InfoPlist.strings; sourceTree = ""; }; + 1EDFC5290E4A4224000E08AE /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 1EDFC52A0E4A4224000E08AE /* English */, + ); + name = MainMenu.xib; + sourceTree = ""; + }; 1EE1E3E30D7482E7002999AD /* gradient.png */ = { isa = PBXVariantGroup; children = ( @@ -441,14 +449,6 @@ name = Printers.plist; sourceTree = ""; }; - 29B97318FDCFA39411CA2CEA /* MainMenu.nib */ = { - isa = PBXVariantGroup; - children = ( - 29B97319FDCFA39411CA2CEA /* English */, - ); - name = MainMenu.nib; - sourceTree = ""; - }; /* End PBXVariantGroup section */ /* Begin XCBuildConfiguration section */