# HG changeset patch # User Robert Tubb # Date 1359743503 0 # Node ID 2e1fdac115af7488ad8492053de2f872132b0c7a # Parent f42a00e3f22d23cbda8b0c916b92986ba800a2e9 Help view. diff -r f42a00e3f22d -r 2e1fdac115af BottomTabViewController.mm --- a/BottomTabViewController.mm Fri Feb 01 17:39:19 2013 +0000 +++ b/BottomTabViewController.mm Fri Feb 01 18:31:43 2013 +0000 @@ -9,7 +9,7 @@ #import "BottomTabViewController.h" #import "testApp.h" @interface BottomTabViewController () - + @end @implementation BottomTabViewController diff -r f42a00e3f22d -r 2e1fdac115af HelpViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/HelpViewController.h Fri Feb 01 18:31:43 2013 +0000 @@ -0,0 +1,16 @@ +// +// HelpViewController.h +// sonicZoom +// +// Created by Robert Tubb on 01/02/2013. +// +// + +#import + +@interface HelpViewController : UIViewController + +-(IBAction)hide:(id)sender; +-(IBAction)show:(id)sender; + +@end diff -r f42a00e3f22d -r 2e1fdac115af HelpViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/HelpViewController.m Fri Feb 01 18:31:43 2013 +0000 @@ -0,0 +1,48 @@ +// +// HelpViewController.m +// sonicZoom +// +// Created by Robert Tubb on 01/02/2013. +// +// + +#import "HelpViewController.h" + +@interface HelpViewController () + +@end + +@implementation HelpViewController + +- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil +{ + self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil]; + if (self) { + // Custom initialization + } + return self; +} + +- (void)viewDidLoad +{ + [super viewDidLoad]; + // Do any additional setup after loading the view from its nib. +} + +- (void)didReceiveMemoryWarning +{ + [super didReceiveMemoryWarning]; + // Dispose of any resources that can be recreated. +} + +-(IBAction)show:(id)sender{ + self.view.hidden = NO; +} + +- (IBAction)hide:(id)sender +{ + self.view.hidden = YES; + //((testApp *)self.theOFAppRef)->introHidden(YES); + +} +@end diff -r f42a00e3f22d -r 2e1fdac115af HelpViewController.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/HelpViewController.xib Fri Feb 01 18:31:43 2013 +0000 @@ -0,0 +1,397 @@ + + + + 1536 + 11G63 + 2844 + 1138.51 + 569.00 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 1930 + + + IBProxyObject + IBUIButton + IBUITextView + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + PluginDependencyRecalculationVersion + + + + + IBFilesOwner + IBIPadFramework + + + IBFirstResponder + IBIPadFramework + + + + 292 + + + + 274 + {768, 1024} + + + + _NS:9 + + 1 + MCAwIDAAA + + YES + YES + IBIPadFramework + NO + NO + + SW5zdHJ1Y3Rpb25zDQ1QcmVzcyB0aGUgcGxheSBidXR0b24gYXQgdGhlIHRvcCB0byBzdGFydCB0aGUg +c2VxdWVuY2VyLiBQcmVzcyBwYXVzZSB0byBzdG9wLg1QbGVhc2UgdXNlIGFsbCB0aHJlZSBtb2Rlczog +Wk9PTUVSICwgU0xJREVSUyBhbmQgQk9USCBmb3IgYWJvdXQgOCBtaW51dGVzLiBZb3UgY2FuIGFjY2Vz +cyB0aGVzZSB1c2luZyB0aGUgdGFicyBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIA0NDVpPT01F +UiBJTlNUUlVDVElPTlM6DVRoZSByZWQgY3Jvc3NoYWlycyBpbiB0aGUgY2VudHJlIG9mIHRoZSBzY3Jl +ZW4gcmVwcmVzZW50IHRoZSBwb2ludCBvbiB0aGUgc3VyZmFjZSB0aGF0IHlvdSBhcmUgbGlzdGVuaW5n +IHRvLiBTY3JvbGwgdGhlIHN1cmZhY2UgdW5kZXIgdGhpcyBwb2ludCB0byBtb3ZlIHRvIGEgZGlmZmVy +ZW50IHNvdW5kLiBJbiBCT1RIIG1vZGUgeW91IHdpbGwgYmUgYWJsZSB0byBzZWUgdGhlIGVmZmVjdCBv +ZiB0aGlzIG9uIHRoZSBzbGlkZXJzLiBMaWtld2lzZSBpZiB5b3UgbW92ZSBhIHNsaWRlciB5b3Ugd2ls +bCBob3AgdG8gYSBkaWZmZXJlbnQgcG9pbnQgb24gdGhlIHN1cmZhY2UuDVNhdmUgYW55IHNvdW5kcy9z +ZXF1ZW5jZXMgdGhhdCB5b3UgbGlrZSB1c2luZyB0aGUg4oCcc2F2ZSBwcmVzZXTigJ0gYnV0dG9uLiBB +IG1hcmtlciB3aWxsIGFwcGVhciBvbiB0aGUgem9vbSBzdXJmYWNlICwgaWYgeW91IG1vdmUgdG8gdGhl +IHZpY2luaXR5IG9mIGEgcHJlc2V0IG1hcmtlciwgdGhlIGNyb3NzaGFpcnMgd2lsbCBzbmFwIHRvIHRo +ZSBwcmVzZXQsIGl0cyBkZXRhaWxzIHdpbGwgYXBwZWFyIGFuZCB0aGUgc291bmQgd2lsbCBwbGF5Lg1V +c2luZyB0d28gZmluZ2VyIHBpbmNoIG1vdmVtZW50IHpvb21zIHRoZSBzdXJmYWNlIGp1c3QgYXMgaW4g +YSBtYXBzIGFwcC4gVGhlIGZ1cnRoZXIgeW91IHpvb20gaW4sIHRoZSBsZXNzIHRoZSBzb3VuZCB3aWxs +IGNoYW5nZSBhcyB5b3Ugc2Nyb2xsIGFyb3VuZC4gDUluc3RydWN0aW9ucw0NUHJlc3MgdGhlIHBsYXkg +YnV0dG9uIGF0IHRoZSB0b3AgdG8gc3RhcnQgdGhlIHNlcXVlbmNlci4gUHJlc3MgcGF1c2UgdG8gc3Rv +cC4NUGxlYXNlIHVzZSBhbGwgdGhyZWUgbW9kZXM6IFpPT01FUiAsIFNMSURFUlMgYW5kIEJPVEggZm9y +IGFib3V0IDggbWludXRlcy4gWW91IGNhbiBhY2Nlc3MgdGhlc2UgdXNpbmcgdGhlIHRhYnMgYXQgdGhl +IGJvdHRvbSBvZiB0aGUgc2NyZWVuLiANDQ1aT09NRVIgSU5TVFJVQ1RJT05TOg1UaGUgcmVkIGNyb3Nz +aGFpcnMgaW4gdGhlIGNlbnRyZSBvZiB0aGUgc2NyZWVuIHJlcHJlc2VudCB0aGUgcG9pbnQgb24gdGhl +IHN1cmZhY2UgdGhhdCB5b3UgYXJlIGxpc3RlbmluZyB0by4gU2Nyb2xsIHRoZSBzdXJmYWNlIHVuZGVy +IHRoaXMgcG9pbnQgdG8gbW92ZSB0byBhIGRpZmZlcmVudCBzb3VuZC4gSW4gQk9USCBtb2RlIHlvdSB3 +aWxsIGJlIGFibGUgdG8gc2VlIHRoZSBlZmZlY3Qgb2YgdGhpcyBvbiB0aGUgc2xpZGVycy4gTGlrZXdp +c2UgaWYgeW91IG1vdmUgYSBzbGlkZXIgeW91IHdpbGwgaG9wIHRvIGEgZGlmZmVyZW50IHBvaW50IG9u +IHRoZSBzdXJmYWNlLg1TYXZlIGFueSBzb3VuZHMvc2VxdWVuY2VzIHRoYXQgeW91IGxpa2UgdXNpbmcg +dGhlIOKAnHNhdmUgcHJlc2V04oCdIGJ1dHRvbi4gQSBtYXJrZXIgd2lsbCBhcHBlYXIgb24gdGhlIHpv +b20gc3VyZmFjZSAsIGlmIHlvdSBtb3ZlIHRvIHRoZSB2aWNpbml0eSBvZiBhIHByZXNldCBtYXJrZXIs +IHRoZSBjcm9zc2hhaXJzIHdpbGwgc25hcCB0byB0aGUgcHJlc2V0LCBpdHMgZGV0YWlscyB3aWxsIGFw +cGVhciBhbmQgdGhlIHNvdW5kIHdpbGwgcGxheS4NVXNpbmcgdHdvIGZpbmdlciBwaW5jaCBtb3ZlbWVu +dCB6b29tcyB0aGUgc3VyZmFjZSBqdXN0IGFzIGluIGEgbWFwcyBhcHAuIFRoZSBmdXJ0aGVyIHlvdSB6 +b29tIGluLCB0aGUgbGVzcyB0aGUgc291bmQgd2lsbCBjaGFuZ2UgYXMgeW91IHNjcm9sbCBhcm91bmQu +IA1JbnN0cnVjdGlvbnMNDVByZXNzIHRoZSBwbGF5IGJ1dHRvbiBhdCB0aGUgdG9wIHRvIHN0YXJ0IHRo +ZSBzZXF1ZW5jZXIuIFByZXNzIHBhdXNlIHRvIHN0b3AuDVBsZWFzZSB1c2UgYWxsIHRocmVlIG1vZGVz +OiBaT09NRVIgLCBTTElERVJTIGFuZCBCT1RIIGZvciBhYm91dCA4IG1pbnV0ZXMuIFlvdSBjYW4gYWNj +ZXNzIHRoZXNlIHVzaW5nIHRoZSB0YWJzIGF0IHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gDQ0NWk9P +TUVSIElOU1RSVUNUSU9OUzoNVGhlIHJlZCBjcm9zc2hhaXJzIGluIHRoZSBjZW50cmUgb2YgdGhlIHNj +cmVlbiByZXByZXNlbnQgdGhlIHBvaW50IG9uIHRoZSBzdXJmYWNlIHRoYXQgeW91IGFyZSBsaXN0ZW5p +bmcgdG8uIFNjcm9sbCB0aGUgc3VyZmFjZSB1bmRlciB0aGlzIHBvaW50IHRvIG1vdmUgdG8gYSBkaWZm +ZXJlbnQgc291bmQuIEluIEJPVEggbW9kZSB5b3Ugd2lsbCBiZSBhYmxlIHRvIHNlZSB0aGUgZWZmZWN0 +IG9mIHRoaXMgb24gdGhlIHNsaWRlcnMuIExpa2V3aXNlIGlmIHlvdSBtb3ZlIGEgc2xpZGVyIHlvdSB3 +aWxsIGhvcCB0byBhIGRpZmZlcmVudCBwb2ludCBvbiB0aGUgc3VyZmFjZS4NU2F2ZSBhbnkgc291bmRz +L3NlcXVlbmNlcyB0aGF0IHlvdSBsaWtlIHVzaW5nIHRoZSDigJxzYXZlIHByZXNldOKAnSBidXR0b24u +IEEgbWFya2VyIHdpbGwgYXBwZWFyIG9uIHRoZSB6b29tIHN1cmZhY2UgLCBpZiB5b3UgbW92ZSB0byB0 +aGUgdmljaW5pdHkgb2YgYSBwcmVzZXQgbWFya2VyLCB0aGUgY3Jvc3NoYWlycyB3aWxsIHNuYXAgdG8g +dGhlIHByZXNldCwgaXRzIGRldGFpbHMgd2lsbCBhcHBlYXIgYW5kIHRoZSBzb3VuZCB3aWxsIHBsYXku +DVVzaW5nIHR3byBmaW5nZXIgcGluY2ggbW92ZW1lbnQgem9vbXMgdGhlIHN1cmZhY2UganVzdCBhcyBp +biBhIG1hcHMgYXBwLiBUaGUgZnVydGhlciB5b3Ugem9vbSBpbiwgdGhlIGxlc3MgdGhlIHNvdW5kIHdp +bGwgY2hhbmdlIGFzIHlvdSBzY3JvbGwgYXJvdW5kLiANSW5zdHJ1Y3Rpb25zDQ1QcmVzcyB0aGUgcGxh +eSBidXR0b24gYXQgdGhlIHRvcCB0byBzdGFydCB0aGUgc2VxdWVuY2VyLiBQcmVzcyBwYXVzZSB0byBz +dG9wLg1QbGVhc2UgdXNlIGFsbCB0aHJlZSBtb2RlczogWk9PTUVSICwgU0xJREVSUyBhbmQgQk9USCBm +b3IgYWJvdXQgOCBtaW51dGVzLiBZb3UgY2FuIGFjY2VzcyB0aGVzZSB1c2luZyB0aGUgdGFicyBhdCB0 +aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIA0NDVpPT01FUiBJTlNUUlVDVElPTlM6DVRoZSByZWQgY3Jv +c3NoYWlycyBpbiB0aGUgY2VudHJlIG9mIHRoZSBzY3JlZW4gcmVwcmVzZW50IHRoZSBwb2ludCBvbiB0 +aGUgc3VyZmFjZSB0aGF0IHlvdSBhcmUgbGlzdGVuaW5nIHRvLiBTY3JvbGwgdGhlIHN1cmZhY2UgdW5k +ZXIgdGhpcyBwb2ludCB0byBtb3ZlIHRvIGEgZGlmZmVyZW50IHNvdW5kLiBJbiBCT1RIIG1vZGUgeW91 +IHdpbGwgYmUgYWJsZSB0byBzZWUgdGhlIGVmZmVjdCBvZiB0aGlzIG9uIHRoZSBzbGlkZXJzLiBMaWtl +d2lzZSBpZiB5b3UgbW92ZSBhIHNsaWRlciB5b3Ugd2lsbCBob3AgdG8gYSBkaWZmZXJlbnQgcG9pbnQg +b24gdGhlIHN1cmZhY2UuDVNhdmUgYW55IHNvdW5kcy9zZXF1ZW5jZXMgdGhhdCB5b3UgbGlrZSB1c2lu +ZyB0aGUg4oCcc2F2ZSBwcmVzZXTigJ0gYnV0dG9uLiBBIG1hcmtlciB3aWxsIGFwcGVhciBvbiB0aGUg +em9vbSBzdXJmYWNlICwgaWYgeW91IG1vdmUgdG8gdGhlIHZpY2luaXR5IG9mIGEgcHJlc2V0IG1hcmtl +ciwgdGhlIGNyb3NzaGFpcnMgd2lsbCBzbmFwIHRvIHRoZSBwcmVzZXQsIGl0cyBkZXRhaWxzIHdpbGwg +YXBwZWFyIGFuZCB0aGUgc291bmQgd2lsbCBwbGF5Lg1Vc2luZyB0d28gZmluZ2VyIHBpbmNoIG1vdmVt +ZW50IHpvb21zIHRoZSBzdXJmYWNlIGp1c3QgYXMgaW4gYSBtYXBzIGFwcC4gVGhlIGZ1cnRoZXIgeW91 +IHpvb20gaW4sIHRoZSBsZXNzIHRoZSBzb3VuZCB3aWxsIGNoYW5nZSBhcyB5b3Ugc2Nyb2xsIGFyb3Vu +ZC4gDUluc3RydWN0aW9ucw0NUHJlc3MgdGhlIHBsYXkgYnV0dG9uIGF0IHRoZSB0b3AgdG8gc3RhcnQg +dGhlIHNlcXVlbmNlci4gUHJlc3MgcGF1c2UgdG8gc3RvcC4NUGxlYXNlIHVzZSBhbGwgdGhyZWUgbW9k +ZXM6IFpPT01FUiAsIFNMSURFUlMgYW5kIEJPVEggZm9yIGFib3V0IDggbWludXRlcy4gWW91IGNhbiBh +Y2Nlc3MgdGhlc2UgdXNpbmcgdGhlIHRhYnMgYXQgdGhlIGJvdHRvbSBvZiB0aGUgc2NyZWVuLiANDQ1a +T09NRVIgSU5TVFJVQ1RJT05TOg1UaGUgcmVkIGNyb3NzaGFpcnMgaW4gdGhlIGNlbnRyZSBvZiB0aGUg +c2NyZWVuIHJlcHJlc2VudCB0aGUgcG9pbnQgb24gdGhlIHN1cmZhY2UgdGhhdCB5b3UgYXJlIGxpc3Rl +bmluZyB0by4gU2Nyb2xsIHRoZSBzdXJmYWNlIHVuZGVyIHRoaXMgcG9pbnQgdG8gbW92ZSB0byBhIGRp +ZmZlcmVudCBzb3VuZC4gSW4gQk9USCBtb2RlIHlvdSB3aWxsIGJlIGFibGUgdG8gc2VlIHRoZSBlZmZl +Y3Qgb2YgdGhpcyBvbiB0aGUgc2xpZGVycy4gTGlrZXdpc2UgaWYgeW91IG1vdmUgYSBzbGlkZXIgeW91 +IHdpbGwgaG9wIHRvIGEgZGlmZmVyZW50IHBvaW50IG9uIHRoZSBzdXJmYWNlLg1TYXZlIGFueSBzb3Vu +ZHMvc2VxdWVuY2VzIHRoYXQgeW91IGxpa2UgdXNpbmcgdGhlIOKAnHNhdmUgcHJlc2V04oCdIGJ1dHRv +bi4gQSBtYXJrZXIgd2lsbCBhcHBlYXIgb24gdGhlIHpvb20gc3VyZmFjZSAsIGlmIHlvdSBtb3ZlIHRv +IHRoZSB2aWNpbml0eSBvZiBhIHByZXNldCBtYXJrZXIsIHRoZSBjcm9zc2hhaXJzIHdpbGwgc25hcCB0 +byB0aGUgcHJlc2V0LCBpdHMgZGV0YWlscyB3aWxsIGFwcGVhciBhbmQgdGhlIHNvdW5kIHdpbGwgcGxh +eS4NVXNpbmcgdHdvIGZpbmdlciBwaW5jaCBtb3ZlbWVudCB6b29tcyB0aGUgc3VyZmFjZSBqdXN0IGFz +IGluIGEgbWFwcyBhcHAuIFRoZSBmdXJ0aGVyIHlvdSB6b29tIGluLCB0aGUgbGVzcyB0aGUgc291bmQg +d2lsbCBjaGFuZ2UgYXMgeW91IHNjcm9sbCBhcm91bmQuIA1JbnN0cnVjdGlvbnMNDVByZXNzIHRoZSBw +bGF5IGJ1dHRvbiBhdCB0aGUgdG9wIHRvIHN0YXJ0IHRoZSBzZXF1ZW5jZXIuIFByZXNzIHBhdXNlIHRv +IHN0b3AuDVBsZWFzZSB1c2UgYWxsIHRocmVlIG1vZGVzOiBaT09NRVIgLCBTTElERVJTIGFuZCBCT1RI +IGZvciBhYm91dCA4IG1pbnV0ZXMuIFlvdSBjYW4gYWNjZXNzIHRoZXNlIHVzaW5nIHRoZSB0YWJzIGF0 +IHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4gDQ0NWk9PTUVSIElOU1RSVUNUSU9OUzoNVGhlIHJlZCBj +cm9zc2hhaXJzIGluIHRoZSBjZW50cmUgb2YgdGhlIHNjcmVlbiByZXByZXNlbnQgdGhlIHBvaW50IG9u +IHRoZSBzdXJmYWNlIHRoYXQgeW91IGFyZSBsaXN0ZW5pbmcgdG8uIFNjcm9sbCB0aGUgc3VyZmFjZSB1 +bmRlciB0aGlzIHBvaW50IHRvIG1vdmUgdG8gYSBkaWZmZXJlbnQgc291bmQuIEluIEJPVEggbW9kZSB5 +b3Ugd2lsbCBiZSBhYmxlIHRvIHNlZSB0aGUgZWZmZWN0IG9mIHRoaXMgb24gdGhlIHNsaWRlcnMuIExp +a2V3aXNlIGlmIHlvdSBtb3ZlIGEgc2xpZGVyIHlvdSB3aWxsIGhvcCB0byBhIGRpZmZlcmVudCBwb2lu +dCBvbiB0aGUgc3VyZmFjZS4NU2F2ZSBhbnkgc291bmRzL3NlcXVlbmNlcyB0aGF0IHlvdSBsaWtlIHVz +aW5nIHRoZSDigJxzYXZlIHByZXNldOKAnSBidXR0b24uIEEgbWFya2VyIHdpbGwgYXBwZWFyIG9uIHRo +ZSB6b29tIHN1cmZhY2UgLCBpZiB5b3UgbW92ZSB0byB0aGUgdmljaW5pdHkgb2YgYSBwcmVzZXQgbWFy +a2VyLCB0aGUgY3Jvc3NoYWlycyB3aWxsIHNuYXAgdG8gdGhlIHByZXNldCwgaXRzIGRldGFpbHMgd2ls +bCBhcHBlYXIgYW5kIHRoZSBzb3VuZCB3aWxsIHBsYXkuDVVzaW5nIHR3byBmaW5nZXIgcGluY2ggbW92 +ZW1lbnQgem9vbXMgdGhlIHN1cmZhY2UganVzdCBhcyBpbiBhIG1hcHMgYXBwLiBUaGUgZnVydGhlciB5 +b3Ugem9vbSBpbiwgdGhlIGxlc3MgdGhlIHNvdW5kIHdpbGwgY2hhbmdlIGFzIHlvdSBzY3JvbGwgYXJv +dW5kLiANSW5zdHJ1Y3Rpb25zDQ1QcmVzcyB0aGUgcGxheSBidXR0b24gYXQgdGhlIHRvcCB0byBzdGFy +dCB0aGUgc2VxdWVuY2VyLiBQcmVzcyBwYXVzZSB0byBzdG9wLg1QbGVhc2UgdXNlIGFsbCB0aHJlZSBt +b2RlczogWk9PTUVSICwgU0xJREVSUyBhbmQgQk9USCBmb3IgYWJvdXQgOCBtaW51dGVzLiBZb3UgY2Fu +IGFjY2VzcyB0aGVzZSB1c2luZyB0aGUgdGFicyBhdCB0aGUgYm90dG9tIG9mIHRoZSBzY3JlZW4uIA0N +DVpPT01FUiBJTlNUUlVDVElPTlM6DVRoZSByZWQgY3Jvc3NoYWlycyBpbiB0aGUgY2VudHJlIG9mIHRo +ZSBzY3JlZW4gcmVwcmVzZW50IHRoZSBwb2ludCBvbiB0aGUgc3VyZmFjZSB0aGF0IHlvdSBhcmUgbGlz +dGVuaW5nIHRvLiBTY3JvbGwgdGhlIHN1cmZhY2UgdW5kZXIgdGhpcyBwb2ludCB0byBtb3ZlIHRvIGEg +ZGlmZmVyZW50IHNvdW5kLiBJbiBCT1RIIG1vZGUgeW91IHdpbGwgYmUgYWJsZSB0byBzZWUgdGhlIGVm +ZmVjdCBvZiB0aGlzIG9uIHRoZSBzbGlkZXJzLiBMaWtld2lzZSBpZiB5b3UgbW92ZSBhIHNsaWRlciB5 +b3Ugd2lsbCBob3AgdG8gYSBkaWZmZXJlbnQgcG9pbnQgb24gdGhlIHN1cmZhY2UuDVNhdmUgYW55IHNv +dW5kcy9zZXF1ZW5jZXMgdGhhdCB5b3UgbGlrZSB1c2luZyB0aGUg4oCcc2F2ZSBwcmVzZXTigJ0gYnV0 +dG9uLiBBIG1hcmtlciB3aWxsIGFwcGVhciBvbiB0aGUgem9vbSBzdXJmYWNlICwgaWYgeW91IG1vdmUg +dG8gdGhlIHZpY2luaXR5IG9mIGEgcHJlc2V0IG1hcmtlciwgdGhlIGNyb3NzaGFpcnMgd2lsbCBzbmFw +IHRvIHRoZSBwcmVzZXQsIGl0cyBkZXRhaWxzIHdpbGwgYXBwZWFyIGFuZCB0aGUgc291bmQgd2lsbCBw +bGF5Lg1Vc2luZyB0d28gZmluZ2VyIHBpbmNoIG1vdmVtZW50IHpvb21zIHRoZSBzdXJmYWNlIGp1c3Qg +YXMgaW4gYSBtYXBzIGFwcC4gVGhlIGZ1cnRoZXIgeW91IHpvb20gaW4sIHRoZSBsZXNzIHRoZSBzb3Vu +ZCB3aWxsIGNoYW5nZSBhcyB5b3Ugc2Nyb2xsIGFyb3VuZC4gDUluc3RydWN0aW9ucw0NUHJlc3MgdGhl +IHBsYXkgYnV0dG9uIGF0IHRoZSB0b3AgdG8gc3RhcnQgdGhlIHNlcXVlbmNlci4gUHJlc3MgcGF1c2Ug +dG8gc3RvcC4NUGxlYXNlIHVzZSBhbGwgdGhyZWUgbW9kZXM6IFpPT01FUiAsIFNMSURFUlMgYW5kIEJP +VEggZm9yIGFib3V0IDggbWludXRlcy4gWW91IGNhbiBhY2Nlc3MgdGhlc2UgdXNpbmcgdGhlIHRhYnMg +YXQgdGhlIGJvdHRvbSBvZiB0aGUgc2NyZWVuLiANDQ1aT09NRVIgSU5TVFJVQ1RJT05TOg1UaGUgcmVk +IGNyb3NzaGFpcnMgaW4gdGhlIGNlbnRyZSBvZiB0aGUgc2NyZWVuIHJlcHJlc2VudCB0aGUgcG9pbnQg +b24gdGhlIHN1cmZhY2UgdGhhdCB5b3UgYXJlIGxpc3RlbmluZyB0by4gU2Nyb2xsIHRoZSBzdXJmYWNl +IHVuZGVyIHRoaXMgcG9pbnQgdG8gbW92ZSB0byBhIGRpZmZlcmVudCBzb3VuZC4gSW4gQk9USCBtb2Rl +IHlvdSB3aWxsIGJlIGFibGUgdG8gc2VlIHRoZSBlZmZlY3Qgb2YgdGhpcyBvbiB0aGUgc2xpZGVycy4g +TGlrZXdpc2UgaWYgeW91IG1vdmUgYSBzbGlkZXIgeW91IHdpbGwgaG9wIHRvIGEgZGlmZmVyZW50IHBv +aW50IG9uIHRoZSBzdXJmYWNlLg1TYXZlIGFueSBzb3VuZHMvc2VxdWVuY2VzIHRoYXQgeW91IGxpa2Ug +dXNpbmcgdGhlIOKAnHNhdmUgcHJlc2V04oCdIGJ1dHRvbi4gQSBtYXJrZXIgd2lsbCBhcHBlYXIgb24g +dGhlIHpvb20gc3VyZmFjZSAsIGlmIHlvdSBtb3ZlIHRvIHRoZSB2aWNpbml0eSBvZiBhIHByZXNldCBt +YXJrZXIsIHRoZSBjcm9zc2hhaXJzIHdpbGwgc25hcCB0byB0aGUgcHJlc2V0LCBpdHMgZGV0YWlscyB3 +aWxsIGFwcGVhciBhbmQgdGhlIHNvdW5kIHdpbGwgcGxheS4NVXNpbmcgdHdvIGZpbmdlciBwaW5jaCBt +b3ZlbWVudCB6b29tcyB0aGUgc3VyZmFjZSBqdXN0IGFzIGluIGEgbWFwcyBhcHAuIFRoZSBmdXJ0aGVy +IHlvdSB6b29tIGluLCB0aGUgbGVzcyB0aGUgc291bmQgd2lsbCBjaGFuZ2UgYXMgeW91IHNjcm9sbCBh +cm91bmQuIA1JbnN0cnVjdGlvbnMNDVByZXNzIHRoZSBwbGF5IGJ1dHRvbiBhdCB0aGUgdG9wIHRvIHN0 +YXJ0IHRoZSBzZXF1ZW5jZXIuIFByZXNzIHBhdXNlIHRvIHN0b3AuDVBsZWFzZSB1c2UgYWxsIHRocmVl +IG1vZGVzOiBaT09NRVIgLCBTTElERVJTIGFuZCBCT1RIIGZvciBhYm91dCA4IG1pbnV0ZXMuIFlvdSBj +YW4gYWNjZXNzIHRoZXNlIHVzaW5nIHRoZSB0YWJzIGF0IHRoZSBib3R0b20gb2YgdGhlIHNjcmVlbi4g +DQ0NWk9PTUVSIElOU1RSVUNUSU9OUzoNVGhlIHJlZCBjcm9zc2hhaXJzIGluIHRoZSBjZW50cmUgb2Yg +dGhlIHNjcmVlbiByZXByZXNlbnQgdGhlIHBvaW50IG9uIHRoZSBzdXJmYWNlIHRoYXQgeW91IGFyZSBs +aXN0ZW5pbmcgdG8uIFNjcm9sbCB0aGUgc3VyZmFjZSB1bmRlciB0aGlzIHBvaW50IHRvIG1vdmUgdG8g +YSBkaWZmZXJlbnQgc291bmQuIEluIEJPVEggbW9kZSB5b3Ugd2lsbCBiZSBhYmxlIHRvIHNlZSB0aGUg +ZWZmZWN0IG9mIHRoaXMgb24gdGhlIHNsaWRlcnMuIExpa2V3aXNlIGlmIHlvdSBtb3ZlIGEgc2xpZGVy +IHlvdSB3aWxsIGhvcCB0byBhIGRpZmZlcmVudCBwb2ludCBvbiB0aGUgc3VyZmFjZS4NU2F2ZSBhbnkg +c291bmRzL3NlcXVlbmNlcyB0aGF0IHlvdSBsaWtlIHVzaW5nIHRoZSDigJxzYXZlIHByZXNldOKAnSBi +dXR0b24uIEEgbWFya2VyIHdpbGwgYXBwZWFyIG9uIHRoZSB6b29tIHN1cmZhY2UgLCBpZiB5b3UgbW92 +ZSB0byB0aGUgdmljaW5pdHkgb2YgYSBwcmVzZXQgbWFya2VyLCB0aGUgY3Jvc3NoYWlycyB3aWxsIHNu +YXAgdG8gdGhlIHByZXNldCwgaXRzIGRldGFpbHMgd2lsbCBhcHBlYXIgYW5kIHRoZSBzb3VuZCB3aWxs +IHBsYXkuDVVzaW5nIHR3byBmaW5nZXIgcGluY2ggbW92ZW1lbnQgem9vbXMgdGhlIHN1cmZhY2UganVz +dCBhcyBpbiBhIG1hcHMgYXBwLiBUaGUgZnVydGhlciB5b3Ugem9vbSBpbiwgdGhlIGxlc3MgdGhlIHNv +dW5kIHdpbGwgY2hhbmdlIGFzIHlvdSBzY3JvbGwgYXJvdW5kLiANA + + + 1 + MC4zMzgyNjY5OTg0IDAuOTA1MzMyMjM5OSAxAA + + + 2 + IBCocoaTouchFramework + + + 1 + 15 + + + Helvetica + 15 + 16 + + + + + 292 + {{319, 941}, {130, 44}} + + + + _NS:9 + NO + IBIPadFramework + 0 + 0 + 1 + BACK TO APP + + 3 + MQA + + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + + + 3 + MC41AA + + + 2 + 15 + + + Helvetica-Bold + 15 + 16 + + + + {768, 1024} + + + + + NO + + IBUIScreenMetrics + + YES + + + + + + {768, 1024} + {1024, 768} + + + IBIPadFramework + iPad Full Screen + 1 + + IBIPadFramework + + + + + + + view + + + + 3 + + + + hide: + + + 7 + + 24 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + + + + + + + 4 + + + + + + 14 + + + + + + + + HelpViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 24 + + + + + HelpViewController + UIViewController + + id + id + + + + hide: + id + + + show: + id + + + + IBProjectSource + ./Classes/HelpViewController.h + + + + + 0 + IBIPadFramework + YES + 3 + 1930 + + diff -r f42a00e3f22d -r 2e1fdac115af TopButtonViewController.h --- a/TopButtonViewController.h Fri Feb 01 17:39:19 2013 +0000 +++ b/TopButtonViewController.h Fri Feb 01 18:31:43 2013 +0000 @@ -7,10 +7,12 @@ // #import +#import "HelpViewController.h" @interface TopButtonViewController : UIViewController @property (nonatomic, assign) id theOFAppRef; +@property (nonatomic, strong) HelpViewController * helpViewController; @property (retain, nonatomic) IBOutlet UIBarButtonItem *playButton; @property (retain, nonatomic) IBOutlet UIBarButtonItem *pauseButton; @@ -26,5 +28,6 @@ - (IBAction)lockSynthPressed:(id)sender; - (IBAction)qPressed:(id)sender; - (IBAction)randomise:(id)sender; +- (IBAction)helpPressed:(id)sender; @end diff -r f42a00e3f22d -r 2e1fdac115af TopButtonViewController.mm --- a/TopButtonViewController.mm Fri Feb 01 17:39:19 2013 +0000 +++ b/TopButtonViewController.mm Fri Feb 01 18:31:43 2013 +0000 @@ -103,13 +103,28 @@ ((testApp *)self.theOFAppRef)->randomise(); } +- (IBAction)helpPressed:(id)sender { + [self.helpViewController.view show:self]; + + self.helpViewController = [[HelpViewController alloc] initWithNibName:@"HelpViewController" bundle:nil]; + [self.view addSubview:self.helpViewController.view]; + + [self.helpViewController show:self]; +} + - (IBAction)show:(id)sender { self.theOFAppRef = sender; self.view.hidden = NO; } +/* + helpViewController = [[HelpViewController alloc] initWithNibName:@"HelpViewController" bundle:nil]; + [ofxiPhoneGetGLParentView() addSubview:helpViewController.view]; + [helpViewController hide:(id)this]; + */ - (void)dealloc { + [_helpViewController release]; [_playButton release]; [_pauseButton release]; [_qButton release]; diff -r f42a00e3f22d -r 2e1fdac115af TopButtonViewController.xib --- a/TopButtonViewController.xib Fri Feb 01 17:39:19 2013 +0000 +++ b/TopButtonViewController.xib Fri Feb 01 18:31:43 2013 +0000 @@ -47,6 +47,12 @@ NO IBIPadFramework + + Help + IBIPadFramework + 1 + + Save Preset IBIPadFramework @@ -207,6 +213,14 @@ 31 + + + helpPressed: + + + + 34 + @@ -248,6 +262,7 @@ + @@ -296,6 +311,11 @@ + + 33 + + + @@ -311,6 +331,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -319,7 +340,7 @@ - 32 + 34 @@ -327,6 +348,7 @@ TopButtonViewController UIViewController + id id id id @@ -337,6 +359,10 @@ id + + helpPressed: + id + lockSequencePressed: id diff -r f42a00e3f22d -r 2e1fdac115af presetManager.h --- a/presetManager.h Fri Feb 01 17:39:19 2013 +0000 +++ b/presetManager.h Fri Feb 01 18:31:43 2013 +0000 @@ -88,7 +88,7 @@ NSString *dateText = [ocdate description]; const char *date_str = [dateText cStringUsingEncoding:NSASCIIStringEncoding]; stringstream ss; - ss << "Name: \t" << name << "\nCreation time: \t" << date_str << "\nCreator: \t" << creatorUserName << "\nCreator ID: \t" << creatorDeviceID << '\n'; + ss << "Name: \t" << name << "\nCreation time: \t" << date_str << "\nCreator: \t" << creatorUserName << '\n'; return ss.str(); } diff -r f42a00e3f22d -r 2e1fdac115af testApp.h --- a/testApp.h Fri Feb 01 17:39:19 2013 +0000 +++ b/testApp.h Fri Feb 01 18:31:43 2013 +0000 @@ -38,6 +38,7 @@ interfaceType whichInterfaceShowing; BottomTabViewController *bottomTabViewController; UsernameAlertViewController *usernameAlertViewController; + HelpViewController *helpViewController; int prevTouchX; int prevTouchY; double prevDist; diff -r f42a00e3f22d -r 2e1fdac115af testApp.mm --- a/testApp.mm Fri Feb 01 17:39:19 2013 +0000 +++ b/testApp.mm Fri Feb 01 18:31:43 2013 +0000 @@ -95,6 +95,7 @@ topButtonViewController.view.frame = CGRectMake(0,0,getWidth(),44); usernameAlertViewController = [[UsernameAlertViewController alloc] init]; + /* sliderViewController = [[SliderViewController alloc] initWithNibName:@"SLiderViewController" bundle:nil]; [ofxiPhoneGetGLParentView() addSubview:sliderViewController.view];