mirror of
https://github.com/zxing/zxing.git
synced 2025-01-12 19:57:27 -08:00
Added version number and list of supported barcode format(s) in About screen. Cleaned up MessageViewController's loading of data.
git-svn-id: https://zxing.googlecode.com/svn/trunk@563 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
parent
8d90db8c1c
commit
a16084242c
|
@ -25,9 +25,7 @@
|
|||
id callbackTarget;
|
||||
SEL callbackSelectorSuccess;
|
||||
SEL callbackSelectorFailure;
|
||||
NSString *contentPath;
|
||||
NSURL *contentURL;
|
||||
NSString *content;
|
||||
}
|
||||
|
||||
@property (nonatomic, retain) id callbackTarget;
|
||||
|
@ -36,9 +34,7 @@
|
|||
|
||||
@property (nonatomic, readonly) UIWebView *webView;
|
||||
|
||||
@property (nonatomic, copy) NSString *contentPath;
|
||||
@property (nonatomic, retain) NSURL *contentURL;
|
||||
@property (nonatomic, copy) NSString *content;
|
||||
|
||||
- (id)initWithMessageFilename:(NSString *)filename target:(id)cbt onSuccess:(SEL)ss onFailure:(SEL)fs;
|
||||
|
||||
|
|
|
@ -27,26 +27,22 @@
|
|||
@synthesize callbackTarget;
|
||||
@synthesize callbackSelectorSuccess;
|
||||
@synthesize callbackSelectorFailure;
|
||||
@synthesize contentPath;
|
||||
@synthesize contentURL;
|
||||
@synthesize content;
|
||||
|
||||
- (UIWebView *)webView {
|
||||
return (UIWebView *)self.view;
|
||||
}
|
||||
|
||||
- (id)initWithMessageFilename:(NSString *)filename
|
||||
target:(id)cbt onSuccess:(SEL)ss onFailure:(SEL)fs {
|
||||
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:filename
|
||||
ofType:@"html"];
|
||||
self.contentURL = [NSURL fileURLWithPath:self.contentPath];
|
||||
self.content = [NSString stringWithContentsOfFile:self.contentPath
|
||||
encoding:NSUTF8StringEncoding
|
||||
error:NULL];
|
||||
self.contentURL = [NSURL fileURLWithPath:[[NSBundle mainBundle] pathForResource:filename
|
||||
ofType:@"html"]];
|
||||
}
|
||||
return self;
|
||||
}
|
||||
|
@ -54,7 +50,7 @@
|
|||
- (void)loadView {
|
||||
[super loadView];
|
||||
self.webView.delegate = self;
|
||||
[self.webView loadHTMLString:self.content baseURL:self.contentURL];
|
||||
[self.webView loadRequest:[NSURLRequest requestWithURL:self.contentURL]];
|
||||
}
|
||||
|
||||
- (void)viewDidLoad {
|
||||
|
|
|
@ -9,8 +9,15 @@
|
|||
<body style="background-color: black; color: white; font-family: sans-serif; text-align: center;">
|
||||
<p style="font-weight: bold;">
|
||||
<img style="width: 128px; height: 128px;" alt="ZXing Project Logo" src="../zxing-icon-128.png"></p>
|
||||
<p style="font-weight: bold;">Strichcodes</p>
|
||||
<h2>Strichcodes</h2>
|
||||
<p>Version 1.0</p>
|
||||
<p>© 2008 The <a href="http://code.google.com/p/zxing/">ZXing</a>
|
||||
Authors<br>
|
||||
</p>
|
||||
<p>
|
||||
<b>Unterstützte Strichcode-Formate:</b>
|
||||
</p>
|
||||
<p>
|
||||
QR Code<br/>
|
||||
</p>
|
||||
</body></html>
|
|
@ -9,8 +9,15 @@
|
|||
<body style="background-color: black; color: white; font-family: sans-serif; text-align: center;">
|
||||
<p style="font-weight: bold;">
|
||||
<img style="width: 128px; height: 128px;" alt="ZXing Project Logo" src="../zxing-icon-128.png"></p>
|
||||
<p style="font-weight: bold;">Barcodes</p>
|
||||
<h2>Barcodes</h2>
|
||||
<p>Version 1.0</p>
|
||||
<p>© 2008 The <a href="http://code.google.com/p/zxing/">ZXing</a>
|
||||
Authors<br>
|
||||
</p>
|
||||
<p>
|
||||
<b>Supported barcode formats:</b>
|
||||
</p>
|
||||
<p>
|
||||
QR Code<br/>
|
||||
</p>
|
||||
</body></html>
|
|
@ -9,8 +9,15 @@
|
|||
<body style="background-color: black; color: white; font-family: sans-serif; text-align: center;">
|
||||
<p style="font-weight: bold;">
|
||||
<img style="width: 128px; height: 128px;" alt="ZXing Project Logo" src="../zxing-icon-128.png"></p>
|
||||
<p style="font-weight: bold;">Streckkoder</p>
|
||||
<h2>Streckkoder</h2>
|
||||
<p>Version 1.0</p>
|
||||
<p>© 2008 The <a href="http://code.google.com/p/zxing/">ZXing</a>
|
||||
Authors<br>
|
||||
</p>
|
||||
<p>
|
||||
<b>Stödda streckkods-format:</b>
|
||||
</p>
|
||||
<p>
|
||||
QR Code<br/>
|
||||
</p>
|
||||
</body></html>
|
Loading…
Reference in a new issue