diff --git a/ActiveGS_iOS/infoViewController.xib b/ActiveGS_iOS/infoViewController.xib
index 1950059..8f7635d 100644
--- a/ActiveGS_iOS/infoViewController.xib
+++ b/ActiveGS_iOS/infoViewController.xib
@@ -1,931 +1,1001 @@
-
-
-
- 1552
- 13F34
- 6254
- 1265.21
- 698.00
-
-
- IBProxyObject
- IBUIButton
- IBUIImageView
- IBUILabel
- IBUIView
-
-
- com.apple.InterfaceBuilder.IBCocoaTouchPlugin
-
-
-
-
-
-
-
-
-
-
- 0
- IBCocoaTouchFramework
- NO
-
- YES
- 3
-
- {80, 80}
- {128, 128}
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ swipe down for run-time menu
+swipe up for keyboard
+swipe up for joypad (while keyboard is shown)
+double tap for mouse click
+triple tap for mouse double-click
+swipe left/right on top screen for shortcut to browse
+
+
+
+
+
+
+
+
+ Loading Your Own Disk Images
+
+
+
+
+
+
+
+ - Use iTunes or other application (iExplorer, iFunBox) to transfer files to the ActiveGS Documents folder.
+
+- To load multi-disk games/applications, make sure the filenames are similar enough so that they share the same prefix, and that the first disk image in the series contains the phrase "disk1". Spaces and capitalization are ignored, so as long as you have that phrase, the program will be recognized as multi-disk. All disk image files following the first will be added in order.
+
+The following are examples of programs recognized as multi-disk:
+
+
+
+
+
+
+
+ Rastan Disk 1.zip
+Rastan Disk 2.zip
+
+Task Force-disk1.zip
+Task Force-disk2.zip
+
+Final Fantasy XV (Disk 1 of 62500)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Final Fantasy XV (Disk 2 of 62500)
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Cg
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Cgo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Cgo
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - Tap the "Favorites" tab to view your loaded disk images.
+
+- Swipe down while your program is running to reveal the top menu. For multi-disk programs, you will see a spinning disk icon on the upper right.
+
+- Tap on the spinning disk icon to mount a different disk.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Support
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ - Both Made for iPhone (mFi) and iCade controllers are supported.
+
+- To use an mFi controller, pair your controller to your iOS device. It should automatically be detected. Analog controls are mapped to the left thumbstick. Apple joystick button 0 is mapped to the Y button, and joystick button 1 is mapped to the A button.
+
+- To use an iCade controller, pair it with your iOS device. In the Options menu, select "iCade" under Pad Input. Entering 'up-up-down-down' on your iCade controller while a game is running will also enable the controller after pairing as well.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+- Are supported and they work..most of the time! Save states are specific to each program and you have 6 available slots.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/Common.iphone/infoViewController.h b/Common.iphone/infoViewController.h
index a5acd11..3c05c55 100644
--- a/Common.iphone/infoViewController.h
+++ b/Common.iphone/infoViewController.h
@@ -10,18 +10,13 @@
// Properties
UIView* _portraitView;
- UIView* _landscapeView;
UILabel* _versionUI;
- UILabel* _versionUILandscape;
}
-@property (nonatomic, strong) IBOutlet UILabel* versionUILandscape;
@property (nonatomic, strong) IBOutlet UILabel* versionUI;
@property (nonatomic, strong) IBOutlet UIView* portraitView;
-@property (nonatomic, strong) IBOutlet UIView* landscapeView;
+@property (nonatomic, strong) IBOutlet UIScrollView *instructionsView;
-//- (void)updateView:(UIDeviceOrientation)_orientation ;
-- (void)updateView ;
- (IBAction) doneButton:(id)_sender;
- (IBAction) parametersButton:(id)_sender;
- (IBAction) emailButton:(id)_sender;
diff --git a/Common.iphone/infoViewController.mm b/Common.iphone/infoViewController.mm
index 3bda18a..8fdd9e0 100644
--- a/Common.iphone/infoViewController.mm
+++ b/Common.iphone/infoViewController.mm
@@ -14,11 +14,7 @@
@implementation infoViewController
@synthesize versionUI=_versionIU;
-@synthesize versionUILandscape=_versionUILandscape;
@synthesize portraitView= _portraitView;
-@synthesize landscapeView = _landscapeView;
-
-
-(void)viewDidLoad
{
@@ -27,19 +23,15 @@
NSString *buildVersion = [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"];
- self.versionUILandscape.text=
self.versionUI.text = [NSString stringWithFormat: @"v%@.%@ -- ActiveGS "TOSTRING(ACTIVEGSMAJOR)"."TOSTRING(ACTIVEGSMINOR)"."TOSTRING(ACTIVEGSBUILD)"",appVersion,buildVersion];
- [self.portraitView setFrame:[[UIScreen mainScreen] bounds] ];
- [self.landscapeView setFrame:[[UIScreen mainScreen] bounds] ];
-
// [[UIWindow alloc] initWithFrame:[[UIScreen mainScreen] bounds]];
}
-(void)viewDidAppear:(BOOL)animated
{
printf("viewDidAppear");
-
+ [super viewDidAppear:animated];
// Swipe left to go back to browsing
UISwipeGestureRecognizer* grswipeleft = [[UISwipeGestureRecognizer alloc] initWithTarget:self action:@selector(swipeLeft:)];
@@ -53,32 +45,7 @@
grswiperight.cancelsTouchesInView = NO;
[self.view addGestureRecognizer:grswiperight];
-}
-
-/*
--(void)updateView:(UIDeviceOrientation)_orientation
-{
-
-}
-*/
-
--(void)updateView
-{
- debug_printf("updateView infoViewController");
-
-
- BOOL isPortrait = abs([pManager getAngle])==90.0f ;
-
- if (isPortrait)
- self.view = self.portraitView;
- else
- self.view = self.landscapeView;
-
- self.view = self.portraitView;
-
- // pour réactiver les gestures
- [self viewDidAppear:FALSE];
-
+ [self.instructionsView flashScrollIndicators];
}
@@ -135,15 +102,4 @@
return UIInterfaceOrientationMaskAll;
}
-- (void)viewWillTransitionToSize:(CGSize)size withTransitionCoordinator:(id)coordinator
-{
- [super viewWillTransitionToSize:size withTransitionCoordinator:coordinator];
- [coordinator animateAlongsideTransition:^(id context) {
- [self updateView];
-
- } completion:^(id context) {
-
- }];
-}
-
@end