From a63fb3b9a615add8114160b48584122929873868 Mon Sep 17 00:00:00 2001 From: "christian.brunschen" Date: Thu, 14 Aug 2008 11:00:48 +0000 Subject: [PATCH] Added 'About' screen, localized application name git-svn-id: https://zxing.googlecode.com/svn/trunk@561 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- build.properties | 2 +- .../qrcode/detector/FinderPatternFinder.cpp | 4 +- iphone/Classes/DecoderViewController.m | 49 +++++-- ...ewController.h => MessageViewController.h} | 6 +- ...ewController.m => MessageViewController.m} | 36 ++++- iphone/ZXing.xcodeproj/project.pbxproj | 82 +++++++---- iphone/de.lproj/About.html | 16 +++ iphone/de.lproj/Hints.html | Bin 2102 -> 1063 bytes iphone/de.lproj/InfoPlist.strings | 1 + iphone/de.lproj/Localizable.strings | 14 +- iphone/de.lproj/Message.xib | 132 ++++++++++++++++++ iphone/en.lproj/About.html | 16 +++ iphone/en.lproj/InfoPlist.strings | 1 + iphone/en.lproj/Localizable.strings | 8 +- iphone/en.lproj/Message.xib | 132 ++++++++++++++++++ iphone/sv.lproj/About.html | 16 +++ iphone/sv.lproj/Hints.html | Bin 2016 -> 1025 bytes iphone/sv.lproj/InfoPlist.strings | 1 + iphone/sv.lproj/Localizable.strings | 10 +- iphone/sv.lproj/Message.xib | 132 ++++++++++++++++++ 20 files changed, 601 insertions(+), 57 deletions(-) rename iphone/Classes/{HintsViewController.h => MessageViewController.h} (85%) rename iphone/Classes/{HintsViewController.m => MessageViewController.m} (66%) create mode 100644 iphone/de.lproj/About.html create mode 100644 iphone/de.lproj/InfoPlist.strings create mode 100644 iphone/de.lproj/Message.xib create mode 100644 iphone/en.lproj/About.html create mode 100644 iphone/en.lproj/InfoPlist.strings create mode 100644 iphone/en.lproj/Message.xib create mode 100644 iphone/sv.lproj/About.html create mode 100644 iphone/sv.lproj/InfoPlist.strings create mode 100644 iphone/sv.lproj/Message.xib diff --git a/build.properties b/build.properties index 96f2a32a1..3ace75817 100644 --- a/build.properties +++ b/build.properties @@ -8,7 +8,7 @@ version=1.0 # Uncomment or set appropriately: #WTK-home=C:\\WTK2.5.2 -#WTK-home=/usr/local/WTK2.5.2 +WTK-home=/usr/local/WTK2.5.2 # Set this to the location where you have installed RIM's BlackBerry JDE in order to # create the 'rim' client. There is no Mac or Linux version, but, these platforms can still diff --git a/cpp/core/src/qrcode/detector/FinderPatternFinder.cpp b/cpp/core/src/qrcode/detector/FinderPatternFinder.cpp index e709b5e2a..cd4a9e677 100644 --- a/cpp/core/src/qrcode/detector/FinderPatternFinder.cpp +++ b/cpp/core/src/qrcode/detector/FinderPatternFinder.cpp @@ -269,8 +269,8 @@ namespace qrcode { // difference in the x / y coordinates of the two centers. // This is the case where you find top left first. Draw it out. hasSkipped_ = true; - return (int) abs(abs(firstConfirmedCenter->getX() - center->getX()) - - abs(firstConfirmedCenter->getY() - center->getY())); + return (int) (abs(firstConfirmedCenter->getX() - center->getX()) - + abs(firstConfirmedCenter->getY() - center->getY())); } } } diff --git a/iphone/Classes/DecoderViewController.m b/iphone/Classes/DecoderViewController.m index 24031bf6f..93324842d 100644 --- a/iphone/Classes/DecoderViewController.m +++ b/iphone/Classes/DecoderViewController.m @@ -28,7 +28,7 @@ #import "Database.h" #import "ArchiveController.h" -#import "HintsViewController.h" +#import "MessageViewController.h" #import "Scan.h" #import "TwoDDecoderResult.h" @@ -55,7 +55,7 @@ - (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil { if (self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]) { // Initialization code - self.title = NSLocalizedString(@"DecoderViewController AppTitle", @"Barcode Scanner "); + self.title = NSLocalizedString(@"DecoderViewController AppTitle", @"Barcode Scanner"); Decoder *d = [[Decoder alloc] init]; self.decoder = d; @@ -66,26 +66,42 @@ return self; } -- (void) hintsReady:(id)sender { - HintsViewController *hintsController = sender; - [[self navigationController] pushViewController:hintsController animated:true]; - [hintsController release]; +- (void) messageReady:(id)sender { + MessageViewController *messageController = sender; + [[self navigationController] pushViewController:messageController animated:true]; + [messageController release]; } -- (void) hintsFailed:(id)sender { - HintsViewController *hintsController = sender; - NSLog(@"Failed to load hints!"); - [hintsController release]; +- (void) messageFailed:(id)sender { + MessageViewController *messageController = sender; + NSLog(@"Failed to load message!"); + [messageController release]; } - (void) showHints:(id)sender { NSLog(@"Showing Hints!"); - HintsViewController *hintsController = [[HintsViewController alloc] initWithTarget:self onSuccess:@selector(hintsReady:) onFailure:@selector(hintsFailed:)]; - hintsController.title = NSLocalizedString(@"DecoderViewController HintsViewController title", @"Hints"); + MessageViewController *hintsController = + [[MessageViewController alloc] initWithMessageFilename:@"Hints" + target:self + onSuccess:@selector(messageReady:) + onFailure:@selector(messageFailed:)]; + hintsController.title = NSLocalizedString(@"DecoderViewController Hints MessageViewController title", @"Hints"); hintsController.view; } +- (void) showAbout:(id)sender { + NSLog(@"Showing About!"); + + MessageViewController *aboutController = + [[MessageViewController alloc] initWithMessageFilename:@"About" + target:self + onSuccess:@selector(messageReady:) + onFailure:@selector(messageFailed:)]; + aboutController.title = NSLocalizedString(@"DecoderViewController About MessageViewController title", @"About"); + aboutController.view; +} + #define HELP_BUTTON_WIDTH (44.0) #define HELP_BUTTON_HEIGHT (55.0) @@ -143,6 +159,15 @@ [self.view addSubview:self.messageView]; + // add the 'About' button at the top-right of the navigation bar + UIBarButtonItem *aboutButton = + [[UIBarButtonItem alloc] initWithTitle:NSLocalizedString(@"DecoderViewController about button title", @"About") + style:UIBarButtonItemStyleBordered + target:self + action:@selector(showAbout:)]; + self.navigationItem.rightBarButtonItem = aboutButton; + [aboutButton release]; + [self reset]; } diff --git a/iphone/Classes/HintsViewController.h b/iphone/Classes/MessageViewController.h similarity index 85% rename from iphone/Classes/HintsViewController.h rename to iphone/Classes/MessageViewController.h index 69b814cfa..b74d1dcc7 100644 --- a/iphone/Classes/HintsViewController.h +++ b/iphone/Classes/MessageViewController.h @@ -1,5 +1,5 @@ // -// HintsViewController.h +// MessageViewController.h // ZXing // // Created by Christian Brunschen on 30/07/2008. @@ -21,7 +21,7 @@ #import -@interface HintsViewController : UIViewController { +@interface MessageViewController : UIViewController { id callbackTarget; SEL callbackSelectorSuccess; SEL callbackSelectorFailure; @@ -40,6 +40,6 @@ @property (nonatomic, retain) NSURL *contentURL; @property (nonatomic, copy) NSString *content; -- (id)initWithTarget:(id)cbt onSuccess:(SEL)ss onFailure:(SEL)fs; +- (id)initWithMessageFilename:(NSString *)filename target:(id)cbt onSuccess:(SEL)ss onFailure:(SEL)fs; @end diff --git a/iphone/Classes/HintsViewController.m b/iphone/Classes/MessageViewController.m similarity index 66% rename from iphone/Classes/HintsViewController.m rename to iphone/Classes/MessageViewController.m index 7a5fdf463..9380ce59a 100644 --- a/iphone/Classes/HintsViewController.m +++ b/iphone/Classes/MessageViewController.m @@ -1,5 +1,5 @@ // -// HintsViewController.m +// MessageViewController.m // ZXing // // Created by Christian Brunschen on 30/07/2008. @@ -19,10 +19,10 @@ * limitations under the License. */ -#import "HintsViewController.h" +#import "MessageViewController.h" -@implementation HintsViewController +@implementation MessageViewController @synthesize callbackTarget; @synthesize callbackSelectorSuccess; @@ -35,14 +35,18 @@ return (UIWebView *)self.view; } -- (id)initWithTarget:(id)cbt onSuccess:(SEL)ss onFailure:(SEL)fs { - if (self = [super initWithNibName:@"Hints" bundle:nil]) { +- (id)initWithMessageFilename:(NSString *)filename + target:(id)cbt onSuccess:(SEL)ss onFailure:(SEL)fs { + if (self = [super initWithNibName:@"Message" bundle:nil]) { self.callbackTarget = cbt; self.callbackSelectorSuccess = ss; self.callbackSelectorFailure = fs; - self.contentPath = [[NSBundle mainBundle] pathForResource:@"Hints" ofType:@"html"]; + self.contentPath = [[NSBundle mainBundle] pathForResource:filename + ofType:@"html"]; self.contentURL = [NSURL fileURLWithPath:self.contentPath]; - self.content = [NSString stringWithContentsOfFile:self.contentPath]; + self.content = [NSString stringWithContentsOfFile:self.contentPath + encoding:NSUTF8StringEncoding + error:NULL]; } return self; } @@ -73,9 +77,27 @@ [super dealloc]; } +// open a URL, asynchronously +- (void) openURL:(NSURL *)url { + [url autorelease]; + [[UIApplication sharedApplication] openURL:url]; +} + // UIWebViewDelegate methods +- (BOOL)webView:(UIWebView *)webView shouldStartLoadWithRequest:(NSURLRequest *)request navigationType:(UIWebViewNavigationType)navigationType { + if ([[request URL] isFileURL]) { + // only load 'file' URL requests ourselves + return true; + } else { + // any other url:s are handed off to the system + NSURL *url = [[request URL] retain]; + [self performSelectorOnMainThread:@selector(openURL:) withObject:url waitUntilDone:false]; + return false; + } +} + - (void)webView:(UIWebView *)webView didFailLoadWithError:(NSError *)error { NSLog(@"failed to load content, performing failure callback"); [self.callbackTarget performSelector:self.callbackSelectorFailure withObject:self afterDelay:0.0]; diff --git a/iphone/ZXing.xcodeproj/project.pbxproj b/iphone/ZXing.xcodeproj/project.pbxproj index a1e5c0c7f..56508a063 100755 --- a/iphone/ZXing.xcodeproj/project.pbxproj +++ b/iphone/ZXing.xcodeproj/project.pbxproj @@ -86,6 +86,8 @@ 852A998F0E0BC433003E6D6D /* DecoderView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 852A998E0E0BC433003E6D6D /* DecoderView.xib */; }; 852A99910E0BC43C003E6D6D /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 852A99900E0BC43C003E6D6D /* MainWindow.xib */; }; 852A99970E0BC49E003E6D6D /* Localizable.strings in Resources */ = {isa = PBXBuildFile; fileRef = 852A99960E0BC49E003E6D6D /* Localizable.strings */; }; + 853678530E538F9E0054126A /* MessageViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 853678520E538F9E0054126A /* MessageViewController.m */; }; + 853678830E5394D70054126A /* About.html in Resources */ = {isa = PBXBuildFile; fileRef = 853678820E5394D70054126A /* About.html */; }; 854BE3010E06A56C00CB4A20 /* AddressBookUI.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 854BE3000E06A56C00CB4A20 /* AddressBookUI.framework */; }; 855A66800DF5E757007B394F /* ArchiveController.m in Sources */ = {isa = PBXBuildFile; fileRef = 855A66510DF5E757007B394F /* ArchiveController.m */; }; 855A66810DF5E757007B394F /* Database.m in Sources */ = {isa = PBXBuildFile; fileRef = 855A66540DF5E757007B394F /* Database.m */; }; @@ -192,8 +194,7 @@ 85C0BC100E12548D005EED58 /* SMSTOResultParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 85C0BC0F0E12548D005EED58 /* SMSTOResultParser.m */; }; 85C0BC140E1254C0005EED58 /* SMSParsedResult.m in Sources */ = {isa = PBXBuildFile; fileRef = 85C0BC130E1254C0005EED58 /* SMSParsedResult.m */; }; 85C0BC1C0E125842005EED58 /* SMSResultParser.m in Sources */ = {isa = PBXBuildFile; fileRef = 85C0BC1B0E125842005EED58 /* SMSResultParser.m */; }; - 85C37A3B0E406BD70052209B /* HintsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 85C37A3A0E406BD70052209B /* HintsViewController.m */; }; - 85C37A410E4076BB0052209B /* Hints.xib in Resources */ = {isa = PBXBuildFile; fileRef = 85C37A3F0E4076BB0052209B /* Hints.xib */; }; + 85C37A410E4076BB0052209B /* Message.xib in Resources */ = {isa = PBXBuildFile; fileRef = 85C37A3F0E4076BB0052209B /* Message.xib */; }; 85C3CC350E119E1700A01C6A /* business-card.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C3CC2D0E119E1600A01C6A /* business-card.png */; }; 85C3CC360E119E1700A01C6A /* email.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C3CC2E0E119E1700A01C6A /* email.png */; }; 85C3CC370E119E1700A01C6A /* link1.png in Resources */ = {isa = PBXBuildFile; fileRef = 85C3CC2F0E119E1700A01C6A /* link1.png */; }; @@ -205,6 +206,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 */; }; + 85F895030E543EE100C0A666 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 85F895020E543EE100C0A666 /* InfoPlist.strings */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -296,6 +298,13 @@ 852A99D00E0BC8E8003E6D6D /* sv */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sv; path = sv.lproj/DecoderView.xib; sourceTree = ""; }; 852A99D10E0BC8E8003E6D6D /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/Localizable.strings; sourceTree = ""; }; 852A99D20E0BC8E8003E6D6D /* sv */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sv; path = sv.lproj/MainWindow.xib; sourceTree = ""; }; + 853678510E538F9E0054126A /* MessageViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MessageViewController.h; sourceTree = ""; }; + 853678520E538F9E0054126A /* MessageViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MessageViewController.m; sourceTree = ""; }; + 853678840E5394E40054126A /* en */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = en; path = en.lproj/About.html; sourceTree = ""; }; + 853678850E5394E70054126A /* de */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = de; path = de.lproj/About.html; sourceTree = ""; }; + 853678860E5394EA0054126A /* sv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = sv; path = sv.lproj/About.html; sourceTree = ""; }; + 8539502B0E5442AA00D081D6 /* de */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = de; path = de.lproj/InfoPlist.strings; sourceTree = ""; }; + 8539502C0E5442B500D081D6 /* sv */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = sv; path = sv.lproj/InfoPlist.strings; sourceTree = ""; }; 854BE3000E06A56C00CB4A20 /* AddressBookUI.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = AddressBookUI.framework; path = System/Library/Frameworks/AddressBookUI.framework; sourceTree = SDKROOT; }; 855A65D70DF5E739007B394F /* BarcodeFormat.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = BarcodeFormat.cpp; sourceTree = ""; }; 855A65D80DF5E739007B394F /* BarcodeFormat.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = BarcodeFormat.h; sourceTree = ""; }; @@ -622,9 +631,7 @@ 85C0BC130E1254C0005EED58 /* SMSParsedResult.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SMSParsedResult.m; sourceTree = ""; }; 85C0BC1A0E125842005EED58 /* SMSResultParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SMSResultParser.h; sourceTree = ""; }; 85C0BC1B0E125842005EED58 /* SMSResultParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SMSResultParser.m; sourceTree = ""; }; - 85C37A390E406BD70052209B /* HintsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HintsViewController.h; sourceTree = ""; }; - 85C37A3A0E406BD70052209B /* HintsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HintsViewController.m; sourceTree = ""; }; - 85C37A400E4076BB0052209B /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Hints.xib; sourceTree = ""; }; + 85C37A400E4076BB0052209B /* en */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = en; path = en.lproj/Message.xib; sourceTree = ""; }; 85C3CC2D0E119E1600A01C6A /* business-card.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "business-card.png"; sourceTree = ""; }; 85C3CC2E0E119E1700A01C6A /* email.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = email.png; sourceTree = ""; }; 85C3CC2F0E119E1700A01C6A /* link1.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = link1.png; sourceTree = ""; }; @@ -638,10 +645,11 @@ 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 = ""; }; - 85F7D20E0E41D4A700FDC34E /* de */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = de; path = de.lproj/Hints.xib; sourceTree = ""; }; - 85F7D20F0E41D4A700FDC34E /* de */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.html; name = de; path = de.lproj/Hints.html; sourceTree = ""; }; - 85F7D2100E41D4B300FDC34E /* sv */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = sv; path = sv.lproj/Hints.xib; sourceTree = ""; }; - 85F7D2110E41D4B300FDC34E /* sv */ = {isa = PBXFileReference; fileEncoding = 10; lastKnownFileType = text.html; name = sv; path = sv.lproj/Hints.html; 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 = ""; }; + 85F7D2110E41D4B300FDC34E /* sv */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; name = sv; path = sv.lproj/Hints.html; sourceTree = ""; }; + 85F895040E543F0400C0A666 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = ""; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; /* End PBXFileReference section */ @@ -716,8 +724,8 @@ 855A667F0DF5E757007B394F /* Scan.m */, 85E883960E1A34D2004C4547 /* ScannedImageView.h */, 85E883970E1A34D2004C4547 /* ScannedImageView.m */, - 85C37A390E406BD70052209B /* HintsViewController.h */, - 85C37A3A0E406BD70052209B /* HintsViewController.m */, + 853678510E538F9E0054126A /* MessageViewController.h */, + 853678520E538F9E0054126A /* MessageViewController.m */, ); path = Classes; sourceTree = ""; @@ -759,7 +767,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( - 85C37A3F0E4076BB0052209B /* Hints.xib */, + 85C37A3F0E4076BB0052209B /* Message.xib */, 85764F680E3E22FC00A61BF5 /* Hints.html */, 85B1D8840E190E3A00514A6A /* Default.png */, 85C3CC0F0E119E0500A01C6A /* Images */, @@ -769,6 +777,8 @@ 852A998E0E0BC433003E6D6D /* DecoderView.xib */, 852A99900E0BC43C003E6D6D /* MainWindow.xib */, 8D1107310486CEB800E47090 /* Info.plist */, + 853678820E5394D70054126A /* About.html */, + 85F895020E543EE100C0A666 /* InfoPlist.strings */, ); name = Resources; sourceTree = ""; @@ -1393,9 +1403,9 @@ /* End PBXHeadersBuildPhase section */ /* Begin PBXNativeTarget section */ - 1D6058900D05DD3D006BFB54 /* Scanner */ = { + 1D6058900D05DD3D006BFB54 /* Barcodes */ = { isa = PBXNativeTarget; - buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Scanner" */; + buildConfigurationList = 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Barcodes" */; buildPhases = ( 1D60588D0D05DD3D006BFB54 /* Resources */, 1D60588E0D05DD3D006BFB54 /* Sources */, @@ -1407,7 +1417,7 @@ dependencies = ( 8514EB180DF8A50900EE78D3 /* PBXTargetDependency */, ); - name = Scanner; + name = Barcodes; productName = ZXing; productReference = 1D6058910D05DD3D006BFB54 /* Barcodes.app */; productType = "com.apple.product-type.application"; @@ -1486,7 +1496,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 1D6058900D05DD3D006BFB54 /* Scanner */, + 1D6058900D05DD3D006BFB54 /* Barcodes */, 8514EAE70DF88E5200EE78D3 /* zxingcore */, 856C25780E1BC767006ABF00 /* Build All */, 856C257D0E1BC779006ABF00 /* Test All */, @@ -1516,8 +1526,10 @@ 85C3CC3C0E119E1700A01C6A /* text.png in Resources */, 85B1D8850E190E3A00514A6A /* Default.png in Resources */, 85764F6A0E3E22FC00A61BF5 /* Hints.html in Resources */, - 85C37A410E4076BB0052209B /* Hints.xib in Resources */, + 85C37A410E4076BB0052209B /* Message.xib in Resources */, 85C4969C0E4A3E87003DB029 /* filmroll-2.png in Resources */, + 853678830E5394D70054126A /* About.html in Resources */, + 85F895030E543EE100C0A666 /* InfoPlist.strings in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1585,7 +1597,7 @@ 85B1D7EF0E18EB6800514A6A /* ScanCell.m in Sources */, 85E883980E1A34D2004C4547 /* ScannedImageView.m in Sources */, 85764F2E0E3DE75700A61BF5 /* PlainEmailResultParser.m in Sources */, - 85C37A3B0E406BD70052209B /* HintsViewController.m in Sources */, + 853678530E538F9E0054126A /* MessageViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1724,7 +1736,7 @@ }; 856C257C0E1BC76C006ABF00 /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 1D6058900D05DD3D006BFB54 /* Scanner */; + target = 1D6058900D05DD3D006BFB54 /* Barcodes */; targetProxy = 856C257B0E1BC76C006ABF00 /* PBXContainerItemProxy */; }; 856EABB10E1CE97800B2E1C7 /* PBXTargetDependency */ = { @@ -1775,6 +1787,16 @@ name = Localizable.strings; sourceTree = ""; }; + 853678820E5394D70054126A /* About.html */ = { + isa = PBXVariantGroup; + children = ( + 853678840E5394E40054126A /* en */, + 853678850E5394E70054126A /* de */, + 853678860E5394EA0054126A /* sv */, + ); + name = About.html; + sourceTree = ""; + }; 85764F680E3E22FC00A61BF5 /* Hints.html */ = { isa = PBXVariantGroup; children = ( @@ -1785,14 +1807,24 @@ name = Hints.html; sourceTree = ""; }; - 85C37A3F0E4076BB0052209B /* Hints.xib */ = { + 85C37A3F0E4076BB0052209B /* Message.xib */ = { isa = PBXVariantGroup; children = ( 85C37A400E4076BB0052209B /* en */, 85F7D20E0E41D4A700FDC34E /* de */, 85F7D2100E41D4B300FDC34E /* sv */, ); - name = Hints.xib; + name = Message.xib; + sourceTree = ""; + }; + 85F895020E543EE100C0A666 /* InfoPlist.strings */ = { + isa = PBXVariantGroup; + children = ( + 85F895040E543F0400C0A666 /* en */, + 8539502B0E5442AA00D081D6 /* de */, + 8539502C0E5442B500D081D6 /* sv */, + ); + name = InfoPlist.strings; sourceTree = ""; }; /* End PBXVariantGroup section */ @@ -1821,7 +1853,7 @@ GCC_PRECOMPILE_PREFIX_HEADER = YES; GCC_PREFIX_HEADER = ZXing_Prefix.pch; INFOPLIST_FILE = Info.plist; - PRODUCT_NAME = ZXing; + PRODUCT_NAME = Barcodes; }; name = Release; }; @@ -1846,7 +1878,7 @@ DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; GCC_ENABLE_FIX_AND_CONTINUE = NO; PREBINDING = NO; - PRODUCT_NAME = libzxing; + PRODUCT_NAME = zxingcore; ZERO_LINK = NO; }; name = Release; @@ -1986,7 +2018,7 @@ GCC_PREFIX_HEADER = ZXing_Prefix.pch; GCC_PREPROCESSOR_DEFINITIONS = "DEBUG=1"; INFOPLIST_FILE = Info.plist; - PRODUCT_NAME = ZXing; + PRODUCT_NAME = Barcodes; }; name = Test; }; @@ -2088,7 +2120,7 @@ /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Scanner" */ = { + 1D6058960D05DD3E006BFB54 /* Build configuration list for PBXNativeTarget "Barcodes" */ = { isa = XCConfigurationList; buildConfigurations = ( 1D6058940D05DD3E006BFB54 /* Debug */, diff --git a/iphone/de.lproj/About.html b/iphone/de.lproj/About.html new file mode 100644 index 000000000..6d00279f4 --- /dev/null +++ b/iphone/de.lproj/About.html @@ -0,0 +1,16 @@ + + +Info zu Strichcodes + + + + + +

