From e9e045d6cd1fad679a11d68919d7ca6bae3acff6 Mon Sep 17 00:00:00 2001 From: "christian.brunschen" Date: Thu, 7 Aug 2008 15:03:21 +0000 Subject: [PATCH] message field & hint button rotation issue fixes. Added Joe Wain's 'Photo Roll' icon. git-svn-id: https://zxing.googlecode.com/svn/trunk@553 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- iphone/Classes/DecoderViewController.m | 5 +++++ iphone/ZXing.xcodeproj/project.pbxproj | 12 ++++++++---- iphone/de.lproj/DecoderView.xib | 13 ++++++++++--- iphone/de.lproj/Localizable.strings | 2 +- iphone/en.lproj/DecoderView.xib | 13 ++++++++++--- iphone/en.lproj/Localizable.strings | 2 +- iphone/filmroll-2.png | Bin 0 -> 326 bytes iphone/sv.lproj/DecoderView.xib | 13 ++++++++++--- iphone/sv.lproj/Localizable.strings | 2 +- 9 files changed, 46 insertions(+), 16 deletions(-) create mode 100644 iphone/filmroll-2.png diff --git a/iphone/Classes/DecoderViewController.m b/iphone/Classes/DecoderViewController.m index 0044c0594..24031bf6f 100644 --- a/iphone/Classes/DecoderViewController.m +++ b/iphone/Classes/DecoderViewController.m @@ -246,9 +246,11 @@ messageFrame.origin.y = CGRectGetMaxY(messageFrame) - height; messageFrame.size.height = height; [self.messageView setFrame:messageFrame]; + messageView.autoresizingMask = UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleWidth; CGRect messageViewBounds = [messageView bounds]; self.messageTextView.text = message; + messageTextView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight; if (showHelpButton) { CGRect textViewFrame; CGRect helpButtonFrame; @@ -259,6 +261,9 @@ [messageHelpButton setFrame:helpButtonFrame]; messageHelpButton.alpha = 1.0; messageHelpButton.enabled = YES; + messageHelpButton.autoresizingMask = + UIViewAutoresizingFlexibleLeftMargin | + UIViewAutoresizingFlexibleTopMargin; [messageView addSubview:messageHelpButton]; } else { [messageHelpButton removeFromSuperview]; diff --git a/iphone/ZXing.xcodeproj/project.pbxproj b/iphone/ZXing.xcodeproj/project.pbxproj index 4894185f5..a1e5c0c7f 100755 --- a/iphone/ZXing.xcodeproj/project.pbxproj +++ b/iphone/ZXing.xcodeproj/project.pbxproj @@ -202,6 +202,7 @@ 85C3CC3A0E119E1700A01C6A /* phone.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C3CC320E119E1700A01C6A /* phone.png */; }; 85C3CC3B0E119E1700A01C6A /* sms.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C3CC330E119E1700A01C6A /* sms.png */; }; 85C3CC3C0E119E1700A01C6A /* text.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C3CC340E119E1700A01C6A /* text.png */; }; + 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 */; }; /* End PBXBuildFile section */ @@ -246,7 +247,7 @@ /* Begin PBXFileReference section */ 1D30AB110D05D00D00671497 /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; }; - 1D6058910D05DD3D006BFB54 /* Scanner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Scanner.app; sourceTree = BUILT_PRODUCTS_DIR; }; + 1D6058910D05DD3D006BFB54 /* Barcodes.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Barcodes.app; sourceTree = BUILT_PRODUCTS_DIR; }; 1DF5F4DF0D08C38300B7A737 /* UIKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = UIKit.framework; path = System/Library/Frameworks/UIKit.framework; sourceTree = SDKROOT; }; 29B97316FDCFA39411CA2CEA /* main.m */ = {isa = PBXFileReference; explicitFileType = sourcecode.cpp.objcpp; fileEncoding = 4; path = main.m; sourceTree = ""; }; 32CA4F630368D1EE00C91783 /* ZXing_Prefix.pch */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ZXing_Prefix.pch; sourceTree = ""; }; @@ -632,6 +633,7 @@ 85C3CC320E119E1700A01C6A /* phone.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = phone.png; sourceTree = ""; }; 85C3CC330E119E1700A01C6A /* sms.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = sms.png; sourceTree = ""; }; 85C3CC340E119E1700A01C6A /* text.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = text.png; sourceTree = ""; }; + 85C4969B0E4A3E87003DB029 /* filmroll-2.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "filmroll-2.png"; sourceTree = ""; }; 85D937250E11064700B785E0 /* ScanViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ScanViewController.h; sourceTree = ""; }; 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 = ""; }; @@ -723,7 +725,7 @@ 19C28FACFE9D520D11CA2CBB /* Products */ = { isa = PBXGroup; children = ( - 1D6058910D05DD3D006BFB54 /* Scanner.app */, + 1D6058910D05DD3D006BFB54 /* Barcodes.app */, 8514EB190DF8A52700EE78D3 /* libzxingcore.a */, 856EAB150E1CE6E000B2E1C7 /* libCppUnit.a */, ); @@ -1358,6 +1360,7 @@ 85C3CC0F0E119E0500A01C6A /* Images */ = { isa = PBXGroup; children = ( + 85C4969B0E4A3E87003DB029 /* filmroll-2.png */, 85C3CC2D0E119E1600A01C6A /* business-card.png */, 85C3CC2E0E119E1700A01C6A /* email.png */, 85C3CC2F0E119E1700A01C6A /* link1.png */, @@ -1406,7 +1409,7 @@ ); name = Scanner; productName = ZXing; - productReference = 1D6058910D05DD3D006BFB54 /* Scanner.app */; + productReference = 1D6058910D05DD3D006BFB54 /* Barcodes.app */; productType = "com.apple.product-type.application"; }; 8514EAE70DF88E5200EE78D3 /* zxingcore */ = { @@ -1514,6 +1517,7 @@ 85B1D8850E190E3A00514A6A /* Default.png in Resources */, 85764F6A0E3E22FC00A61BF5 /* Hints.html in Resources */, 85C37A410E4076BB0052209B /* Hints.xib in Resources */, + 85C4969C0E4A3E87003DB029 /* filmroll-2.png in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1805,7 +1809,7 @@ GCC_PREFIX_HEADER = ZXing_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; INFOPLIST_FILE = Info.plist; - PRODUCT_NAME = Scanner; + PRODUCT_NAME = Barcodes; }; name = Debug; }; diff --git a/iphone/de.lproj/DecoderView.xib b/iphone/de.lproj/DecoderView.xib index 9d8faa5f3..aadc8d1ca 100644 --- a/iphone/de.lproj/DecoderView.xib +++ b/iphone/de.lproj/DecoderView.xib @@ -2,13 +2,13 @@ 512 - 9D34 + 9E17 670 949.33 352.00 YES - + YES @@ -47,7 +47,10 @@ 1 - 12 + + NSImage + filmroll-2.png + @@ -402,6 +405,8 @@ cameraBarItem imageView libraryBarItem + messageHelpButton + messageTextView messageView savedPhotosBarItem toolbar @@ -413,7 +418,9 @@ UIBarItem ScannedImageView UIBarItem + UIButton UITextView + UIView UIBarItem UIToolbar diff --git a/iphone/de.lproj/Localizable.strings b/iphone/de.lproj/Localizable.strings index 562d0b277..cd3a64b0b 100644 --- a/iphone/de.lproj/Localizable.strings +++ b/iphone/de.lproj/Localizable.strings @@ -35,7 +35,7 @@ "Decoder MessageWhileDecoding" = "Dekodiert ..."; /* ZXing */ -"DecoderViewController AppTitle" = "Scanner"; +"DecoderViewController AppTitle" = "Barcodes"; /* Cancel */ "DecoderViewController cancel button title" = "Abbrechen"; diff --git a/iphone/en.lproj/DecoderView.xib b/iphone/en.lproj/DecoderView.xib index 517a37e90..0e897081e 100644 --- a/iphone/en.lproj/DecoderView.xib +++ b/iphone/en.lproj/DecoderView.xib @@ -2,13 +2,13 @@ 512 - 9D34 + 9E17 670 949.33 352.00 YES - + YES @@ -47,7 +47,10 @@ 1 - 12 + + NSImage + filmroll-2.png + @@ -402,6 +405,8 @@ cameraBarItem imageView libraryBarItem + messageHelpButton + messageTextView messageView savedPhotosBarItem toolbar @@ -413,7 +418,9 @@ UIBarItem ScannedImageView UIBarItem + UIButton UITextView + UIView UIBarItem UIToolbar diff --git a/iphone/en.lproj/Localizable.strings b/iphone/en.lproj/Localizable.strings index b48957ffd..fb833b2a3 100644 --- a/iphone/en.lproj/Localizable.strings +++ b/iphone/en.lproj/Localizable.strings @@ -35,7 +35,7 @@ "Decoder MessageWhileDecoding" = "Decoding ..."; /* ZXing */ -"DecoderViewController AppTitle" = "Scanner"; +"DecoderViewController AppTitle" = "Barcodes"; /* Cancel */ "DecoderViewController cancel button title" = "Cancel"; diff --git a/iphone/filmroll-2.png b/iphone/filmroll-2.png new file mode 100644 index 0000000000000000000000000000000000000000..e44f47a986cb07c8b80de6ccca837c26b538b5f5 GIT binary patch literal 326 zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`Gjk|nMYCBgY=CFO}lsSJ)O`AMk? zp1FzXsX?iUDV2pMQ*D5XUU<4VhE&{2`t$$4J+m&OFmo>>chASq{5RA&9dh`Oa5=nb zaQ(}!u#e#=_d=7f1LqELBsMg0wABCkS1#Z2e{o{C!n3ARyOSoqXHR0wkx0|yUh2qD zuE}?RqdTRjxkH58flW@~;72Bh9EL3q7y{ncE1dN>!6fjQ@yeujk7<$)FS!kz8zbaj zIZxo1Sy(0A_=e3%YyuabLSzGvRKug*Eoazyx17ijUeKA$w6^FIOTq@5B}-XZ5A2x0 ze(_633R}dcrIm^1QYR0aPm(ssGRbgU?y$&Fd_t`E 512 - 9D34 + 9E17 670 949.33 352.00 YES - + YES @@ -47,7 +47,10 @@ 1 - 12 + + NSImage + filmroll-2.png + @@ -402,6 +405,8 @@ cameraBarItem imageView libraryBarItem + messageHelpButton + messageTextView messageView savedPhotosBarItem toolbar @@ -413,7 +418,9 @@ UIBarItem ScannedImageView UIBarItem + UIButton UITextView + UIView UIBarItem UIToolbar diff --git a/iphone/sv.lproj/Localizable.strings b/iphone/sv.lproj/Localizable.strings index 69ac44b60..49bb1bc69 100644 --- a/iphone/sv.lproj/Localizable.strings +++ b/iphone/sv.lproj/Localizable.strings @@ -35,7 +35,7 @@ "Decoder MessageWhileDecoding" = "Avkodar ..."; /* ZXing */ -"DecoderViewController AppTitle" = "Scanner"; +"DecoderViewController AppTitle" = "Barcodes"; /* Cancel */ "DecoderViewController cancel button title" = "Avbryt";