# HG changeset patch # User antonc27 # Date 1439580475 -7200 # Node ID 83c0d96f86eaaa2da81a902d2e7a8ed171f8b539 # Parent f08d5bb1d2b02e5b8ee197184ce90fa1aee70af4 - HelpPageLobbyViewController returned to project (back from 2012!), also help bubble images added diff -r f08d5bb1d2b0 -r 83c0d96f86ea project_files/HedgewarsMobile/Classes/GameConfigViewController.h --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Fri Aug 14 02:10:53 2015 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.h Fri Aug 14 21:27:55 2015 +0200 @@ -23,7 +23,7 @@ @class SchemeWeaponConfigViewController; @class TeamConfigViewController; @class MapConfigViewController; -//@class HelpPageLobbyViewController; +@class HelpPageLobbyViewController; @interface GameConfigViewController : UIViewController { UIView *imgContainer; @@ -33,7 +33,7 @@ SchemeWeaponConfigViewController *schemeWeaponConfigViewController; TeamConfigViewController *teamConfigViewController; MapConfigViewController *mapConfigViewController; - //HelpPageLobbyViewController *helpPage; + HelpPageLobbyViewController *helpPage; } @property (retain) UIView *imgContainer; @@ -42,7 +42,7 @@ @property (nonatomic,retain) IBOutlet SchemeWeaponConfigViewController *schemeWeaponConfigViewController; @property (nonatomic,retain) IBOutlet TeamConfigViewController *teamConfigViewController; @property (nonatomic,retain) IBOutlet MapConfigViewController *mapConfigViewController; -//@property (nonatomic,retain) HelpPageLobbyViewController *helpPage; +@property (nonatomic,retain) HelpPageLobbyViewController *helpPage; -(IBAction) buttonPressed:(id) sender; -(IBAction) segmentPressed:(id) sender; diff -r f08d5bb1d2b0 -r 83c0d96f86ea project_files/HedgewarsMobile/Classes/GameConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Fri Aug 14 02:10:53 2015 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Fri Aug 14 21:27:55 2015 +0200 @@ -22,10 +22,10 @@ #import "TeamConfigViewController.h" #import "SchemeWeaponConfigViewController.h" #import "GameInterfaceBridge.h" - +#import "HelpPageLobbyViewController.h" @implementation GameConfigViewController -@synthesize imgContainer, titleImage, sliderBackground, //helpPage, +@synthesize imgContainer, titleImage, sliderBackground, helpPage, mapConfigViewController, teamConfigViewController, schemeWeaponConfigViewController; -(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation)interfaceOrientation { @@ -66,7 +66,6 @@ break; case 2: [[AudioManagerController mainManager] playClickSound]; - /* if (self.helpPage == nil) self.helpPage = [[HelpPageLobbyViewController alloc] initWithNibName:@"HelpPageLobbyViewController-iPad" bundle:nil]; self.helpPage.view.alpha = 0; @@ -74,7 +73,6 @@ [UIView beginAnimations:@"helplobby" context:NULL]; self.helpPage.view.alpha = 1; [UIView commitAnimations]; - */ break; default: DLog(@"Nope"); @@ -104,7 +102,6 @@ [self.view bringSubviewToFront:schemeWeaponConfigViewController.view]; break; case 3: - /* if (helpPage == nil) { helpPage = [[HelpPageLobbyViewController alloc] initWithNibName:@"HelpPageLobbyViewController-iPhone" bundle:nil]; [self.view addSubview:helpPage.view]; @@ -112,7 +109,6 @@ // this message is compulsory otherwise the table won't be loaded at all [helpPage viewWillAppear:NO]; [self.view bringSubviewToFront:helpPage.view]; - */ break; default: DLog(@"Nope"); @@ -397,8 +393,8 @@ self.teamConfigViewController = nil; if (self.schemeWeaponConfigViewController.view.superview == nil) self.schemeWeaponConfigViewController = nil; - //if (self.helpPage.view.superview == nil) - // self.helpPage = nil; + if (self.helpPage.view.superview == nil) + self.helpPage = nil; MSG_MEMCLEAN(); [super didReceiveMemoryWarning]; } @@ -410,7 +406,7 @@ self.schemeWeaponConfigViewController = nil; self.teamConfigViewController = nil; self.mapConfigViewController = nil; - //self.helpPage = nil; + self.helpPage = nil; MSG_DIDUNLOAD(); [super viewDidUnload]; } @@ -422,7 +418,7 @@ releaseAndNil(schemeWeaponConfigViewController); releaseAndNil(teamConfigViewController); releaseAndNil(mapConfigViewController); - //releaseAndNil(helpPage); + releaseAndNil(helpPage); [super dealloc]; } diff -r f08d5bb1d2b0 -r 83c0d96f86ea project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPad.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPad.xib Fri Aug 14 21:27:55 2015 +0200 @@ -0,0 +1,908 @@ + + + + 1792 + 14E46 + 7706 + 1348.17 + 758.70 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 7703 + + + IBProxyObject + IBUIImageView + IBUILabel + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + IBFilesOwner + IBIPadFramework + + + IBFirstResponder + IBIPadFramework + + + + 292 + + + + 292 + {{742, 389}, {240, 102}} + + + NO + NO + IBIPadFramework + + NSImage + helpabove.png + + + + + 292 + {{753, 408}, {109, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Map theme + + 1 + MCAwIDAAA + darkTextColor + + + 1 + 10 + + Helvetica-Bold + Helvetica + 2 + 18 + + + Helvetica-Bold + 18 + 16 + + YES + + + + 292 + {{753, 425}, {218, 66}} + + + NO + YES + 7 + NO + IBIPadFramework + Here you can choose how your map will appear in game. + + + 1 + 10 + 0 + + Helvetica + Helvetica + 0 + 16 + + + Helvetica + 16 + 16 + + YES + 218 + + + + 292 + {{653, 202}, {240, 146}} + + + NO + NO + IBIPadFramework + + + + + 292 + {{664, 223}, {109, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Map type + + + 1 + 10 + + + YES + + + + 292 + {{664, 244}, {218, 99}} + + + NO + YES + 7 + NO + IBIPadFramework + Choose between a static map or a randomly generated one (might require more time). In a mission you need to perfom some action to win. + + + 1 + 10 + 0 + + + YES + 218 + + + + 292 + {{494, 20}, {240, 101}} + + + NO + NO + IBIPadFramework + + NSImage + helpright.png + + + + + 292 + {{502, 25}, {109, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Map preview + + + 1 + 10 + + + YES + + + + 292 + {{502, 46}, {218, 65}} + + + NO + YES + 7 + NO + IBIPadFramework + This is a small preview of your next map. Tap to select / generate a new map. + + + 1 + 10 + 0 + + + YES + 218 + + + + 292 + {{391, 389}, {242, 171}} + + + NO + NO + IBIPadFramework + + + + + 292 + {{401, 413}, {109, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Teams + + + 1 + 10 + + + YES + + + + 292 + {{400, 434}, {232, 120}} + + + NO + YES + 7 + NO + IBIPadFramework + Select which teams are playing! Add hogs by tapping on them and set their color to figure friend and foe teams out. AI teams will appear with a small robot badge next their name. + + + 1 + 10 + 0 + + + YES + 232 + + + + 292 + {{142, 125}, {240, 104}} + + + NO + NO + IBIPadFramework + + NSImage + helpleft.png + + + + + 292 + {{162, 133}, {204, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Schemes and Weapons + + + 1 + 10 + + + YES + + + + 292 + {{162, 152}, {210, 71}} + + + NO + YES + 7 + NO + IBIPadFramework + Here you can choose which rules and which weapon set will be applied in game. + + + 1 + 10 + 0 + + + YES + 210 + + + + 292 + {{155, 8}, {278, 50}} + + + NO + NO + IBIPadFramework + + + + + 292 + {{177, 6}, {248, 54}} + + + NO + YES + 7 + NO + IBIPadFramework + Did you know you can customize almost everything in the settings page? + + + 1 + 10 + 0 + + Helvetica-Oblique + Helvetica + 1 + 14 + + + Helvetica-Oblique + 14 + 16 + + YES + 248 + + + + 292 + {{686, 583}, {240, 117}} + + + NO + NO + IBIPadFramework + + NSImage + helpbottom.png + + + + + 292 + {{697, 592}, {138, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Max hedgehogs + + + 1 + 10 + + + YES + + + + 292 + {{697, 609}, {218, 73}} + + NO + YES + 7 + NO + IBIPadFramework + This number is the maximum size for all the hogs playing (in every team). + + + 1 + 10 + 0 + + + YES + 218 + + + + 292 + {{20, 587}, {240, 109}} + + + NO + NO + IBIPadFramework + + + + + 292 + {{30, 592}, {138, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Size slider + + + 1 + 10 + + + YES + + + + 292 + {{30, 608}, {218, 73}} + + + NO + YES + 7 + NO + IBIPadFramework + For Random and Maze maps you can decide to generate only maps of a certain size. + + + 1 + 10 + 0 + + + YES + 218 + + + + 292 + {{45, 318}, {240, 128}} + + + NO + NO + IBIPadFramework + + NSImage + helpplain.png + + + + + 292 + {{50, 326}, {229, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Tap anywhere to dismiss + + + 1 + 10 + 1 + + + YES + + + + 292 + {{52, 348}, {224, 87}} + + + NO + YES + 7 + NO + IBIPadFramework + Still confused? Don't worry, it's really simple! Try a couple of games and everything will become clear to you. + + + 1 + 10 + 0 + + + YES + 224 + + + + 292 + {{344, 635}, {240, 61}} + + + NO + NO + IBIPadFramework + + + + + 292 + {{353, 637}, {138, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Start button + + + 1 + 10 + + + YES + + + + 292 + {{354, 650}, {218, 46}} + + + NO + YES + 7 + NO + IBIPadFramework + This button starts the game. + + + 1 + 10 + 0 + + + YES + 218 + + + {1024, 768} + + + 3 + MCAwLjQAA + + NO + NO + + 3 + 3 + + + IBUIScreenMetrics + IBIPadFramework + iPad Full Screen + + YES + + + + + + {768, 1024} + {1024, 768} + + + 1 + + IBIPadFramework + + + + + + + view + + + + 3 + + + + dismiss + + + 7 + + 16 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 6 + + + + + 7 + + + + + 8 + + + + + 25 + + + + + 26 + + + + + 27 + + + + + 28 + + + + + 29 + + + + + 30 + + + + + 34 + + + + + 35 + + + + + 36 + + + + + 37 + + + + + 38 + + + + + 39 + + + + + 40 + + + + + 41 + + + + + 42 + + + + + 43 + + + + + 44 + + + + + 45 + + + + + 49 + + + + + 50 + + + + + 51 + + + + + 52 + + + + + 53 + + + + + 54 + + + + + 58 + + + + + 59 + + + + + + + HelpPageLobbyViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIControl + 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 + 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 + 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 + 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 + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 59 + + + 0 + IBIPadFramework + NO + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + 3 + + {295, 156} + {295, 156} + {308, 144} + {296, 138} + {308, 144} + + + diff -r f08d5bb1d2b0 -r 83c0d96f86ea project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPhone.xib --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPhone.xib Fri Aug 14 21:27:55 2015 +0200 @@ -0,0 +1,749 @@ + + + + 1792 + 14E46 + 7706 + 1348.17 + 758.70 + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 7703 + + + IBProxyObject + IBUILabel + IBUIScrollView + IBUIView + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + IBFilesOwner + IBCocoaTouchFramework + + + IBFirstResponder + IBCocoaTouchFramework + + + + 292 + + + + 268 + + + + 292 + {{20, 587}, {440, 52}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Still confused? Don't worry, it's really simple! Try a couple of games and everything will become clear to you. + + 1 + MCAwIDAAA + + + 1 + 10 + 0 + 1 + + Helvetica + Helvetica + 0 + 16 + + + Helvetica + 16 + 16 + + YES + 440 + + + + 292 + {{20, 279}, {138, 22}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Size slider + + + 1 + 10 + + Helvetica-Bold + Helvetica + 2 + 18 + + + Helvetica-Bold + 18 + 16 + + YES + + + + 292 + {{20, 298}, {440, 44}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + For Random and Maze maps you can decide to generate only maps of a certain size. + + + 1 + 10 + 0 + + + YES + 440 + + + + 292 + {{20, 511}, {204, 22}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Schemes and Weapons + + + 1 + 10 + + + YES + + + + 292 + {{20, 530}, {433, 45}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Here you can choose which rules and which weapon set will be applied in game. + + + 1 + 10 + 0 + + + YES + 433 + + + + 292 + {{20, 68}, {109, 22}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Map preview + + + 1 + 10 + + + YES + + + + 292 + {{20, 88}, {440, 44}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + This is a small preview of your next map. Tap to select / generate a new map. + + + 1 + 10 + 0 + + + YES + 440 + + + + 292 + {{20, 140}, {109, 22}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Map type + + + 1 + 10 + + + YES + + + + 292 + {{20, 164}, {440, 58}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Choose between a static map or a randomly generated one (might require more time). In a mission you need to perfom some action to win. + + + 1 + 10 + 0 + + + YES + 440 + + + + 292 + {{20, 229}, {109, 22}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Map theme + + + 1 + 10 + + + YES + + + + 292 + {{20, 244}, {440, 33}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Here you can choose how your map will appear in game. + + + 1 + 10 + 0 + + + YES + 440 + + + + 292 + {{20, 347}, {138, 22}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Max hedgehogs + + + 1 + 10 + + + YES + + + + 292 + {{20, 367}, {440, 41}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + This number is the maximum size for all the hogs playing (in every team). + + + 1 + 10 + 0 + + + YES + 440 + + + + 292 + {{20, 418}, {109, 22}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Teams + + + 1 + 10 + + + YES + + + + 292 + {{20, 436}, {433, 66}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Select which teams are playing! Add hogs by tapping on them and set their color to figure friend and foe teams out. AI teams will appear with a small robot badge next their name. + + + 1 + 10 + 0 + + + YES + 433 + + + + 292 + {{13, 3}, {440, 60}} + + + NO + YES + 7 + NO + IBCocoaTouchFramework + Here you can find help for the game configuration options. You can customize almost everything in the settings page. + + + 1 + 10 + 0 + 1 + + Helvetica-Oblique + Helvetica + 1 + 16 + + + Helvetica-Oblique + 16 + 16 + + YES + 440 + + + {480, 276} + + + YES + YES + IBCocoaTouchFramework + + + {480, 276} + + + + 2 + MC45OTYwNzg0OTEyIDAuOTg4MjM1MzU0NCAxAA + + NO + NO + + + 3 + 3 + + + IBUISimulatedFreeformSizeMetricsSentinel + Freeform + + IBCocoaTouchFramework + + + + + + + view + + + + 3 + + + + scrollView + + + + 95 + + + + + + 0 + + + + + + -1 + + + File's Owner + + + -2 + + + + + 2 + + + + + + + + 60 + + + + + + + + + + + + + + + + + + + + + + + 61 + + + + + 62 + + + + + 63 + + + + + 64 + + + + + 65 + + + + + 66 + + + + + 67 + + + + + 68 + + + + + 69 + + + + + 70 + + + + + 71 + + + + + 72 + + + + + 73 + + + + + 74 + + + + + 75 + + + + + 76 + + + + + + + HelpPageLobbyViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + UIResponder + 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 + 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 + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + + + + 95 + + + + + HelpPageLobbyViewController + UIViewController + + dismiss + id + + + dismiss + + dismiss + id + + + + scrollView + UIScrollView + + + scrollView + + scrollView + UIScrollView + + + + IBProjectSource + ../Classes/HelpPageLobbyViewController.h + + + + HelpPageLobbyViewController + + dismiss + id + + + dismiss + + dismiss + id + + + + IBProjectSource + ../Classes/HelpPageLobbyViewController.m + + + + + + UIGestureRecognizer + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIGestureRecognizer.h + + + + UILabel + UIView + + IBFrameworkSource + UIKit.framework/Headers/UILabel.h + + + + UIResponder + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UIResponder.h + + + + UIScrollView + UIView + + IBFrameworkSource + UIKit.framework/Headers/UIScrollView.h + + + + UISearchBar + UIView + + IBFrameworkSource + UIKit.framework/Headers/UISearchBar.h + + + + UISearchDisplayController + NSObject + + IBFrameworkSource + UIKit.framework/Headers/UISearchDisplayController.h + + + + UIView + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIView.h + + + + UIViewController + UIResponder + + IBFrameworkSource + UIKit.framework/Headers/UIViewController.h + + + + + 0 + IBCocoaTouchFramework + NO + + com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 + + + YES + 3 + + diff -r f08d5bb1d2b0 -r 83c0d96f86ea project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.h --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.h Fri Aug 14 21:27:55 2015 +0200 @@ -0,0 +1,31 @@ +/* + * Hedgewars-iOS, a Hedgewars port for iOS devices + * Copyright (c) 2009-2012 Vittorio Giovara + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + +#import + + +@interface HelpPageLobbyViewController : UIViewController { + UIScrollView *scrollView; +} + +@property (nonatomic, retain) IBOutlet UIScrollView *scrollView; + +-(IBAction) dismiss; + +@end diff -r f08d5bb1d2b0 -r 83c0d96f86ea project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.m --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.m Fri Aug 14 21:27:55 2015 +0200 @@ -0,0 +1,64 @@ +/* + * Hedgewars-iOS, a Hedgewars port for iOS devices + * Copyright (c) 2009-2012 Vittorio Giovara + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; version 2 of the License + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + */ + + +#import "HelpPageLobbyViewController.h" + + +@implementation HelpPageLobbyViewController +@synthesize scrollView; + +-(BOOL) shouldAutorotateToInterfaceOrientation:(UIInterfaceOrientation) interfaceOrientation { + return rotationManager(interfaceOrientation); +} + +-(void) didReceiveMemoryWarning { + [super didReceiveMemoryWarning]; + self.scrollView = nil; +} + +// on iPhone the XIBs contain UIScrollView +-(void) viewDidLoad { + if (IS_IPAD() == NO){ + scrollView.contentSize = CGSizeMake(480,650); + scrollView.maximumZoomScale = 4.0; + scrollView.minimumZoomScale = 0.75; + scrollView.clipsToBounds = YES; + scrollView.delegate = self; + } + [super viewDidLoad]; +} + +-(void) viewDidUnload { + [super viewDidUnload]; + self.scrollView = nil; +} + +-(void) dealloc { + releaseAndNil(scrollView); + [super dealloc]; +} + +-(IBAction) dismiss { + [UIView beginAnimations:@"dismiss help" context:NULL]; + self.view.alpha = 0; + [UIView commitAnimations]; + [self.view performSelector:@selector(removeFromSuperview) withObject:nil afterDelay:1]; +} + +@end diff -r f08d5bb1d2b0 -r 83c0d96f86ea project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj --- a/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Fri Aug 14 02:10:53 2015 +0200 +++ b/project_files/HedgewarsMobile/Hedgewars.xcodeproj/project.pbxproj Fri Aug 14 21:27:55 2015 +0200 @@ -244,12 +244,20 @@ 61F9040B11DF59370068B24D /* background.png in Resources */ = {isa = PBXBuildFile; fileRef = 61F9040A11DF59370068B24D /* background.png */; }; 61F904D711DF7DA30068B24D /* WeaponCellView.m in Sources */ = {isa = PBXBuildFile; fileRef = 61F904D611DF7DA30068B24D /* WeaponCellView.m */; }; 922F64900F10F53100DC6EC0 /* libfpc.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 928301170F10CAFC00CC5A3C /* libfpc.a */; }; + F65724FD1B7E784700A86262 /* helpabove.png in Resources */ = {isa = PBXBuildFile; fileRef = F65724F81B7E784700A86262 /* helpabove.png */; }; + F65724FE1B7E784700A86262 /* helpbottom.png in Resources */ = {isa = PBXBuildFile; fileRef = F65724F91B7E784700A86262 /* helpbottom.png */; }; + F65724FF1B7E784700A86262 /* helpleft.png in Resources */ = {isa = PBXBuildFile; fileRef = F65724FA1B7E784700A86262 /* helpleft.png */; }; + F65725001B7E784700A86262 /* helpplain.png in Resources */ = {isa = PBXBuildFile; fileRef = F65724FB1B7E784700A86262 /* helpplain.png */; }; + F65725011B7E784700A86262 /* helpright.png in Resources */ = {isa = PBXBuildFile; fileRef = F65724FC1B7E784700A86262 /* helpright.png */; }; F6D7E09F1B76884E004F3BCF /* Default-568h@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = F6D7E09E1B76884E004F3BCF /* Default-568h@2x.png */; }; F6D7E0C21B768F19004F3BCF /* uLandGenPerlin.pas in Sources */ = {isa = PBXBuildFile; fileRef = F6D7E0BF1B768F19004F3BCF /* uLandGenPerlin.pas */; }; F6D7E0C31B768F19004F3BCF /* uLandGenTemplateBased.pas in Sources */ = {isa = PBXBuildFile; fileRef = F6D7E0C01B768F19004F3BCF /* uLandGenTemplateBased.pas */; }; F6D7E0C41B768F19004F3BCF /* uLandUtils.pas in Sources */ = {isa = PBXBuildFile; fileRef = F6D7E0C11B768F19004F3BCF /* uLandUtils.pas */; }; F6D7E0C61B769819004F3BCF /* CoreMotion.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D7E0C51B769819004F3BCF /* CoreMotion.framework */; }; F6D7E0C81B7698BF004F3BCF /* libstdc++.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = F6D7E0C71B7698BE004F3BCF /* libstdc++.dylib */; }; + F6F07BDE1B7E72D40010E48F /* HelpPageLobbyViewController-iPad.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6F07BDA1B7E72D40010E48F /* HelpPageLobbyViewController-iPad.xib */; }; + F6F07BDF1B7E72D40010E48F /* HelpPageLobbyViewController-iPhone.xib in Resources */ = {isa = PBXBuildFile; fileRef = F6F07BDB1B7E72D40010E48F /* HelpPageLobbyViewController-iPhone.xib */; }; + F6F07BE01B7E72D40010E48F /* HelpPageLobbyViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = F6F07BDD1B7E72D40010E48F /* HelpPageLobbyViewController.m */; }; /* End PBXBuildFile section */ /* Begin PBXBuildRule section */ @@ -698,12 +706,21 @@ 61F904D611DF7DA30068B24D /* WeaponCellView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = WeaponCellView.m; path = Classes/WeaponCellView.m; sourceTree = ""; }; 8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 928301170F10CAFC00CC5A3C /* libfpc.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libfpc.a; sourceTree = BUILT_PRODUCTS_DIR; }; + F65724F81B7E784700A86262 /* helpabove.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = helpabove.png; sourceTree = ""; }; + F65724F91B7E784700A86262 /* helpbottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = helpbottom.png; sourceTree = ""; }; + F65724FA1B7E784700A86262 /* helpleft.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = helpleft.png; sourceTree = ""; }; + F65724FB1B7E784700A86262 /* helpplain.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = helpplain.png; sourceTree = ""; }; + F65724FC1B7E784700A86262 /* helpright.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = helpright.png; sourceTree = ""; }; F6D7E09E1B76884E004F3BCF /* Default-568h@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "Default-568h@2x.png"; sourceTree = ""; }; F6D7E0BF1B768F19004F3BCF /* uLandGenPerlin.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uLandGenPerlin.pas; path = ../../hedgewars/uLandGenPerlin.pas; sourceTree = ""; }; F6D7E0C01B768F19004F3BCF /* uLandGenTemplateBased.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uLandGenTemplateBased.pas; path = ../../hedgewars/uLandGenTemplateBased.pas; sourceTree = ""; }; F6D7E0C11B768F19004F3BCF /* uLandUtils.pas */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.pascal; name = uLandUtils.pas; path = ../../hedgewars/uLandUtils.pas; sourceTree = ""; }; F6D7E0C51B769819004F3BCF /* CoreMotion.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreMotion.framework; path = System/Library/Frameworks/CoreMotion.framework; sourceTree = SDKROOT; }; F6D7E0C71B7698BE004F3BCF /* libstdc++.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = "libstdc++.dylib"; path = "usr/lib/libstdc++.dylib"; sourceTree = SDKROOT; }; + F6F07BDA1B7E72D40010E48F /* HelpPageLobbyViewController-iPad.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "HelpPageLobbyViewController-iPad.xib"; sourceTree = ""; }; + F6F07BDB1B7E72D40010E48F /* HelpPageLobbyViewController-iPhone.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = "HelpPageLobbyViewController-iPhone.xib"; sourceTree = ""; }; + F6F07BDC1B7E72D40010E48F /* HelpPageLobbyViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HelpPageLobbyViewController.h; sourceTree = ""; }; + F6F07BDD1B7E72D40010E48F /* HelpPageLobbyViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HelpPageLobbyViewController.m; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -938,6 +955,10 @@ 616591F311CA9BA200D6E256 /* MapConfigViewController.m */, 6165924D11CA9CB400D6E256 /* MapConfigViewController-iPad.xib */, 6165924E11CA9CB400D6E256 /* MapConfigViewController-iPhone.xib */, + F6F07BDC1B7E72D40010E48F /* HelpPageLobbyViewController.h */, + F6F07BDD1B7E72D40010E48F /* HelpPageLobbyViewController.m */, + F6F07BDA1B7E72D40010E48F /* HelpPageLobbyViewController-iPad.xib */, + F6F07BDB1B7E72D40010E48F /* HelpPageLobbyViewController-iPhone.xib */, ); name = "Game Configuration"; sourceTree = ""; @@ -1186,6 +1207,7 @@ 6172FEEC1298D25D00D73365 /* smallerBackground@2x~iphone.png */, 6172FEEE1298D25D00D73365 /* smallerBackground~iphone.png */, 6172FEED1298D25D00D73365 /* smallerBackground~ipad.png */, + F65724F71B7E784700A86262 /* Help Bubbles */, ); name = Frontend; sourceTree = ""; @@ -1264,6 +1286,19 @@ name = "Pascal Sources"; sourceTree = ""; }; + F65724F71B7E784700A86262 /* Help Bubbles */ = { + isa = PBXGroup; + children = ( + F65724F81B7E784700A86262 /* helpabove.png */, + F65724F91B7E784700A86262 /* helpbottom.png */, + F65724FA1B7E784700A86262 /* helpleft.png */, + F65724FB1B7E784700A86262 /* helpplain.png */, + F65724FC1B7E784700A86262 /* helpright.png */, + ); + name = "Help Bubbles"; + path = "Resources/Frontend/Help Bubbles"; + sourceTree = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -1459,6 +1494,7 @@ 61F7A43911E290650040BA66 /* Icon-Small-50.png in Resources */, 61F7A43A11E290650040BA66 /* Icon-Small.png in Resources */, 61F7A43C11E290650040BA66 /* Icon.png in Resources */, + F65724FE1B7E784700A86262 /* helpbottom.png in Resources */, 61F7A43E11E290650040BA66 /* iTunesArtwork.png in Resources */, 6129B9F711EFB04D0017E305 /* denied.png in Resources */, 61F2E7CF1205EDE0005734F7 /* AboutViewController.xib in Resources */, @@ -1473,6 +1509,7 @@ 611D9BFC12497E9800008271 /* SavedGamesViewController.xib in Resources */, 6147DAD31253DCDE0010357E /* savesButton.png in Resources */, 610D5FB21270E2660033333A /* Icon-Small@2x.png in Resources */, + F6F07BDF1B7E72D40010E48F /* HelpPageLobbyViewController-iPhone.xib in Resources */, 610D5FB31270E26C0033333A /* Icon@2x.png in Resources */, 61A670C012747D9B00B06CE7 /* Default.png in Resources */, 61A670C112747DB900B06CE7 /* MainMenuViewController-iPhone.xib in Resources */, @@ -1488,6 +1525,7 @@ 61889985129995B500D55FD6 /* title~ipad.png in Resources */, 615FEAE212A2A6640098EE92 /* localplayButton~ipad.png in Resources */, 615FEAE312A2A6640098EE92 /* localplayButton~iphone.png in Resources */, + F65725001B7E784700A86262 /* helpplain.png in Resources */, 61188BF712A6FE5A0026C5DA /* backButton@2x.png in Resources */, 61188BF812A6FE5C0026C5DA /* background@2x~iphone.png in Resources */, 61188BF912A6FE5D0026C5DA /* checkbox@2x.png in Resources */, @@ -1500,10 +1538,14 @@ 61188C0412A6FE880026C5DA /* savesButton@2x.png in Resources */, 61188C0512A6FE8F0026C5DA /* Data in Resources */, 61188C0612A6FE950026C5DA /* smallerBackground@2x~iphone.png in Resources */, + F65724FD1B7E784700A86262 /* helpabove.png in Resources */, + F6F07BDE1B7E72D40010E48F /* HelpPageLobbyViewController-iPad.xib in Resources */, 61188C0712A6FE960026C5DA /* settingsButton@2x.png in Resources */, 61188C0812A6FE9A0026C5DA /* title@2x~iphone.png in Resources */, + F65724FF1B7E784700A86262 /* helpleft.png in Resources */, 61188C0912A6FE9C0026C5DA /* tw@2x.png in Resources */, 6174F7C812CD62E300205D6F /* smallerTitle.png in Resources */, + F65725011B7E784700A86262 /* helpright.png in Resources */, 6174F7C912CD62E300205D6F /* smallerTitle@2x.png in Resources */, 6167A6771391514600AA6D07 /* RestoreViewController-iPhone.xib in Resources */, 6167A72D13919E6800AA6D07 /* RestoreViewController-iPad.xib in Resources */, @@ -1730,6 +1772,7 @@ 615E76BC14E4421200FBA131 /* MGSplitCornersView.m in Sources */, 615E76BD14E4421200FBA131 /* MGSplitDividerView.m in Sources */, 615E76BE14E4421200FBA131 /* MGSplitViewController.m in Sources */, + F6F07BE01B7E72D40010E48F /* HelpPageLobbyViewController.m in Sources */, 615BE3D4155C5DDF003CA34D /* uInputHandler.pas in Sources */, 619349C8160BAF3E00A08518 /* uAILandMarks.pas in Sources */, 619349C9160BAF3E00A08518 /* uGearsHandlers.pas in Sources */, diff -r f08d5bb1d2b0 -r 83c0d96f86ea project_files/HedgewarsMobile/Resources/Frontend/Help Bubbles/helpabove.png Binary file project_files/HedgewarsMobile/Resources/Frontend/Help Bubbles/helpabove.png has changed diff -r f08d5bb1d2b0 -r 83c0d96f86ea project_files/HedgewarsMobile/Resources/Frontend/Help Bubbles/helpbottom.png Binary file project_files/HedgewarsMobile/Resources/Frontend/Help Bubbles/helpbottom.png has changed diff -r f08d5bb1d2b0 -r 83c0d96f86ea project_files/HedgewarsMobile/Resources/Frontend/Help Bubbles/helpleft.png Binary file project_files/HedgewarsMobile/Resources/Frontend/Help Bubbles/helpleft.png has changed diff -r f08d5bb1d2b0 -r 83c0d96f86ea project_files/HedgewarsMobile/Resources/Frontend/Help Bubbles/helpplain.png Binary file project_files/HedgewarsMobile/Resources/Frontend/Help Bubbles/helpplain.png has changed diff -r f08d5bb1d2b0 -r 83c0d96f86ea project_files/HedgewarsMobile/Resources/Frontend/Help Bubbles/helpright.png Binary file project_files/HedgewarsMobile/Resources/Frontend/Help Bubbles/helpright.png has changed