@@ -41,6 +41,8 @@ - (void)navToTOC:(id)sender; - (void)navToIDX:(id)sender; +- (void)settingSaved; + - (IBAction)toggleFullScreen:(id)sender; - (IBAction)toggleScaleToFit:(id)sender; - (IBAction)goHome:(id)sender; Classes/CHMBrowserController.h @@ -178,6 +178,10 @@ [webView reload]; } +- (void)settingSaved +{ + [webView reload]; +} #pragma mark load page - (void)loadPath:(NSString *)path { @@ -188,9 +192,7 @@ - (void)loadURL:(NSURL *)url { if( url ) { - CHMDocument *doc = [CHMDocument CurrentDocument]; - NSMutableURLRequest *req = [NSMutableURLRequest requestWithURL:url]; - [req setEncodingName:[doc currentEncodingName]]; + NSURLRequest *req = [NSURLRequest requestWithURL:url]; [webView loadRequest:req]; } } @@ -398,6 +400,7 @@ DocumentSettingController *controller = [[DocumentSettingController alloc] initWithNibName:@"DocumentSetting" bundle:nil]; [self.navigationController pushViewController:controller animated:YES]; + controller.delegate = self; [controller release]; } #pragma mark dealloc Classes/CHMBrowserController.m @@ -265,6 +265,7 @@ static CHMDocument *currentDocument = nil; { tocSource = nil; zoomFactor = 1; + encodingName = [self getPrefForKey:@"text_encoding" withDefault:nil]; return self; } @@ -473,7 +474,9 @@ static CHMDocument *currentDocument = nil; { unsigned int lcid = readLong(systemData, offset + 4); NSLog(@"SYSTEM LCID: %d", lcid); - encodingName = LCIDtoEncodingName(lcid); + if (nil == encodingName || [encodingName length] == 0) { + encodingName = LCIDtoEncodingName(lcid); + } NSLog(@"SYSTEM encoding: %@", encodingName); } break; @@ -557,6 +560,10 @@ static CHMDocument *currentDocument = nil; #pragma mark encoding - (NSString*)currentEncodingName { + NSString *name = [self getPrefForKey:@"text_encoding" withDefault:nil]; + if (nil != name && [name length] > 0) { + return name; + } return encodingName; } Classes/CHMDocument.m @@ -7,12 +7,16 @@ // #import <UIKit/UIKit.h> - +@class CHMBrowserController; @interface DocumentSettingController : UITableViewController { IBOutlet UITableViewCell *textEncodingCell; - IBOutlet UITextField *textEncodingField; + + CHMBrowserController *delegate; } +@property (nonatomic, assign) CHMBrowserController *delegate; + +- (void)settingChanged:(id)sender; @end Classes/DocumentSettingController.h @@ -8,11 +8,14 @@ #import "CHMDocument.h" #import "TextEncodingController.h" +#import "CHMBrowserController.h" #import "DocumentSettingController.h" @implementation DocumentSettingController +@synthesize delegate; + /* - (id)initWithStyle:(UITableViewStyle)style { // Override initWithStyle: if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. @@ -85,7 +88,7 @@ // Customize the appearance of table view cells. -- (UITableViewCell *)tableView:(UITableView *)tableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { +- (UITableViewCell *)tableView:(UITableView *)aTableView cellForRowAtIndexPath:(NSIndexPath *)indexPath { if (indexPath.row == 0) { textEncodingField.text = [[CHMDocument CurrentDocument] getPrefForKey:@"text_encoding" withDefault:@"Default"]; @@ -97,11 +100,12 @@ } -- (void)tableView:(UITableView *)tableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { +- (void)tableView:(UITableView *)aTableView didSelectRowAtIndexPath:(NSIndexPath *)indexPath { TextEncodingController *controller = [[TextEncodingController alloc] initWithStyle:UITableViewStyleGrouped]; [self.navigationController pushViewController:controller animated:YES]; + controller.settingController = self; [controller release]; - [tableView deselectRowAtIndexPath:indexPath animated:NO]; + [aTableView deselectRowAtIndexPath:indexPath animated:NO]; // Navigation logic may go here. Create and push another view controller. // AnotherViewController *anotherViewController = [[AnotherViewController alloc] initWithNibName:@"AnotherView" bundle:nil]; // [self.navigationController pushViewController:anotherViewController]; @@ -147,7 +151,12 @@ return YES; } */ - +- (void)settingChanged:(id)sender +{ + if (nil != delegate) + [delegate settingSaved]; + [(UITableView*)self.view reloadData]; +} - (void)dealloc { [super dealloc]; Classes/DocumentSettingController.m @@ -12,15 +12,4 @@ @interface ITSSProtocol : NSURLProtocol { } -@end - -@interface NSURLRequest (ITSSProtocol) -- (CHMDocument *)chmDoc; -- (NSString *)encodingName; -@end - -@interface NSMutableURLRequest (ITSSProtocol) -- (void)setChmDoc:(CHMDocument *)doc; -- (void)setEncodingName:(NSString *)name; -@end - +@end \ No newline at end of file Classes/ITSSProtocol.h @@ -37,7 +37,7 @@ { NSURL *url = [[self request] URL]; CHMDocument *doc = [CHMDocument CurrentDocument]; - NSString *encoding = [[self request] encodingName]; + NSString *encoding = [doc currentEncodingName]; if( !doc ) { [[self client] URLProtocol:self didFailWithError:[NSError errorWithDomain:NSURLErrorDomain code:0 userInfo:nil]]; @@ -81,22 +81,4 @@ [response release]; } -@end - -@implementation NSURLRequest (SpecialProtocol) - -- (NSString *)encodingName -{ - return [NSURLProtocol propertyForKey:@"encoding" inRequest:self]; -} -@end - - - -@implementation NSMutableURLRequest (SpecialProtocol) - -- (void)setEncodingName:(NSString *)name -{ - [NSURLProtocol setProperty:name forKey:@"encoding" inRequest:self]; -} @end \ No newline at end of file Classes/ITSSProtocol.m @@ -7,10 +7,12 @@ // #import <UIKit/UIKit.h> - +@class DocumentSettingController; @interface TextEncodingController : UITableViewController { NSArray *encodingNames; + DocumentSettingController *settingController; } +@property (nonatomic, assign) DocumentSettingController * settingController; @end Classes/TextEncodingController.h @@ -7,11 +7,12 @@ // #import "CHMDocument.h" +#import "DocumentSettingController.h" #import "TextEncodingController.h" @implementation TextEncodingController - +@synthesize settingController; /* - (id)initWithStyle:(UITableViewStyle)style { // Override initWithStyle: if you create the controller programmatically and want to perform customization that is not appropriate for viewDidLoad. @@ -122,6 +123,7 @@ NSString *encodingName = [[[encodingNames objectAtIndex:indexPath.section] objectAtIndex:indexPath.row] objectForKey:@"name"]; if (encodingName && [encodingName length] > 0) { [[CHMDocument CurrentDocument] setPref:encodingName forKey:@"text_encoding"]; + [settingController settingChanged:self]; } [tableView deselectRowAtIndexPath:indexPath animated:NO]; [self.navigationController popViewControllerAnimated:YES]; Classes/TextEncodingController.m @@ -8,8 +8,8 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="9"/> <integer value="3"/> + <integer value="9"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -296,7 +296,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">13</int> + <int key="maxID">15</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -304,6 +304,10 @@ <object class="IBPartialClassDescription"> <string key="className">DocumentSettingController</string> <string key="superclassName">UITableViewController</string> + <object class="NSMutableDictionary" key="actions"> + <string key="NS.key.0">settingChanged:</string> + <string key="NS.object.0">id</string> + </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> DocumentSetting.xib @@ -123,39 +123,40 @@ <float key="IBUIWidth">3.200000e+01</float> <reference key="IBUIToolbar" ref="241411469"/> </object> - <object class="IBUIBarButtonItem" id="113258795"> + <object class="IBUIBarButtonItem" id="1068126399"> <int key="IBUISystemItemIdentifier">5</int> <reference key="IBUIToolbar" ref="241411469"/> </object> - <object class="IBUIBarButtonItem" id="91225355"> + <object class="IBUIBarButtonItem" id="2356769"> <object class="NSCustomResource" key="IBUIImage"> <string key="NSClassName">NSImage</string> - <string key="NSResourceName">zoomtofit.png</string> + <string key="NSResourceName">option.png</string> </object> <float key="IBUIWidth">3.200000e+01</float> <reference key="IBUIToolbar" ref="241411469"/> </object> - <object class="IBUIBarButtonItem" id="628367794"> + <object class="IBUIBarButtonItem" id="113258795"> <int key="IBUISystemItemIdentifier">5</int> <reference key="IBUIToolbar" ref="241411469"/> </object> - <object class="IBUIBarButtonItem" id="992970946"> + <object class="IBUIBarButtonItem" id="91225355"> <object class="NSCustomResource" key="IBUIImage"> <string key="NSClassName">NSImage</string> - <string key="NSResourceName">fullscreen.png</string> + <string key="NSResourceName">zoomtofit.png</string> </object> <float key="IBUIWidth">3.200000e+01</float> <reference key="IBUIToolbar" ref="241411469"/> </object> - <object class="IBUIBarButtonItem" id="1068126399"> + <object class="IBUIBarButtonItem" id="628367794"> <int key="IBUISystemItemIdentifier">5</int> <reference key="IBUIToolbar" ref="241411469"/> </object> - <object class="IBUIBarButtonItem" id="2356769"> + <object class="IBUIBarButtonItem" id="992970946"> <object class="NSCustomResource" key="IBUIImage"> <string key="NSClassName">NSImage</string> - <string key="NSResourceName">option.png</string> + <string key="NSResourceName">fullscreen.png</string> </object> + <float key="IBUIWidth">3.200000e+01</float> <reference key="IBUIToolbar" ref="241411469"/> </object> </object> @@ -614,7 +615,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">59</int> + <int key="maxID">61</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> English.lproj/CHMBrowser.xib 95475bd6cad9e1c18a084f3588bb9b6aee285f2c Robin Lu iamawalrus@gmail.com http://github.com/robin/ichm-m/commit/bf4d09f21e83837dda566500c083844c86db1ac5 bf4d09f21e83837dda566500c083844c86db1ac5 2009-03-30T07:54:22-07:00 2009-03-30T07:54:22-07:00 text encoding switching 791fef41cb7999605a2593d6cefc95ce33c7f522 Robin Lu iamawalrus@gmail.com