+ZXing Project Logo

+

Strichcodes

+

© 2008 The ZXing +Authors
+

+ \ No newline at end of file diff --git a/iphone/de.lproj/Hints.html b/iphone/de.lproj/Hints.html index a76d8419a0a7cef4430518b8208fe04d97ff1394..f874eb62b20b6a1fbf6f495c8a8d42b5f3794734 100644 GIT binary patch literal 1063 zcmah|%}(1u5WeRrraogY2vk*xW2qq^P@zQ-RQ0&A$Mz`eb-Fu_3opZkXXvGsddLIy z6*}vrgb@nlWsAgV|mFoLG>5r4vRcdjo!t{yq>?r4?;3CRKX{cpsjk=JR23bSiT1Ly$ zi18Z_GZV;b?L6}IesLbZi-ZQRWBl6DW*Y6=V}4j;l%-5;Fq>(Yw*|rlS@x;g6-T4g z^MgSMt$X;~dtm{P3N88cmxI-fbZiLwb?Z2K;nY*X^|ZhZ@0gV)x_9vzjF z;MO{$o4U0KwPrw)hmyXwwLt8Rb9UlOB9_b}ID7QZy z+=U?O;8T3&R%mT!E07-|RTibaM>3#|5xib|cHp?*t$0Y^y2OwuAQ-0WW0EL8C>u$|HED)h} rpf!3$OW4%gXCs*p$%PKx1k6(B^^no44296et-5%1IeEkT19qA1S<7D7j-MXeM||Wb#JSDv!1tG?pBBHnJa4SD5&IW*#xup< zV_o4>T48@KnC+Z7#AVzB^y z0IHOmINt+2E?I|FRPXWGk~rd%o6d&#r~{g;q(Fh^9bKrXJx(fToO_oI@kre@gL6Um zkKJDtQ-{oX=j=~;3cH|}gnR?vg=4+*D8lQJd&X=?>&mT_%ato7PTDUW@dgATkHDDQ zb5;c&bNZl1rm|A3U;aL4KPF-fR&-O7nJxKJmrq@>5gv**Vo!WWtkv1VUiyw^TUAn> z#BRx#-uL)rSog?R7E_+8ehHh$xh0MfM>UTL8oHOXs60bWPS^~1hn*NGr-&u=$Rrd| z771Mno~$w-I9|gQkvd^_#=C;^gdNpKb*a!rnI)TZ_dM_(R9)L{ulIzL4)>NSDjo?} zO6+rsX)dmLz9Op5q=)jj_Zf(6g2%cx(Y2Xvs#bJTVyC$X7Ku%pNVApliW#?nCZq1< zdS9KaZdWZepV7fWO(-4iZsl<9HB#^BCf0qCES^r_|HnB(GgVW4rmEF>U#%Fa(mGpb z6g?%6%?cIH_z13(mEOXL&QFMSG)=Y?(UeT=hvzAK%}jK7RP7cf`b$&VPkZon@Jjk` zulgd*Yy;bZ$_rWDAr-s4)7+_t<2Fd0tvi0mUgeV(H<%)+pHeoO!GSZ5PFPUwITpb? zs;Jph#3@s^S)tHljF&n|m`Quhou*OKE5^Z48fjNL$v5!-ojd9GfKAIQmhR|uf5(3X Foxj8VcNG8t diff --git a/iphone/de.lproj/InfoPlist.strings b/iphone/de.lproj/InfoPlist.strings new file mode 100644 index 000000000..15309108b --- /dev/null +++ b/iphone/de.lproj/InfoPlist.strings @@ -0,0 +1 @@ +CFBundleDisplayName = "Strichcodes"; \ No newline at end of file diff --git a/iphone/de.lproj/Localizable.strings b/iphone/de.lproj/Localizable.strings index cd3a64b0b..008c2f830 100644 --- a/iphone/de.lproj/Localizable.strings +++ b/iphone/de.lproj/Localizable.strings @@ -29,25 +29,31 @@ "Contact Result Type Name" = "Kontakt"; /* No barcode detected. */ -"Decoder BarcodeDetectionFailure" = "Kein Strichkod gefunden."; +"Decoder BarcodeDetectionFailure" = "Kein Strichcode gefunden."; /* Decoding ... */ "Decoder MessageWhileDecoding" = "Dekodiert ..."; /* ZXing */ -"DecoderViewController AppTitle" = "Barcodes"; +"DecoderViewController AppTitle" = "Strichcodes"; /* Cancel */ "DecoderViewController cancel button title" = "Abbrechen"; +/* About */ +"DecoderViewController about button title" = "Info"; + /* Hints */ -"DecoderViewController HintsViewController title" = "Tips"; +"DecoderViewController Hints MessageViewController title" = "Tips"; + +/* About */ +"DecoderViewController About MessageViewController title" = "Info"; /* Decoding image (%.0fx%.0f) ... */ "DecoderViewController MessageWhileDecodingWithDimensions" = "Dekodiert Bild (%.0fx%.0f) ..."; /* Please take or choose a picture containing a barcode */ -"DecoderViewController take or choose picture" = "Bitte nehmen oder wählen Sie ein Bild mit Strichkod"; +"DecoderViewController take or choose picture" = "Bitte nehmen oder wählen Sie ein Bild mit Strichcode"; /* Email %@ */ "EmailAction action title" = "Email an %@"; diff --git a/iphone/de.lproj/Message.xib b/iphone/de.lproj/Message.xib new file mode 100644 index 000000000..dbadb2466 --- /dev/null +++ b/iphone/de.lproj/Message.xib @@ -0,0 +1,132 @@ + + + + 512 + 9E17 + 670 + 949.33 + 352.00 + + YES + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + IBFilesOwner + + + IBFirstResponder + + + + 274 + {320, 460} + + 3 + MAA + + YES + YES + YES + + + + + YES + + + view + + + + 5 + + + + + YES + + 0 + + YES + + + + + + -1 + + + RmlsZSdzIE93bmVyA + + + -2 + + + + + 4 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 4.IBPluginDependency + + + YES + HintsViewController + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + YES + + + YES + + + + + YES + + YES + + + YES + + + + 5 + + + + YES + + HintsViewController + UIViewController + + IBProjectSource + Classes/HintsViewController.h + + + + + 0 + + 3 + + diff --git a/iphone/en.lproj/About.html b/iphone/en.lproj/About.html new file mode 100644 index 000000000..f6d86e723 --- /dev/null +++ b/iphone/en.lproj/About.html @@ -0,0 +1,16 @@ + + +About Barcodes + + + + + +

+ZXing Project Logo

+

Barcodes

+

© 2008 The ZXing +Authors
+

+ \ No newline at end of file diff --git a/iphone/en.lproj/InfoPlist.strings b/iphone/en.lproj/InfoPlist.strings new file mode 100644 index 000000000..d22c0553a --- /dev/null +++ b/iphone/en.lproj/InfoPlist.strings @@ -0,0 +1 @@ +CFBundleDisplayName = "Barcodes"; \ No newline at end of file diff --git a/iphone/en.lproj/Localizable.strings b/iphone/en.lproj/Localizable.strings index fb833b2a3..a8113c63d 100644 --- a/iphone/en.lproj/Localizable.strings +++ b/iphone/en.lproj/Localizable.strings @@ -40,8 +40,14 @@ /* Cancel */ "DecoderViewController cancel button title" = "Cancel"; +/* About */ +"DecoderViewController about button title" = "About"; + /* Hints */ -"DecoderViewController HintsViewController title" = "Hints"; +"DecoderViewController Hints MessageViewController title" = "Hints"; + +/* About */ +"DecoderViewController About MessageViewController title" = "About"; /* Decoding image (%.0fx%.0f) ... */ "DecoderViewController MessageWhileDecodingWithDimensions" = "Decoding image (%.0fx%.0f) ..."; diff --git a/iphone/en.lproj/Message.xib b/iphone/en.lproj/Message.xib new file mode 100644 index 000000000..dbadb2466 --- /dev/null +++ b/iphone/en.lproj/Message.xib @@ -0,0 +1,132 @@ + + + + 512 + 9E17 + 670 + 949.33 + 352.00 + + YES + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + IBFilesOwner + + + IBFirstResponder + + + + 274 + {320, 460} + + 3 + MAA + + YES + YES + YES + + + + + YES + + + view + + + + 5 + + + + + YES + + 0 + + YES + + + + + + -1 + + + RmlsZSdzIE93bmVyA + + + -2 + + + + + 4 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 4.IBPluginDependency + + + YES + HintsViewController + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + YES + + + YES + + + + + YES + + YES + + + YES + + + + 5 + + + + YES + + HintsViewController + UIViewController + + IBProjectSource + Classes/HintsViewController.h + + + + + 0 + + 3 + + diff --git a/iphone/sv.lproj/About.html b/iphone/sv.lproj/About.html new file mode 100644 index 000000000..8bda11200 --- /dev/null +++ b/iphone/sv.lproj/About.html @@ -0,0 +1,16 @@ + + +Om Streckkoder + + + + + +

+ZXing Project Logo

+

Streckkoder

+

© 2008 The ZXing +Authors
+

+ \ No newline at end of file diff --git a/iphone/sv.lproj/Hints.html b/iphone/sv.lproj/Hints.html index 61dc71a4153d41eeace92cd881e4042881a02a11..ae70c0919cb3fd4e75a0186cc43dd8f7a49cede8 100644 GIT binary patch literal 1025 zcmYjQ%Wm5+5WM>okN{~L6b_0W*Agu;qDYlo$?^X@(rXse+P{$|#?up_Zq$#F7uKB!t2ml7_N~ zg^Z`e0+dmtP{+PNEwhv4 zm}Q99k=C}{!PGj7)>t%^v%M+f!fNa0u-07S@eZeLtw=6l!v@3~Y?a>4!K3l9mriXK z!LBY>_q8=LZdjm0U|&EI!A3pt!#2H-%g4Suf%6 zW}vYxOPqRm3BE5&RT18)k9*IH;H2+0AeS;cJhu$M^2NUxnD0nknF#f{|whz`ym+a3w3;M2uP$8xDWC44_GqKK{ z*34#C9Xo$eD0sFdr-(DoiU$i;I41MYlXXWyiR-3IIIa@jdaWlD-!ozKBd0t}hLY6{ pzOO+wrTNy_1G=^3$o=>Xdfao$A;)%ndDNUyl8UgkVTZ%V`47{WbkhI; literal 2016 zcmaKtUvCmo5XI-2PqFsFCuwck^r2D`l{Plj#jr1$^-c}F6hfl6|`ZaP+ zwb<`%c{aQ{DqneQ<||OQ`S-=P_Dl`oWsb9ndfbVr^3xYEmdahI_cQPOTsu#7>Q-KK ze5e>W6V=zVsmNrZcho_hBV{OMt>wjvT>GvCPK+vt+S{B`&wH^F!iF{Mdh+SpSc<6R zu@HJLR618W-(yAev<|O0y@$42<$+IO*anJ00Zpywz(|oRsgSH)S!!ooxXK2KNa~u2 z^GNC+dOTH+JswY#6?(~(1znS8@91=`^}W{k1VTg4rDNw>!SHO&q$eiS0hdZy$N_WWj$MPCYs+_e(xtX$9e%HNV?FU~fuHi6+jDvM{e!9>J9`bFb$&i%D+&s5J!yHS7YBr3oU?3wO-HM-6Y9_+SVpUgIsLf=y7VB5 tA1XMw){aoAvs4xna<9Eo_-Srp`X<7-);_b#|03Vk^fgUi+W7x&{{c6AY##ss diff --git a/iphone/sv.lproj/InfoPlist.strings b/iphone/sv.lproj/InfoPlist.strings new file mode 100644 index 000000000..a53bf351e --- /dev/null +++ b/iphone/sv.lproj/InfoPlist.strings @@ -0,0 +1 @@ +CFBundleDisplayName = "Streckkoder"; \ No newline at end of file diff --git a/iphone/sv.lproj/Localizable.strings b/iphone/sv.lproj/Localizable.strings index 49bb1bc69..d9cccd018 100644 --- a/iphone/sv.lproj/Localizable.strings +++ b/iphone/sv.lproj/Localizable.strings @@ -35,13 +35,19 @@ "Decoder MessageWhileDecoding" = "Avkodar ..."; /* ZXing */ -"DecoderViewController AppTitle" = "Barcodes"; +"DecoderViewController AppTitle" = "Streckkoder"; /* Cancel */ "DecoderViewController cancel button title" = "Avbryt"; +/* About */ +"DecoderViewController about button title" = "Info"; + /* Hints */ -"DecoderViewController HintsViewController title" = "Tips"; +"DecoderViewController Hints MessageViewController title" = "Tips"; + +/* About */ +"DecoderViewController About MessageViewController title" = "Info"; /* Decoding image (%.0fx%.0f) ... */ "DecoderViewController MessageWhileDecodingWithDimensions" = "Avkodar bild (%.0fx%.0f) ..."; diff --git a/iphone/sv.lproj/Message.xib b/iphone/sv.lproj/Message.xib new file mode 100644 index 000000000..dbadb2466 --- /dev/null +++ b/iphone/sv.lproj/Message.xib @@ -0,0 +1,132 @@ + + + + 512 + 9E17 + 670 + 949.33 + 352.00 + + YES + + + YES + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + YES + + IBFilesOwner + + + IBFirstResponder + + + + 274 + {320, 460} + + 3 + MAA + + YES + YES + YES + + + + + YES + + + view + + + + 5 + + + + + YES + + 0 + + YES + + + + + + -1 + + + RmlsZSdzIE93bmVyA + + + -2 + + + + + 4 + + + + + + + YES + + YES + -1.CustomClassName + -2.CustomClassName + 4.IBPluginDependency + + + YES + HintsViewController + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + YES + + YES + + + YES + + + + + YES + + YES + + + YES + + + + 5 + + + + YES + + HintsViewController + UIViewController + + IBProjectSource + Classes/HintsViewController.h + + + + + 0 + + 3 + +