AboutViewController.h AboutViewController.m aboutView.html aboutView.xib clockwiseLogo.png @@ -29,17 +29,20 @@ - (void)awakeFromNib { [self createEditableCopyOfDatabaseIfNeeded]; [self initializeDatabase]; - [self initializeWords:self.englishWords language:ENG_LANGUAGE]; - [self initializeWords:self.swedishWords language:SWE_LANGUAGE]; +// [self initializeWords:self.englishWords language:ENG_LANGUAGE]; +// [self initializeWords:self.swedishWords language:SWE_LANGUAGE]; // default state of Swedish to English // TODO: change this to be saved via NSCoding to save state of the app - self.swedishToEnglish = YES; - self.currentWords = self.swedishWords; // point our current list to the Swedish words + // for now this will lazy load the Swedish words first + self.swedishToEnglish = NO; + [self toggleSwedishToEnglish]; } - (void)applicationDidReceiveMemoryWarning:(UIApplication *)application { +#ifdef DEBUG NSLog(@"MEMORY WARNING"); +#endif for (NSString *letter in swedishWords) { [[swedishWords objectForKey:letter] makeObjectsPerformSelector:@selector(dehydrate)]; } @@ -52,16 +55,21 @@ // toggle the language, point our current words to the right dictionary if (self.swedishToEnglish) { self.swedishToEnglish = NO; + if (self.englishWords == nil) { + [self initializeWords:self.englishWords language:ENG_LANGUAGE]; + } self.currentWords = self.englishWords; } else { self.swedishToEnglish = YES; + if (self.swedishWords == nil) { + [self initializeWords:self.swedishWords language:SWE_LANGUAGE]; + } self.currentWords = self.swedishWords; } return self.swedishToEnglish; } - - (void)dealloc { [window release]; [navigationController release]; @@ -71,7 +79,6 @@ [super dealloc]; } - - (void)createEditableCopyOfDatabaseIfNeeded { // this came from SQLite Books example app // First, test for existence. @@ -111,17 +118,23 @@ Word *myWord = [wordsForSection objectAtIndex:index]; if ([database executeUpdate:@"DELETE FROM words WHERE word = ? AND lang = ?", myWord.word, [NSNumber numberWithInt:myWord.lang]]) { +#ifdef DEBUG NSLog(@"Deleted word from database"); +#endif } else { +#ifdef DEBUG NSLog(@"unable to delete %@ from database", myWord); +#endif } [wordsForSection removeObjectAtIndex:index]; } - (void)addWordToDictionary:(NSMutableDictionary *)words word:(Word *)newWord andDatabase:(BOOL) andDatabase { +#ifdef DEBUG NSLog(@"in Add Word to Dictionary %d", andDatabase); +#endif // get a pointer to the array for the letter this word belongs to NSMutableArray *wordsForLetter = [words objectForKey:newWord.letter]; // if we don't have an array set yet, create it. @@ -139,12 +152,16 @@ if (index == NSNotFound) { // add the word to the array [wordsForLetter addObject:newWord]; +#ifdef DEBUG NSLog(@"new Word"); +#endif } else { // this word was already in the wordList, update the word object [[wordsForLetter objectAtIndex:index] setTranslation:newWord.translation]; +#ifdef DEBUG NSLog(@"update translation"); +#endif } } @@ -154,10 +171,14 @@ newWord.word = [newWord.word capitalizedString]; if ([database executeUpdate:@"REPLACE INTO words(word, lang, translation) VALUES(?, ?, ?)", [newWord.word capitalizedString], [NSNumber numberWithInt:newWord.lang], newWord.translation]) { +#ifdef DEBUG NSLog(@"Added word to database too"); +#endif } else { +#ifdef DEBUG NSLog(@"Error adding word to database"); +#endif } } Classes/LexikonAppDelegate.m @@ -9,7 +9,7 @@ #import <UIKit/UIKit.h> #import <Foundation/Foundation.h> -@class DetailViewController, Word; +@class DetailViewController, Word, AboutViewController; @interface MainViewController : UITableViewController <UISearchBarDelegate> { IBOutlet UITableView *tableView; @@ -26,6 +26,7 @@ @property (nonatomic, retain) NSMutableArray *indexLetters; - (IBAction)switchLanguage:(id)sender; +- (IBAction)showAbout:(id)sender; - (void)changeIndexLetters:(BOOL) swedish; - (void)viewWord:(Word *) word; Classes/MainViewController.h @@ -10,6 +10,7 @@ #import "Word.h" #import "LexikonAppDelegate.h" #import "DetailViewController.h" +#import "AboutViewController.h" @implementation MainViewController @@ -70,11 +71,11 @@ [self.tableView reloadData]; } -- (void)showAbout { -// UIViewController *targetViewController = [[menuList objectAtIndex: indexPath.row] objectForKey:kViewControllerKey]; -// if (targetViewController == nil) -// -// [[self navigationController] pushViewController:targetViewController animated:YES]; +- (IBAction)showAbout:(id)sender { + AboutViewController *aboutViewController = [[AboutViewController alloc] initWithNibName:@"aboutView" bundle:nil]; + [[self navigationController] pushViewController:aboutViewController animated: YES]; + self.navigationController.navigationBarHidden = NO; + [aboutViewController release]; } @@ -207,7 +208,8 @@ // NSLog(@"%@", word.translation); // detailViewController.html = [detailViewController.html stringByReplacingOccurrencesOfString:@"{yield}" withString:word.translation]; - [self.navigationController pushViewController:detailViewController animated:YES]; + [self.navigationController pushViewController:detailViewController animated:YES]; + self.navigationItem.leftBarButtonItem.title = @"Back"; } - (NSIndexPath *)tableView:(UITableView *)tableView willSelectRowAtIndexPath:(NSIndexPath *)indexPath { @@ -263,9 +265,11 @@ - (void)hideIndex:(BOOL) hide { CGFloat factor = (hide) ? 30.0 : -30.0; - + +#ifdef DEBUG LexikonAppDelegate *appDelegate = (LexikonAppDelegate *)[[UIApplication sharedApplication] delegate]; NSLog(@"# of word arrays %d", [appDelegate.currentWords count]); +#endif UIBarButtonItem *buttonItem; // change the About button to a done button @@ -275,7 +279,7 @@ } else { tableView.sectionIndexMinimumDisplayRowCount = 1; - buttonItem = [[UIBarButtonItem alloc] initWithTitle:@"About" style:UIBarButtonItemStylePlain target:self action:@selector(showAbout)]; + buttonItem = [[UIBarButtonItem alloc] initWithTitle:@"About" style:UIBarButtonItemStylePlain target:self action:@selector(showAbout:)]; } self.navigationItem.rightBarButtonItem = buttonItem; @@ -301,7 +305,9 @@ } - (void)searchBarSearchButtonClicked:(UISearchBar *)searchBar { +#ifdef DEBUG NSLog(@"searching button clicked %@", searchBar); +#endif [searchBar resignFirstResponder]; LexikonAppDelegate *appDelegate = (LexikonAppDelegate *)[[UIApplication sharedApplication] delegate]; @@ -336,8 +342,9 @@ NSRange myRange; myRange.location = start.location; myRange.length = end.location - start.location; +#ifdef DEBUG NSLog(@"start: %d end: %d", start.location, end.location); - +#endif translation = [translation substringWithRange: myRange]; Word *newWord = [[Word alloc] init]; @@ -346,7 +353,9 @@ newWord.translation = translation; [appDelegate addWordToDictionary:appDelegate.currentWords word:newWord andDatabase:YES]; +#ifdef DEBUG NSLog(@"added now show"); +#endif [self viewWord:newWord]; } else { @@ -356,7 +365,8 @@ } else { // display error message alerting the user that we were not able to contact the Lexin website - [self searchFailed:[NSString stringWithFormat:@"%@ %@", [myError localizedDescription], [myError localizedFailureReason]]]; + [self searchFailed:@"Unable to reach the Lexin website"]; + //[NSString stringWithFormat:@"%@ %@", [myError localizedDescription], [myError localizedFailureReason]]]; } // hide the activity indicator Classes/MainViewController.m @@ -23,7 +23,7 @@ <key>CFBundleSignature</key> <string>????</string> <key>CFBundleVersion</key> - <string>3</string> + <string>5</string> <key>CFBundleShortVersionString</key> <string>0.9</string> <key>LSRequiresIPhoneOS</key> Info.plist @@ -228,8 +228,6 @@ <key>Layout</key> <array> <dict> - <key>BecomeActive</key> - <true/> <key>ContentConfiguration</key> <dict> <key>PBXBottomSmartGroupGIDs</key> @@ -277,13 +275,13 @@ <key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key> <array> <array> - <integer>16</integer> - <integer>15</integer> + <integer>10</integer> + <integer>1</integer> <integer>0</integer> </array> </array> <key>PBXSmartGroupTreeModuleOutlineStateVisibleRectKey</key> - <string>{{0, 0}, {246, 694}}</string> + <string>{{0, 3}, {246, 694}}</string> </dict> <key>PBXTopSmartGroupGIDs</key> <array/> @@ -302,7 +300,7 @@ <real>246</real> </array> <key>RubberWindowFrame</key> - <string>209 125 1175 753 0 0 1440 878 </string> + <string>269 125 1175 753 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXSmartGroupTreeModule</string> @@ -313,12 +311,14 @@ <key>Dock</key> <array> <dict> + <key>BecomeActive</key> + <true/> <key>ContentConfiguration</key> <dict> <key>PBXProjectModuleGUID</key> <string>1CE0B20306471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>Default.png</string> + <string>LexikonAppDelegate.m</string> <key>PBXSplitModuleInNavigatorKey</key> <dict> <key>Split0</key> @@ -326,11 +326,11 @@ <key>PBXProjectModuleGUID</key> <string>1CE0B20406471E060097A5F4</string> <key>PBXProjectModuleLabel</key> - <string>Default.png</string> + <string>LexikonAppDelegate.m</string> <key>_historyCapacity</key> <integer>0</integer> <key>bookmark</key> - <string>3C52BB570F0EB81B006C34C1</string> + <string>3CDAED680F10070D000A0C6E</string> <key>history</key> <array> <string>3CE4FBD00EBB21220088EBD7</string> @@ -339,24 +339,28 @@ <string>3C087C4D0EC514920057FF2A</string> <string>3C20A1EE0ECC6876003F3BBC</string> <string>3C2DCE970ED0C9CB00999424</string> - <string>3C2DCE980ED0C9CB00999424</string> <string>3C19A8A10ED8B73C002BD365</string> <string>3C09108E0EDCAA2200A982E9</string> <string>3C09113C0EDCBABF00A982E9</string> <string>3CB045910EE97B8800636A0E</string> <string>3CB045920EE97B8800636A0E</string> - <string>3CB045F90EE9D0D200636A0E</string> - <string>3CB9C8A50EED758E001753BD</string> - <string>3C51BA8E0F0E634800E0E651</string> <string>3C51BA8F0F0E634800E0E651</string> <string>3C51BA900F0E634800E0E651</string> - <string>3C51BA910F0E634800E0E651</string> <string>3C51BA920F0E634800E0E651</string> - <string>3C52BB260F0E6D98006C34C1</string> - <string>3C52BB270F0E6D98006C34C1</string> - <string>3C52BB280F0E6D98006C34C1</string> - <string>3C52BB220F0E6D8B006C34C1</string> - <string>3C52BB560F0EB81B006C34C1</string> + <string>3C5E3E2F0F0EC836006B039D</string> + <string>3CDAEC5F0F0FEC21000A0C6E</string> + <string>3CDAEC710F0FF16B000A0C6E</string> + <string>3CDAEC720F0FF16B000A0C6E</string> + <string>3CDAEC730F0FF16B000A0C6E</string> + <string>3CDAEC740F0FF16B000A0C6E</string> + <string>3CDAEC750F0FF16B000A0C6E</string> + <string>3CDAECBE0F0FF3FD000A0C6E</string> + <string>3CDAED300F10024D000A0C6E</string> + <string>3CDAED4E0F10059B000A0C6E</string> + <string>3CDAED4F0F10059B000A0C6E</string> + <string>3CDAED500F10059B000A0C6E</string> + <string>3CDAED650F10070D000A0C6E</string> + <string>3CDAED660F10070D000A0C6E</string> </array> <key>prevStack</key> <array> @@ -383,6 +387,12 @@ <string>3C1455080EEC3A0500314717</string> <string>3C14550B0EEC3A0500314717</string> <string>3CB9C8AC0EED758E001753BD</string> + <string>3C5E3E330F0EC836006B039D</string> + <string>3CDAEC7D0F0FF16B000A0C6E</string> + <string>3CDAEC7F0F0FF16B000A0C6E</string> + <string>3CDAEC810F0FF16B000A0C6E</string> + <string>3CDAEC830F0FF16B000A0C6E</string> + <string>3CDAED670F10070D000A0C6E</string> </array> </dict> <key>SplitCount</key> @@ -396,7 +406,7 @@ <key>Frame</key> <string>{{0, 0}, {907, 558}}</string> <key>RubberWindowFrame</key> - <string>209 125 1175 753 0 0 1440 878 </string> + <string>269 125 1175 753 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXNavigatorGroup</string> @@ -416,7 +426,7 @@ <key>Frame</key> <string>{{0, 563}, {907, 149}}</string> <key>RubberWindowFrame</key> - <string>209 125 1175 753 0 0 1440 878 </string> + <string>269 125 1175 753 0 0 1440 878 </string> </dict> <key>Module</key> <string>XCDetailModule</string> @@ -440,9 +450,9 @@ </array> <key>TableOfContents</key> <array> - <string>3C52BB460F0EB68A006C34C1</string> + <string>3CDAED690F10070D000A0C6E</string> <string>1CE0B1FE06471DED0097A5F4</string> - <string>3C52BB470F0EB68A006C34C1</string> + <string>3CDAED6A0F10070D000A0C6E</string> <string>1CE0B20306471E060097A5F4</string> <string>1CE0B20506471E060097A5F4</string> </array> @@ -576,15 +586,13 @@ <integer>5</integer> <key>WindowOrderList</key> <array> - <string>3C52BB580F0EB81B006C34C1</string> - <string>3C52BB590F0EB81B006C34C1</string> - <string>1C78EAAD065D492600B07095</string> <string>1CD10A99069EF8BA00B06720</string> <string>3C5615CC0EBB3A4E008FB33F</string> + <string>1C78EAAD065D492600B07095</string> <string>/Users/caleb/src/Lexikon/Lexikon_v2/Lexikon.xcodeproj</string> </array> <key>WindowString</key> - <string>209 125 1175 753 0 0 1440 878 </string> + <string>269 125 1175 753 0 0 1440 878 </string> <key>WindowToolsV3</key> <array> <dict> @@ -661,7 +669,7 @@ <key>TableOfContents</key> <array> <string>3C5615CC0EBB3A4E008FB33F</string> - <string>3C52BB4E0F0EB809006C34C1</string> + <string>3CDAED6B0F10070D000A0C6E</string> <string>1CD0528F0623707200166675</string> <string>XCMainBuildResultsModuleGUID</string> </array> @@ -781,13 +789,13 @@ <key>TableOfContents</key> <array> <string>1CD10A99069EF8BA00B06720</string> - <string>3C52BB4F0F0EB809006C34C1</string> + <string>3CDAED6C0F10070D000A0C6E</string> <string>1C162984064C10D400B95A72</string> - <string>3C52BB500F0EB809006C34C1</string> - <string>3C52BB510F0EB809006C34C1</string> - <string>3C52BB520F0EB809006C34C1</string> - <string>3C52BB530F0EB809006C34C1</string> - <string>3C52BB540F0EB809006C34C1</string> + <string>3CDAED6D0F10070D000A0C6E</string> + <string>3CDAED6E0F10070D000A0C6E</string> + <string>3CDAED6F0F10070D000A0C6E</string> + <string>3CDAED700F10070D000A0C6E</string> + <string>3CDAED710F10070D000A0C6E</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.debugV3</string> @@ -928,7 +936,7 @@ <key>Frame</key> <string>{{0, 0}, {808, 636}}</string> <key>RubberWindowFrame</key> - <string>702 151 808 677 0 0 1440 878 </string> + <string>631 157 808 677 0 0 1440 878 </string> </dict> <key>Module</key> <string>PBXDebugCLIModule</string> @@ -951,17 +959,17 @@ <key>TableOfContents</key> <array> <string>1C78EAAD065D492600B07095</string> - <string>3C52BB550F0EB809006C34C1</string> + <string>3CDAED720F10070D000A0C6E</string> <string>1C78EAAC065D492600B07095</string> </array> <key>ToolbarConfiguration</key> <string>xcode.toolbar.config.consoleV3</string> <key>WindowString</key> - <string>702 151 808 677 0 0 1440 878 </string> + <string>631 157 808 677 0 0 1440 878 </string> <key>WindowToolGUID</key> <string>1C78EAAD065D492600B07095</string> <key>WindowToolIsVisible</key> - <false/> + <true/> </dict> <dict> <key>Identifier</key> Lexikon.xcodeproj/caleb.mode1v3 @@ -9,9 +9,9 @@ }; 1D3623250D0F684500981E51 /* LexikonAppDelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1164, 2112}}"; - sepNavSelRange = "{83, 50}"; - sepNavVisRange = "{5144, 1472}"; + sepNavIntBoundsRect = "{{0, 0}, {846, 2464}}"; + sepNavSelRange = "{2066, 0}"; + sepNavVisRange = "{941, 1471}"; sepNavWindowFrame = "{{15, 315}, {750, 558}}"; }; }; @@ -22,9 +22,9 @@ ); }; 29B97313FDCFA39411CA2CEA /* Project object */ = { - activeBuildConfigurationName = Release; + activeBuildConfigurationName = Debug; activeExecutable = 3CE4FB0D0EB9FB0F0088EBD7 /* Lexikon */; - activeSDKPreference = iphoneos2.1; + activeSDKPreference = iphonesimulator2.1; activeTarget = 1D6058900D05DD3D006BFB54 /* Lexikon */; addToTargets = ( 1D6058900D05DD3D006BFB54 /* Lexikon */, @@ -80,8 +80,8 @@ PBXFileDataSource_Warnings_ColumnID, ); }; - PBXPerProjectTemplateStateSaveDate = 252622468; - PBXWorkspaceStateSaveDate = 252622468; + PBXPerProjectTemplateStateSaveDate = 252708440; + PBXWorkspaceStateSaveDate = 252708440; }; perUserProjectItems = { 3C087C4B0EC514920057FF2A /* PBXTextBookmark */ = 3C087C4B0EC514920057FF2A /* PBXTextBookmark */; @@ -99,30 +99,40 @@ 3C19A8A10ED8B73C002BD365 /* PBXTextBookmark */ = 3C19A8A10ED8B73C002BD365 /* PBXTextBookmark */; 3C20A1EE0ECC6876003F3BBC /* PBXTextBookmark */ = 3C20A1EE0ECC6876003F3BBC /* PBXTextBookmark */; 3C2DCE970ED0C9CB00999424 /* PBXTextBookmark */ = 3C2DCE970ED0C9CB00999424 /* PBXTextBookmark */; - 3C2DCE980ED0C9CB00999424 /* PBXTextBookmark */ = 3C2DCE980ED0C9CB00999424 /* PBXTextBookmark */; 3C2DCE9E0ED0C9CB00999424 /* PBXTextBookmark */ = 3C2DCE9E0ED0C9CB00999424 /* PBXTextBookmark */; 3C2DCE9F0ED0C9CB00999424 /* PBXTextBookmark */ = 3C2DCE9F0ED0C9CB00999424 /* PBXTextBookmark */; - 3C51BA8E0F0E634800E0E651 /* PBXTextBookmark */ = 3C51BA8E0F0E634800E0E651 /* PBXTextBookmark */; 3C51BA8F0F0E634800E0E651 /* PBXTextBookmark */ = 3C51BA8F0F0E634800E0E651 /* PBXTextBookmark */; 3C51BA900F0E634800E0E651 /* PBXTextBookmark */ = 3C51BA900F0E634800E0E651 /* PBXTextBookmark */; - 3C51BA910F0E634800E0E651 /* PBXTextBookmark */ = 3C51BA910F0E634800E0E651 /* PBXTextBookmark */; 3C51BA920F0E634800E0E651 /* PBXTextBookmark */ = 3C51BA920F0E634800E0E651 /* PBXTextBookmark */; - 3C52BB220F0E6D8B006C34C1 /* PBXTextBookmark */ = 3C52BB220F0E6D8B006C34C1 /* PBXTextBookmark */; - 3C52BB260F0E6D98006C34C1 /* PlistBookmark */ = 3C52BB260F0E6D98006C34C1 /* PlistBookmark */; - 3C52BB270F0E6D98006C34C1 /* PBXTextBookmark */ = 3C52BB270F0E6D98006C34C1 /* PBXTextBookmark */; - 3C52BB280F0E6D98006C34C1 /* PBXTextBookmark */ = 3C52BB280F0E6D98006C34C1 /* PBXTextBookmark */; - 3C52BB560F0EB81B006C34C1 /* PBXBookmark */ = 3C52BB560F0EB81B006C34C1 /* PBXBookmark */; - 3C52BB570F0EB81B006C34C1 /* PBXBookmark */ = 3C52BB570F0EB81B006C34C1 /* PBXBookmark */; 3C5615D60EBB3A75008FB33F /* PBXTextBookmark */ = 3C5615D60EBB3A75008FB33F /* PBXTextBookmark */; + 3C5E3E2F0F0EC836006B039D /* PBXBookmark */ = 3C5E3E2F0F0EC836006B039D /* PBXBookmark */; + 3C5E3E330F0EC836006B039D /* PBXBookmark */ = 3C5E3E330F0EC836006B039D /* PBXBookmark */; 3CAD0D510EE84DAC003C1C97 /* PBXTextBookmark */ = 3CAD0D510EE84DAC003C1C97 /* PBXTextBookmark */; 3CB045910EE97B8800636A0E /* PBXTextBookmark */ = 3CB045910EE97B8800636A0E /* PBXTextBookmark */; 3CB045920EE97B8800636A0E /* PBXTextBookmark */ = 3CB045920EE97B8800636A0E /* PBXTextBookmark */; 3CB045AF0EE97B8800636A0E /* PBXTextBookmark */ = 3CB045AF0EE97B8800636A0E /* PBXTextBookmark */; 3CB045B00EE97B8800636A0E /* PBXTextBookmark */ = 3CB045B00EE97B8800636A0E /* PBXTextBookmark */; - 3CB045F90EE9D0D200636A0E /* PBXBookmark */ = 3CB045F90EE9D0D200636A0E /* PBXBookmark */; 3CB045FE0EE9D0D200636A0E /* PBXBookmark */ = 3CB045FE0EE9D0D200636A0E /* PBXBookmark */; - 3CB9C8A50EED758E001753BD /* PBXTextBookmark */ = 3CB9C8A50EED758E001753BD /* PBXTextBookmark */; 3CB9C8AC0EED758E001753BD /* PBXTextBookmark */ = 3CB9C8AC0EED758E001753BD /* PBXTextBookmark */; + 3CDAEC5F0F0FEC21000A0C6E /* PBXTextBookmark */ = 3CDAEC5F0F0FEC21000A0C6E /* PBXTextBookmark */; + 3CDAEC710F0FF16B000A0C6E /* PBXBookmark */ = 3CDAEC710F0FF16B000A0C6E /* PBXBookmark */; + 3CDAEC720F0FF16B000A0C6E /* PBXBookmark */ = 3CDAEC720F0FF16B000A0C6E /* PBXBookmark */; + 3CDAEC730F0FF16B000A0C6E /* PBXTextBookmark */ = 3CDAEC730F0FF16B000A0C6E /* PBXTextBookmark */; + 3CDAEC740F0FF16B000A0C6E /* PlistBookmark */ = 3CDAEC740F0FF16B000A0C6E /* PlistBookmark */; + 3CDAEC750F0FF16B000A0C6E /* PBXTextBookmark */ = 3CDAEC750F0FF16B000A0C6E /* PBXTextBookmark */; + 3CDAEC7D0F0FF16B000A0C6E /* PBXBookmark */ = 3CDAEC7D0F0FF16B000A0C6E /* PBXBookmark */; + 3CDAEC7F0F0FF16B000A0C6E /* PBXTextBookmark */ = 3CDAEC7F0F0FF16B000A0C6E /* PBXTextBookmark */; + 3CDAEC810F0FF16B000A0C6E /* PBXTextBookmark */ = 3CDAEC810F0FF16B000A0C6E /* PBXTextBookmark */; + 3CDAEC830F0FF16B000A0C6E /* PBXTextBookmark */ = 3CDAEC830F0FF16B000A0C6E /* PBXTextBookmark */; + 3CDAECBE0F0FF3FD000A0C6E /* PBXTextBookmark */ = 3CDAECBE0F0FF3FD000A0C6E /* PBXTextBookmark */; + 3CDAED300F10024D000A0C6E /* PBXTextBookmark */ = 3CDAED300F10024D000A0C6E /* PBXTextBookmark */; + 3CDAED4E0F10059B000A0C6E /* PBXTextBookmark */ = 3CDAED4E0F10059B000A0C6E /* PBXTextBookmark */; + 3CDAED4F0F10059B000A0C6E /* PBXTextBookmark */ = 3CDAED4F0F10059B000A0C6E /* PBXTextBookmark */; + 3CDAED500F10059B000A0C6E /* PBXTextBookmark */ = 3CDAED500F10059B000A0C6E /* PBXTextBookmark */; + 3CDAED650F10070D000A0C6E /* PBXTextBookmark */ = 3CDAED650F10070D000A0C6E /* PBXTextBookmark */; + 3CDAED660F10070D000A0C6E /* PBXTextBookmark */ = 3CDAED660F10070D000A0C6E /* PBXTextBookmark */; + 3CDAED670F10070D000A0C6E /* PBXTextBookmark */ = 3CDAED670F10070D000A0C6E /* PBXTextBookmark */; + 3CDAED680F10070D000A0C6E /* PBXTextBookmark */ = 3CDAED680F10070D000A0C6E /* PBXTextBookmark */; 3CE4FBD00EBB21220088EBD7 /* PBXTextBookmark */ = 3CE4FBD00EBB21220088EBD7 /* PBXTextBookmark */; 3CE4FBD20EBB21220088EBD7 /* PBXTextBookmark */ = 3CE4FBD20EBB21220088EBD7 /* PBXTextBookmark */; 3CE4FBD50EBB21220088EBD7 /* PBXTextBookmark */ = 3CE4FBD50EBB21220088EBD7 /* PBXTextBookmark */; @@ -139,8 +149,8 @@ }; 29B97316FDCFA39411CA2CEA /* main.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {922, 261}}"; - sepNavSelRange = "{262, 0}"; + sepNavIntBoundsRect = "{{0, 0}, {846, 526}}"; + sepNavSelRange = "{360, 0}"; sepNavVisRange = "{0, 361}"; }; }; @@ -365,16 +375,6 @@ vrLen = 183; vrLoc = 0; }; - 3C2DCE980ED0C9CB00999424 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 29B97316FDCFA39411CA2CEA /* main.m */; - name = "main.m: 1"; - rLen = 0; - rLoc = 0; - rType = 0; - vrLen = 361; - vrLoc = 0; - }; 3C2DCE9E0ED0C9CB00999424 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 32CA4F630368D1EE00C91783 /* Lexikon_Prefix.pch */; @@ -395,16 +395,6 @@ vrLen = 361; vrLoc = 0; }; - 3C51BA8E0F0E634800E0E651 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 1D3623240D0F684500981E51 /* LexikonAppDelegate.h */; - name = "LexikonAppDelegate.h: 7"; - rLen = 0; - rLoc = 133; - rType = 0; - vrLen = 1363; - vrLoc = 0; - }; 3C51BA8F0F0E634800E0E651 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3CF7D6550EE555120086D98C /* Word.m */; @@ -425,16 +415,6 @@ vrLen = 971; vrLoc = 0; }; - 3C51BA910F0E634800E0E651 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 3CAD0D440EE7EFBB003C1C97 /* DetailViewController.m */; - name = "DetailViewController.m: 7"; - rLen = 0; - rLoc = 134; - rType = 0; - vrLen = 1028; - vrLoc = 0; - }; 3C51BA920F0E634800E0E651 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3CAD0D430EE7EFBB003C1C97 /* DetailViewController.h */; @@ -445,64 +425,24 @@ vrLen = 424; vrLoc = 0; }; - 3C52BB220F0E6D8B006C34C1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - comments = "error: syntax error before '-' token"; - fRef = 3CF7D6520EE555120086D98C /* MainViewController.h */; - rLen = 1; - rLoc = 33; - rType = 1; - }; - 3C52BB260F0E6D98006C34C1 /* PlistBookmark */ = { - isa = PlistBookmark; - fRef = 8D1107310486CEB800E47090 /* Info.plist */; - fallbackIsa = PBXBookmark; - isK = 0; - kPath = ( - LSRequiresIPhoneOS, - ); - name = /Users/caleb/src/Lexikon/Lexikon_v2/Info.plist; - rLen = 0; - rLoc = 2147483647; - }; - 3C52BB270F0E6D98006C34C1 /* PBXTextBookmark */ = { + 3C5615D60EBB3A75008FB33F /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 1D3623250D0F684500981E51 /* LexikonAppDelegate.m */; - name = "LexikonAppDelegate.m: 6"; - rLen = 50; - rLoc = 83; - rType = 0; - vrLen = 1472; - vrLoc = 5144; - }; - 3C52BB280F0E6D98006C34C1 /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 3CF7D6530EE555120086D98C /* MainViewController.m */; - name = "MainViewController.m: 375"; + name = "LexikonAppDelegate.m: 8"; rLen = 0; - rLoc = 13898; + rLoc = 136; rType = 0; - vrLen = 1871; - vrLoc = 12033; + vrLen = 467; + vrLoc = 0; }; - 3C52BB560F0EB81B006C34C1 /* PBXBookmark */ = { + 3C5E3E2F0F0EC836006B039D /* PBXBookmark */ = { isa = PBXBookmark; fRef = 3C52BB480F0EB69D006C34C1 /* Default.png */; }; - 3C52BB570F0EB81B006C34C1 /* PBXBookmark */ = { + 3C5E3E330F0EC836006B039D /* PBXBookmark */ = { isa = PBXBookmark; fRef = 3C52BB480F0EB69D006C34C1 /* Default.png */; }; - 3C5615D60EBB3A75008FB33F /* PBXTextBookmark */ = { - isa = PBXTextBookmark; - fRef = 1D3623250D0F684500981E51 /* LexikonAppDelegate.m */; - name = "LexikonAppDelegate.m: 8"; - rLen = 0; - rLoc = 136; - rType = 0; - vrLen = 467; - vrLoc = 0; - }; 3CAD0D430EE7EFBB003C1C97 /* DetailViewController.h */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {846, 526}}"; @@ -513,8 +453,8 @@ 3CAD0D440EE7EFBB003C1C97 /* DetailViewController.m */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {846, 539}}"; - sepNavSelRange = "{134, 0}"; - sepNavVisRange = "{0, 1028}"; + sepNavSelRange = "{440, 21}"; + sepNavVisRange = "{0, 1022}"; }; }; 3CAD0D510EE84DAC003C1C97 /* PBXTextBookmark */ = { @@ -567,10 +507,6 @@ vrLen = 1416; vrLoc = 9408; }; - 3CB045F90EE9D0D200636A0E /* PBXBookmark */ = { - isa = PBXBookmark; - fRef = 3C3C29C50EE6DC0800028066 /* Icon.png */; - }; 3CB045FE0EE9D0D200636A0E /* PBXBookmark */ = { isa = PBXBookmark; fRef = 3C3C29C50EE6DC0800028066 /* Icon.png */; @@ -578,11 +514,11 @@ 3CB9C87C0EED4674001753BD /* translationTemplate.html */ = { uiCtxt = { sepNavIntBoundsRect = "{{0, 0}, {846, 526}}"; - sepNavSelRange = "{414, 0}"; - sepNavVisRange = "{0, 423}"; + sepNavSelRange = "{0, 422}"; + sepNavVisRange = "{0, 422}"; }; }; - 3CB9C8A50EED758E001753BD /* PBXTextBookmark */ = { + 3CB9C8AC0EED758E001753BD /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3CB9C87C0EED4674001753BD /* translationTemplate.html */; name = "translationTemplate.html: 21"; @@ -592,16 +528,201 @@ vrLen = 423; vrLoc = 0; }; - 3CB9C8AC0EED758E001753BD /* PBXTextBookmark */ = { + 3CDAEC5F0F0FEC21000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 29B97316FDCFA39411CA2CEA /* main.m */; + name = "main.m: 17"; + rLen = 0; + rLoc = 360; + rType = 0; + vrLen = 361; + vrLoc = 0; + }; + 3CDAEC6B0F0FEE34000A0C6E /* aboutView.html */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {1116, 660}}"; + sepNavSelRange = "{417, 0}"; + sepNavVisRange = "{368, 2541}"; + }; + }; + 3CDAEC6D0F0FEFD6000A0C6E /* AboutViewController.h */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {846, 503}}"; + sepNavSelRange = "{8, 0}"; + sepNavVisRange = "{0, 253}"; + }; + }; + 3CDAEC6E0F0FEFD6000A0C6E /* AboutViewController.m */ = { + uiCtxt = { + sepNavIntBoundsRect = "{{0, 0}, {846, 528}}"; + sepNavSelRange = "{1298, 0}"; + sepNavVisRange = "{0, 1537}"; + }; + }; + 3CDAEC710F0FF16B000A0C6E /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 3C3C29C50EE6DC0800028066 /* Icon.png */; + }; + 3CDAEC720F0FF16B000A0C6E /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 3CDAEC690F0FED5F000A0C6E /* clockwiseLogo.png */; + }; + 3CDAEC730F0FF16B000A0C6E /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 3CB9C87C0EED4674001753BD /* translationTemplate.html */; - name = "translationTemplate.html: 21"; + name = "translationTemplate.html: 1"; + rLen = 422; + rLoc = 0; + rType = 0; + vrLen = 422; + vrLoc = 0; + }; + 3CDAEC740F0FF16B000A0C6E /* PlistBookmark */ = { + isa = PlistBookmark; + fRef = 8D1107310486CEB800E47090 /* Info.plist */; + fallbackIsa = PBXBookmark; + isK = 0; + kPath = ( + CFBundleShortVersionString, + ); + name = /Users/caleb/src/Lexikon/Lexikon_v2/Info.plist; rLen = 0; - rLoc = 414; + rLoc = 2147483647; + }; + 3CDAEC750F0FF16B000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623240D0F684500981E51 /* LexikonAppDelegate.h */; + name = "LexikonAppDelegate.h: 7"; + rLen = 0; + rLoc = 133; rType = 0; - vrLen = 423; + vrLen = 1363; + vrLoc = 0; + }; + 3CDAEC7D0F0FF16B000A0C6E /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 3CDAEC690F0FED5F000A0C6E /* clockwiseLogo.png */; + }; + 3CDAEC7F0F0FF16B000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3CDAEC6B0F0FEE34000A0C6E /* aboutView.html */; + name = "aboutHTML.html: 1"; + rLen = 0; + rLoc = 0; + rType = 0; + vrLen = 2367; + vrLoc = 0; + }; + 3CDAEC810F0FF16B000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3CDAEC6D0F0FEFD6000A0C6E /* AboutViewController.h */; + name = "aboutViewController.h: 13"; + rLen = 0; + rLoc = 244; + rType = 0; + vrLen = 262; + vrLoc = 0; + }; + 3CDAEC830F0FF16B000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3CDAEC6E0F0FEFD6000A0C6E /* AboutViewController.m */; + name = "aboutViewController.m: 22"; + rLen = 0; + rLoc = 1300; + rType = 0; + vrLen = 707; + vrLoc = 0; + }; + 3CDAECBE0F0FF3FD000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3CF7D6520EE555120086D98C /* MainViewController.h */; + name = "MainViewController.h: 29"; + rLen = 33; + rLoc = 745; + rType = 0; + vrLen = 934; + vrLoc = 0; + }; + 3CDAED300F10024D000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3CDAEC6D0F0FEFD6000A0C6E /* AboutViewController.h */; + name = "AboutViewController.h: 2"; + rLen = 0; + rLoc = 8; + rType = 0; + vrLen = 253; + vrLoc = 0; + }; + 3CDAED4E0F10059B000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3CDAEC6B0F0FEE34000A0C6E /* aboutView.html */; + name = "aboutView.html: 16"; + rLen = 0; + rLoc = 417; + rType = 0; + vrLen = 2541; + vrLoc = 368; + }; + 3CDAED4F0F10059B000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3CAD0D440EE7EFBB003C1C97 /* DetailViewController.m */; + name = "DetailViewController.m: 22"; + rLen = 21; + rLoc = 440; + rType = 0; + vrLen = 1022; + vrLoc = 0; + }; + 3CDAED500F10059B000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3CDAEC6E0F0FEFD6000A0C6E /* AboutViewController.m */; + name = "AboutViewController.m: 34"; + rLen = 0; + rLoc = 1298; + rType = 0; + vrLen = 1537; + vrLoc = 0; + }; + 3CDAED650F10070D000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3CF7D6530EE555120086D98C /* MainViewController.m */; + name = "MainViewController.m: 215"; + rLen = 0; + rLoc = 8064; + rType = 0; + vrLen = 1839; + vrLoc = 7102; + }; + 3CDAED660F10070D000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* LexikonAppDelegate.m */; + name = "LexikonAppDelegate.m: 6"; + rLen = 50; + rLoc = 83; + rType = 0; + vrLen = 1481; vrLoc = 0; }; + 3CDAED670F10070D000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 3CF7D6530EE555120086D98C /* MainViewController.m */; + name = "MainViewController.m: 215"; + rLen = 0; + rLoc = 8064; + rType = 0; + vrLen = 1839; + vrLoc = 7102; + }; + 3CDAED680F10070D000A0C6E /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 1D3623250D0F684500981E51 /* LexikonAppDelegate.m */; + name = "LexikonAppDelegate.m: 68"; + rLen = 0; + rLoc = 2066; + rType = 0; + vrLen = 1471; + vrLoc = 941; + }; 3CE4FB0D0EB9FB0F0088EBD7 /* Lexikon */ = { isa = PBXExecutable; activeArgIndices = ( @@ -735,16 +856,16 @@ }; 3CF7D6520EE555120086D98C /* MainViewController.h */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {846, 526}}"; - sepNavSelRange = "{684, 0}"; - sepNavVisRange = "{0, 879}"; + sepNavIntBoundsRect = "{{0, 0}, {846, 503}}"; + sepNavSelRange = "{745, 33}"; + sepNavVisRange = "{0, 934}"; }; }; 3CF7D6530EE555120086D98C /* MainViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {1224, 4191}}"; - sepNavSelRange = "{13898, 0}"; - sepNavVisRange = "{12033, 1871}"; + sepNavIntBoundsRect = "{{0, 0}, {1404, 4213}}"; + sepNavSelRange = "{8064, 0}"; + sepNavVisRange = "{7102, 1839}"; }; }; 3CF7D6540EE555120086D98C /* Word.h */ = { Lexikon.xcodeproj/caleb.pbxuser @@ -19,6 +19,10 @@ 3C7E70890ED5F2B50022B3A9 /* database.sqlite3 in Resources */ = {isa = PBXBuildFile; fileRef = 3C7E70880ED5F2B50022B3A9 /* database.sqlite3 */; }; 3CAD0D450EE7EFBB003C1C97 /* DetailViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CAD0D440EE7EFBB003C1C97 /* DetailViewController.m */; }; 3CB9C87D0EED4674001753BD /* translationTemplate.html in Resources */ = {isa = PBXBuildFile; fileRef = 3CB9C87C0EED4674001753BD /* translationTemplate.html */; }; + 3CDAEC670F0FECB2000A0C6E /* aboutView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 3CDAEC660F0FECB2000A0C6E /* aboutView.xib */; }; + 3CDAEC6A0F0FED5F000A0C6E /* clockwiseLogo.png in Resources */ = {isa = PBXBuildFile; fileRef = 3CDAEC690F0FED5F000A0C6E /* clockwiseLogo.png */; }; + 3CDAEC6C0F0FEE34000A0C6E /* aboutView.html in Resources */ = {isa = PBXBuildFile; fileRef = 3CDAEC6B0F0FEE34000A0C6E /* aboutView.html */; }; + 3CDAEC6F0F0FEFD6000A0C6E /* AboutViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CDAEC6E0F0FEFD6000A0C6E /* AboutViewController.m */; }; 3CF7D64E0EE555030086D98C /* FMDatabase.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CF7D6480EE555030086D98C /* FMDatabase.m */; }; 3CF7D64F0EE555030086D98C /* FMDatabaseAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CF7D64A0EE555030086D98C /* FMDatabaseAdditions.m */; }; 3CF7D6500EE555030086D98C /* FMResultSet.m in Sources */ = {isa = PBXBuildFile; fileRef = 3CF7D64C0EE555030086D98C /* FMResultSet.m */; }; @@ -44,6 +48,11 @@ 3CAD0D430EE7EFBB003C1C97 /* DetailViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DetailViewController.h; path = Classes/DetailViewController.h; sourceTree = "<group>"; }; 3CAD0D440EE7EFBB003C1C97 /* DetailViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DetailViewController.m; path = Classes/DetailViewController.m; sourceTree = "<group>"; }; 3CB9C87C0EED4674001753BD /* translationTemplate.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = translationTemplate.html; sourceTree = "<group>"; }; + 3CDAEC660F0FECB2000A0C6E /* aboutView.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = aboutView.xib; sourceTree = "<group>"; }; + 3CDAEC690F0FED5F000A0C6E /* clockwiseLogo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = clockwiseLogo.png; sourceTree = "<group>"; }; + 3CDAEC6B0F0FEE34000A0C6E /* aboutView.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = aboutView.html; sourceTree = "<group>"; }; + 3CDAEC6D0F0FEFD6000A0C6E /* AboutViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AboutViewController.h; sourceTree = "<group>"; }; + 3CDAEC6E0F0FEFD6000A0C6E /* AboutViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AboutViewController.m; sourceTree = "<group>"; }; 3CF7D6470EE555030086D98C /* FMDatabase.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMDatabase.h; path = Classes/FMDatabase.h; sourceTree = "<group>"; }; 3CF7D6480EE555030086D98C /* FMDatabase.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FMDatabase.m; path = Classes/FMDatabase.m; sourceTree = "<group>"; }; 3CF7D6490EE555030086D98C /* FMDatabaseAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FMDatabaseAdditions.h; path = Classes/FMDatabaseAdditions.h; sourceTree = "<group>"; }; @@ -114,6 +123,9 @@ 29B97317FDCFA39411CA2CEA /* Resources */ = { isa = PBXGroup; children = ( + 3CDAEC6B0F0FEE34000A0C6E /* aboutView.html */, + 3CDAEC660F0FECB2000A0C6E /* aboutView.xib */, + 3CDAEC690F0FED5F000A0C6E /* clockwiseLogo.png */, 3C52BB480F0EB69D006C34C1 /* Default.png */, 3CB9C87C0EED4674001753BD /* translationTemplate.html */, 3C3C29C50EE6DC0800028066 /* Icon.png */, @@ -161,6 +173,8 @@ 3CF7D6550EE555120086D98C /* Word.m */, 1D3623240D0F684500981E51 /* LexikonAppDelegate.h */, 1D3623250D0F684500981E51 /* LexikonAppDelegate.m */, + 3CDAEC6D0F0FEFD6000A0C6E /* AboutViewController.h */, + 3CDAEC6E0F0FEFD6000A0C6E /* AboutViewController.m */, ); name = Classes; sourceTree = "<group>"; @@ -213,6 +227,9 @@ 3C3C29C60EE6DC0800028066 /* Icon.png in Resources */, 3CB9C87D0EED4674001753BD /* translationTemplate.html in Resources */, 3C52BB490F0EB69D006C34C1 /* Default.png in Resources */, + 3CDAEC670F0FECB2000A0C6E /* aboutView.xib in Resources */, + 3CDAEC6A0F0FED5F000A0C6E /* clockwiseLogo.png in Resources */, + 3CDAEC6C0F0FEE34000A0C6E /* aboutView.html in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -231,6 +248,7 @@ 3CF7D6560EE555120086D98C /* MainViewController.m in Sources */, 3CF7D6570EE555120086D98C /* Word.m in Sources */, 3CAD0D450EE7EFBB003C1C97 /* DetailViewController.m in Sources */, + 3CDAEC6F0F0FEFD6000A0C6E /* AboutViewController.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -268,7 +286,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Caleb Jaffa"; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 5; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -296,7 +314,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 5; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; @@ -312,7 +330,7 @@ buildSettings = { ARCHS = "$(ARCHS_STANDARD_32_BIT)"; "CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer"; - CURRENT_PROJECT_VERSION = 3; + CURRENT_PROJECT_VERSION = 5; GCC_C_LANGUAGE_STANDARD = c99; GCC_WARN_ABOUT_RETURN_TYPE = YES; GCC_WARN_UNUSED_VARIABLE = YES; Lexikon.xcodeproj/project.pbxproj @@ -2,14 +2,14 @@ <archive type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">528</int> - <string key="IBDocument.SystemVersion">9F33</string> + <string key="IBDocument.SystemVersion">9G55</string> <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.34</string> - <string key="IBDocument.HIToolboxVersion">352.00</string> + <string key="IBDocument.AppKitVersion">949.43</string> + <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="20"/> <integer value="2"/> + <integer value="20"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -72,7 +72,9 @@ <bool key="IBUIOpaque">NO</bool> <bool key="IBUIClipsSubviews">YES</bool> <bool key="IBUIClearsContextBeforeDrawing">NO</bool> + <bool key="IBUIPagingEnabled">YES</bool> <bool key="IBUIShowsHorizontalScrollIndicator">NO</bool> + <int key="IBUIIndicatorStyle">1</int> <bool key="IBUIBouncesZoom">NO</bool> <int key="IBUISeparatorStyle">1</int> <int key="IBUISectionIndexMinimumDisplayRowCount">0</int> @@ -165,6 +167,14 @@ </object> <int key="connectionID">41</int> </object> + <object class="IBConnectionRecord"> + <object class="IBCocoaTouchEventConnection" key="connection"> + <string key="label">showAbout:</string> + <reference key="source" ref="775756665"/> + <reference key="destination" ref="535455041"/> + </object> + <int key="connectionID">53</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -322,7 +332,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">52</int> + <int key="maxID">53</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -362,8 +372,17 @@ <string key="className">MainViewController</string> <string key="superclassName">UITableViewController</string> <object class="NSMutableDictionary" key="actions"> - <string key="NS.key.0">switchLanguage:</string> - <string key="NS.object.0">id</string> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSMutableArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>showAbout:</string> + <string>switchLanguage:</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>id</string> + <string>id</string> + </object> </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> MainWindow.xib @@ -19,4 +19,4 @@ {yield} </body> -</html> +</html> \ No newline at end of file translationTemplate.html 90060071d0bd46190a6337f5b8432bc6a5e8dfa7 Caleb Jaffa caleb@clockwi.se http://github.com/octover/lexikon/commit/b7c2d1cdd43140fedb061d9657a3d5ea86a52f64 b7c2d1cdd43140fedb061d9657a3d5ea86a52f64 2009-01-03T12:51:08-08:00 2009-01-03T12:51:08-08:00 About view, lazy load word list 9ee8e387c2b0271a6fbf5411c8ef4fe7ade5c41f Caleb Jaffa caleb@clockwi.se