projects / zxing.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: e035eb4)
Added version number and list of supported barcode format(s) in About screen. Cleaned...
authorchristian.brunschen <christian.brunschen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Thu, 14 Aug 2008 12:49:52 +0000 (12:49 +0000)
committerchristian.brunschen <christian.brunschen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Thu, 14 Aug 2008 12:49:52 +0000 (12:49 +0000)
git-svn-id: http://zxing.googlecode.com/svn/trunk@563 59b500cc-1b3d-0410-9834-0bbf25fbcc57

iphone/Classes/MessageViewController.h patch | blob | history
iphone/Classes/MessageViewController.m patch | blob | history
iphone/de.lproj/About.html patch | blob | history
iphone/en.lproj/About.html patch | blob | history
iphone/sv.lproj/About.html patch | blob | history

diff --git a/iphone/Classes/MessageViewController.h b/iphone/Classes/MessageViewController.h
index b74d1dc..348d0a4 100644 (file)
--- a/iphone/Classes/MessageViewController.h
+++ b/iphone/Classes/MessageViewController.h
@@ -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;
 
diff --git a/iphone/Classes/MessageViewController.m b/iphone/Classes/MessageViewController.m
index 9380ce5..ab6b2bc 100644 (file)
--- a/iphone/Classes/MessageViewController.m
+++ b/iphone/Classes/MessageViewController.m
@@ -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 {
diff --git a/iphone/de.lproj/About.html b/iphone/de.lproj/About.html
index 6d00279..f55c2ad 100644 (file)
--- a/iphone/de.lproj/About.html
+++ b/iphone/de.lproj/About.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;">Strichcodes</p>
+<h2>Strichcodes</h2>
+<p>Version 1.0</p>
 <p>&copy; 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>
\ No newline at end of file
diff --git a/iphone/en.lproj/About.html b/iphone/en.lproj/About.html
index f6d86e7..8980ac5 100644 (file)
--- a/iphone/en.lproj/About.html
+++ b/iphone/en.lproj/About.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>&copy; 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>
\ No newline at end of file
diff --git a/iphone/sv.lproj/About.html b/iphone/sv.lproj/About.html
index 8bda112..1fd6219 100644 (file)
--- a/iphone/sv.lproj/About.html
+++ b/iphone/sv.lproj/About.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>&copy; 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>
\ No newline at end of file
Unnamed repository; edit this file to name it for gitweb.