From: christian.brunschen Date: Wed, 1 Oct 2008 20:19:55 +0000 (+0000) Subject: Resurrected 128-pixel icon for About page X-Git-Url: http://git.rot13.org/?p=zxing.git;a=commitdiff_plain;h=acd2742d51bf4ab013a016f935b02a108a2c485e;hp=b0312339295108c937c4c4f6cb247370eb09db27 Resurrected 128-pixel icon for About page Removed UI autorotation support, since UIImagePickerController doe not gracefully handle being showin in non-portrait orientation and there is not at the moment a supported way to force the UI into a specified orientation. git-svn-id: http://zxing.googlecode.com/svn/trunk@595 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- diff --git a/iphone/Classes/DecoderViewController.m b/iphone/Classes/DecoderViewController.m index 93324842..0e92b750 100644 --- a/iphone/Classes/DecoderViewController.m +++ b/iphone/Classes/DecoderViewController.m @@ -226,14 +226,14 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { - // Return YES for supported orientations - return (interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown); + // Return YES for supported orientations + return (interfaceOrientation == UIInterfaceOrientationPortrait); } - (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; // Releases the view if it doesn't have a superview - // Release anything that's not essential, such as cached data + [super didReceiveMemoryWarning]; // Releases the view if it doesn't have a superview + // Release anything that's not essential, such as cached data } - (void)dealloc { diff --git a/iphone/Classes/MessageViewController.m b/iphone/Classes/MessageViewController.m index ab6b2bc5..3449fecb 100644 --- a/iphone/Classes/MessageViewController.m +++ b/iphone/Classes/MessageViewController.m @@ -60,7 +60,7 @@ - (BOOL)shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { // Return YES for supported orientations - return (interfaceOrientation != UIInterfaceOrientationPortraitUpsideDown); + return (interfaceOrientation == UIInterfaceOrientationPortrait); } - (void)didReceiveMemoryWarning { diff --git a/iphone/ZXing.xcodeproj/project.pbxproj b/iphone/ZXing.xcodeproj/project.pbxproj index 1e26322c..d25b8e5c 100755 --- a/iphone/ZXing.xcodeproj/project.pbxproj +++ b/iphone/ZXing.xcodeproj/project.pbxproj @@ -208,6 +208,7 @@ 85C4969C0E4A3E87003DB029 /* filmroll-2.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C4969B0E4A3E87003DB029 /* filmroll-2.png */; }; 85D937270E11064700B785E0 /* ScanViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 85D937260E11064700B785E0 /* ScanViewController.m */; }; 85E883980E1A34D2004C4547 /* ScannedImageView.m in Sources */ = {isa = PBXBuildFile; fileRef = 85E883970E1A34D2004C4547 /* ScannedImageView.m */; }; + 85E945270E9410EF0052CC40 /* zxing-icon-128.png in Resources */ = {isa = PBXBuildFile; fileRef = 85E945260E9410EF0052CC40 /* zxing-icon-128.png */; }; 85F895030E543EE100C0A666 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 85F895020E543EE100C0A666 /* InfoPlist.strings */; }; /* End PBXBuildFile section */ @@ -649,6 +650,7 @@ 85D937260E11064700B785E0 /* ScanViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScanViewController.m; sourceTree = ""; }; 85E883960E1A34D2004C4547 /* ScannedImageView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScannedImageView.h; sourceTree = ""; }; 85E883970E1A34D2004C4547 /* ScannedImageView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ScannedImageView.m; sourceTree = ""; }; + 85E945260E9410EF0052CC40 /* zxing-icon-128.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "zxing-icon-128.png"; sourceTree = ""; }; 85F7D20E0E41D4A700FDC34E /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/Message.xib; sourceTree = ""; }; 85F7D20F0E41D4A700FDC34E /* de */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = de; path = de.lproj/Hints.html; sourceTree = ""; }; 85F7D2100E41D4B300FDC34E /* sv */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sv; path = sv.lproj/Message.xib; sourceTree = ""; }; @@ -772,6 +774,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 85E945260E9410EF0052CC40 /* zxing-icon-128.png */, 85C37A3F0E4076BB0052209B /* Message.xib */, 85764F680E3E22FC00A61BF5 /* Hints.html */, 85B1D8840E190E3A00514A6A /* Default.png */, @@ -1538,6 +1541,7 @@ 8555304E0E643BA800C7B5DE /* Entitlements.plist in Resources */, 8555307B0E64504300C7B5DE /* icon.png in Resources */, 85B8F52C0E6AD33200510402 /* photolib.png in Resources */, + 85E945270E9410EF0052CC40 /* zxing-icon-128.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/iphone/zxing-icon-128.png b/iphone/zxing-icon-128.png new file mode 100644 index 00000000..688a5a3e Binary files /dev/null and b/iphone/zxing-icon-128.png differ