Classes/DocumentSettingController.h Classes/DocumentSettingController.m Classes/TextEncodingController.h Classes/TextEncodingController.m DocumentSetting.xib option.png textencoding.plist @@ -49,4 +49,5 @@ - (IBAction)zoom:(id)sender; - (IBAction)zoomIn:(id)sender; - (IBAction)zoomOut:(id)sender; +- (IBAction)openSettings:(id)sender; @end Classes/CHMBrowserController.h @@ -10,6 +10,7 @@ #import "ITSSProtocol.h" #import "CHMDocument.h" #import "TableOfContentController.h" +#import "DocumentSettingController.h" #import "IndexController.h" #import "CHMTableOfContent.h" #import "iChmAppDelegate.h" @@ -391,6 +392,14 @@ [[CHMDocument CurrentDocument] setPref:value forKey:@"scale to fit"]; [webView reload]; } + +- (IBAction)openSettings:(id)sender +{ + DocumentSettingController *controller = [[DocumentSettingController alloc] + initWithNibName:@"DocumentSetting" bundle:nil]; + [self.navigationController pushViewController:controller animated:YES]; + [controller release]; +} #pragma mark dealloc - (void)dealloc { [[NSNotificationCenter defaultCenter] removeObserver:self]; Classes/CHMBrowserController.m @@ -239,6 +239,7 @@ [self launchBrowserForFile:filename]; } [defaults removeObjectForKey:key]; + self.navigationController.navigationBar.topItem.title = NSLocalizedString(@"iChm", @"iChm"); } /* - (void)viewWillDisappear:(BOOL)animated { Classes/RootViewController.m @@ -8,7 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1"/> + <integer value="15"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -147,6 +147,17 @@ <float key="IBUIWidth">3.200000e+01</float> <reference key="IBUIToolbar" ref="241411469"/> </object> + <object class="IBUIBarButtonItem" id="1068126399"> + <int key="IBUISystemItemIdentifier">5</int> + <reference key="IBUIToolbar" ref="241411469"/> + </object> + <object class="IBUIBarButtonItem" id="2356769"> + <object class="NSCustomResource" key="IBUIImage"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">option.png</string> + </object> + <reference key="IBUIToolbar" ref="241411469"/> + </object> </object> </object> <object class="IBUIButton" id="640430953"> @@ -368,6 +379,14 @@ </object> <int key="connectionID">48</int> </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchEventConnection" key="connection"> + <string key="label">openSettings:</string> + <reference key="source" ref="2356769"/> + <reference key="destination" ref="372490531"/> + </object> + <int key="connectionID">59</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -431,6 +450,8 @@ <reference ref="23537271"/> <reference ref="113258795"/> <reference ref="628367794"/> + <reference ref="2356769"/> + <reference ref="1068126399"/> </object> <reference key="parent" ref="191373211"/> </object> @@ -504,6 +525,16 @@ <reference key="object" ref="628367794"/> <reference key="parent" ref="241411469"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">56</int> + <reference key="object" ref="2356769"/> + <reference key="parent" ref="241411469"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">57</int> + <reference key="object" ref="1068126399"/> + <reference key="parent" ref="241411469"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -532,12 +563,14 @@ <string>52.IBPluginDependency</string> <string>53.IBPluginDependency</string> <string>54.IBPluginDependency</string> + <string>56.IBPluginDependency</string> + <string>57.IBPluginDependency</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>CHMBrowserController</string> <string>UIResponder</string> - <string>{{387, 534}, {320, 480}}</string> + <string>{{466, 565}, {320, 480}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>{{605, 930}, {37, 37}}</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> @@ -557,6 +590,8 @@ <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> + <string>com.apple.InterfaceBuilder.IBCocoaTouchPlugin</string> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -579,7 +614,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">55</int> + <int key="maxID">59</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -596,8 +631,12 @@ <string>goPrevPage:</string> <string>navToIDX:</string> <string>navToTOC:</string> + <string>openSettings:</string> <string>toggleFullScreen:</string> <string>toggleScaleToFit:</string> + <string>zoom:</string> + <string>zoomIn:</string> + <string>zoomOut:</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -608,6 +647,10 @@ <string>id</string> <string>id</string> <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="outlets"> English.lproj/CHMBrowser.xib @@ -51,6 +51,11 @@ C393686A0E9CF1D7001EA28D /* MainWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = C39368690E9CF1D7001EA28D /* MainWindow.xib */; }; C393686C0E9CF1E1001EA28D /* TableOfContent.xib in Resources */ = {isa = PBXBuildFile; fileRef = C393686B0E9CF1E1001EA28D /* TableOfContent.xib */; }; C393686E0E9CF1EB001EA28D /* CHMBrowser.xib in Resources */ = {isa = PBXBuildFile; fileRef = C393686D0E9CF1EB001EA28D /* CHMBrowser.xib */; }; + C395F11B0F8099B500E7D2F2 /* DocumentSetting.xib in Resources */ = {isa = PBXBuildFile; fileRef = C395F11A0F8099B500E7D2F2 /* DocumentSetting.xib */; }; + C395F11F0F8099E300E7D2F2 /* DocumentSettingController.m in Sources */ = {isa = PBXBuildFile; fileRef = C395F11E0F8099E300E7D2F2 /* DocumentSettingController.m */; }; + C395F1220F809CD500E7D2F2 /* option.png in Resources */ = {isa = PBXBuildFile; fileRef = C395F1210F809CD500E7D2F2 /* option.png */; }; + C395F1720F80A85700E7D2F2 /* TextEncodingController.m in Sources */ = {isa = PBXBuildFile; fileRef = C395F1710F80A85700E7D2F2 /* TextEncodingController.m */; }; + C395F1740F80A89E00E7D2F2 /* textencoding.plist in Resources */ = {isa = PBXBuildFile; fileRef = C395F1730F80A89E00E7D2F2 /* textencoding.plist */; }; C3A498200EDBDF4400997EF0 /* zoomtofit.png in Resources */ = {isa = PBXBuildFile; fileRef = C3A4981F0EDBDF4400997EF0 /* zoomtofit.png */; }; C3A499BB0EDC4ED300997EF0 /* spine.png in Resources */ = {isa = PBXBuildFile; fileRef = C3A499BA0EDC4ED300997EF0 /* spine.png */; }; C3A64C160EDD078400B36D26 /* navbar.png in CopyFiles */ = {isa = PBXBuildFile; fileRef = C3A64BDD0EDD077500B36D26 /* navbar.png */; }; @@ -209,6 +214,13 @@ C39367E60E9CBBA1001EA28D /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/CHMBrowser.xib; sourceTree = "<group>"; }; C39367E90E9CBBD3001EA28D /* CHMBrowserController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CHMBrowserController.h; sourceTree = "<group>"; }; C39367EA0E9CBBD3001EA28D /* CHMBrowserController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CHMBrowserController.m; sourceTree = "<group>"; }; + C395F11A0F8099B500E7D2F2 /* DocumentSetting.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = DocumentSetting.xib; sourceTree = "<group>"; }; + C395F11D0F8099E300E7D2F2 /* DocumentSettingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DocumentSettingController.h; sourceTree = "<group>"; }; + C395F11E0F8099E300E7D2F2 /* DocumentSettingController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DocumentSettingController.m; sourceTree = "<group>"; }; + C395F1210F809CD500E7D2F2 /* option.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = option.png; sourceTree = "<group>"; }; + C395F1700F80A85700E7D2F2 /* TextEncodingController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TextEncodingController.h; sourceTree = "<group>"; }; + C395F1710F80A85700E7D2F2 /* TextEncodingController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TextEncodingController.m; sourceTree = "<group>"; }; + C395F1730F80A89E00E7D2F2 /* textencoding.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = textencoding.plist; sourceTree = "<group>"; }; C3A4981F0EDBDF4400997EF0 /* zoomtofit.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = zoomtofit.png; path = images/zoomtofit.png; sourceTree = "<group>"; }; C3A499BA0EDC4ED300997EF0 /* spine.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = spine.png; path = images/spine.png; sourceTree = "<group>"; }; C3A64BDD0EDD077500B36D26 /* navbar.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = navbar.png; sourceTree = "<group>"; }; @@ -316,6 +328,7 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + C395F1730F80A89E00E7D2F2 /* textencoding.plist */, C3FB6D9F0ED82D6C0043ABCF /* doc */, C37577480EB7695900A85FC6 /* about.xib */, C32D58D30EA3AA6D002D02DC /* FileManager */, @@ -328,6 +341,7 @@ C32D58470EA39502002D02DC /* FileManager.xib */, C37577B10EB776EF00A85FC6 /* credits.plist */, C3FB6DDE0ED82E5F0043ABCF /* Help.xib */, + C395F11A0F8099B500E7D2F2 /* DocumentSetting.xib */, ); name = Resources; sourceTree = "<group>"; @@ -403,6 +417,7 @@ C3EAB7D80E9DC59E00268541 /* images */ = { isa = PBXGroup; children = ( + C395F1210F809CD500E7D2F2 /* option.png */, C3EE72BA0F544933001BAF49 /* zoom-out.png */, C3EE72BB0F544933001BAF49 /* zoom-in.png */, C3A499BA0EDC4ED300997EF0 /* spine.png */, @@ -440,6 +455,10 @@ C39367EA0E9CBBD3001EA28D /* CHMBrowserController.m */, C3EAB9B00E9E2F3300268541 /* IndexController.h */, C3EAB9B10E9E2F3300268541 /* IndexController.m */, + C395F11D0F8099E300E7D2F2 /* DocumentSettingController.h */, + C395F11E0F8099E300E7D2F2 /* DocumentSettingController.m */, + C395F1700F80A85700E7D2F2 /* TextEncodingController.h */, + C395F1710F80A85700E7D2F2 /* TextEncodingController.m */, ); name = chm; sourceTree = "<group>"; @@ -555,6 +574,9 @@ C3A499BB0EDC4ED300997EF0 /* spine.png in Resources */, C3EE72BC0F544933001BAF49 /* zoom-out.png in Resources */, C3EE72BD0F544933001BAF49 /* zoom-in.png in Resources */, + C395F11B0F8099B500E7D2F2 /* DocumentSetting.xib in Resources */, + C395F1220F809CD500E7D2F2 /* option.png in Resources */, + C395F1740F80A89E00E7D2F2 /* textencoding.plist in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -605,6 +627,8 @@ C3F11F440EA86E14004B4B46 /* FileResource.m in Sources */, C37577520EB76D6E00A85FC6 /* AboutPageController.m in Sources */, C3FB6DE30ED82E900043ABCF /* HelpViewController.m in Sources */, + C395F11F0F8099E300E7D2F2 /* DocumentSettingController.m in Sources */, + C395F1720F80A85700E7D2F2 /* TextEncodingController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; iChm.xcodeproj/project.pbxproj 044b385ec6fd8a17f5a822438a5fa19cc908380c Robin Lu iamawalrus@gmail.com http://github.com/robin/ichm-m/commit/95475bd6cad9e1c18a084f3588bb9b6aee285f2c 95475bd6cad9e1c18a084f3588bb9b6aee285f2c 2009-03-30T01:00:36-07:00 2009-03-30T01:00:36-07:00 set text encoding 53d09ea2771bf0ffff98fc3a7654356807950a13 Robin Lu iamawalrus@gmail.com