# HG changeset patch # User antonc27 # Date 1439590924 -7200 # Node ID 182a42b79610af327be88c2a02d75a439ef978cb # Parent 83c0d96f86eaaa2da81a902d2e7a8ed171f8b539 - HelpPageLobbyViewController updated: various UI fixes, autorotation fixes, help bubbles for iPad grouped Note: Xib's are automodified by Xcode diff -r 83c0d96f86ea -r 182a42b79610 project_files/HedgewarsMobile/Classes/GameConfigViewController-iPad.xib --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController-iPad.xib Fri Aug 14 21:27:55 2015 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController-iPad.xib Sat Aug 15 00:22:04 2015 +0200 @@ -1,34 +1,28 @@ - + - 1056 - 10K549 - 823 - 1038.36 - 461.00 + 1792 + 14E46 + 7706 + 1348.17 + 758.70 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 132 - - - YES - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 7703 - - YES - - YES - - - YES - - - - YES + + IBProxyObject + IBUIButton + IBUIImageView + IBUISlider + IBUIView + IBUIViewController + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + IBFilesOwner IBIPadFramework @@ -38,10 +32,9 @@ IBIPadFramework - - 292 - - YES + + 256 + 274 @@ -66,7 +59,7 @@ IBIPadFramework NSImage - title~iphone.png + title.png @@ -79,19 +72,14 @@ IBIPadFramework 0 0 - - Helvetica-Bold - 15 - 16 + + 1 + MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA 3 MQA - - 1 - MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA - 3 MC41AA @@ -100,6 +88,17 @@ NSImage startGameButton.png + + Helvetica-Bold + Helvetica + 2 + 15 + + + Helvetica-Bold + 15 + 16 + @@ -110,17 +109,18 @@ IBIPadFramework 0 0 - - 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + NSImage backButton.png + + @@ -132,17 +132,18 @@ IBIPadFramework 0 0 - - 1 MC4xOTYwNzg0MzQ2IDAuMzA5ODAzOTMyOSAwLjUyMTU2ODY1NgA + NSImage helpButton.png + + @@ -179,27 +180,47 @@ 0.05000000074505806 0.05000000074505806 - + {1024, 768} - YES + 3 3 + + IBUIScreenMetrics + IBIPadFramework + iPad Full Screen + + YES + + + + + + {768, 1024} + {1024, 768} + + + 1 + IBIPadFramework NO + 3 3 + IBIPadFramework YES NO + IBIPadFramework YES @@ -207,13 +228,13 @@ NO MapConfigViewController-iPad + IBIPadFramework YES - + - - YES + view @@ -223,6 +244,47 @@ 3 + + teamConfigViewController + + + + 45 + + + + schemeWeaponConfigViewController + + + + 51 + + + + mapConfigViewController + + + + 57 + + + + titleImage + + + + 68 + + + + buttonPressed: + + + 7 + + 36 + + buttonPressed: @@ -234,15 +296,6 @@ buttonPressed: - - - 7 - - 36 - - - - buttonPressed: 7 @@ -251,14 +304,6 @@ - teamConfigViewController - - - - 45 - - - view @@ -275,19 +320,11 @@ - schemeWeaponConfigViewController - - + slider + + - 51 - - - - mapConfigViewController - - - - 57 + 69 @@ -307,29 +344,12 @@ 67 - - - titleImage - - - - 68 - - - - slider - - - - 69 - - + - - YES + 0 - + @@ -347,8 +367,7 @@ 2 - - YES + @@ -357,7 +376,7 @@ - + @@ -393,17 +412,13 @@ 44 - - YES - + 46 - - YES - + TeamConfigViewController View @@ -429,650 +444,52 @@ Filter Slider - + - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 2.IBEditorWindowLastContentRect - 2.IBPluginDependency - 30.IBPluginDependency - 30.IBViewBoundsToFrameTransform - 31.IBPluginDependency - 31.IBViewBoundsToFrameTransform - 32.IBPluginDependency - 32.IBViewBoundsToFrameTransform - 33.IBPluginDependency - 33.IBViewBoundsToFrameTransform - 34.IBPluginDependency - 34.IBViewBoundsToFrameTransform - 44.CustomClassName - 44.IBEditorWindowLastContentRect - 44.IBPluginDependency - 46.IBPluginDependency - 46.IBViewBoundsToFrameTransform - 48.CustomClassName - 48.IBEditorWindowLastContentRect - 48.IBPluginDependency - 49.IBPluginDependency - 49.IBViewBoundsToFrameTransform - 55.CustomClassName - 55.IBEditorWindowLastContentRect - 55.IBPluginDependency - 60.CustomClassName - 60.IBPluginDependency - 60.IBViewBoundsToFrameTransform - - - YES - GameConfigViewController - UIResponder - {{252, 239}, {1024, 768}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABAoAAAxLrgAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABDtQAAxGNAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABD3wAAxLqgAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABByAAAxLmAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABEbEAAxLmAAA - - TeamConfigViewController - {{63, 355}, {1024, 768}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - AUOogABDOwAAA - - SchemeWeaponConfigViewController - {{84, 388}, {1024, 768}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAAAAAAAAxHqAAA - - MapConfigViewController - {{126, 377}, {1024, 768}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - MNEValueTrackingSlider - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - AUNRAABEMoAAA - - - - - YES - - - YES - - + + GameConfigViewController + 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 + TeamConfigViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + SchemeWeaponConfigViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + MapConfigViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + MNEValueTrackingSlider + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + - - YES - - - YES - - + 69 - - - YES - - GameConfigViewController - UIViewController - - YES - - YES - buttonPressed: - segmentPressed: - - - YES - id - id - - - - YES - - YES - buttonPressed: - segmentPressed: - - - YES - - buttonPressed: - id - - - segmentPressed: - id - - - - - YES - - YES - mapConfigViewController - schemeWeaponConfigViewController - teamConfigViewController - titleImage - - - YES - MapConfigViewController - SchemeWeaponConfigViewController - TeamConfigViewController - UIImageView - - - - YES - - YES - mapConfigViewController - schemeWeaponConfigViewController - teamConfigViewController - titleImage - - - YES - - mapConfigViewController - MapConfigViewController - - - schemeWeaponConfigViewController - SchemeWeaponConfigViewController - - - teamConfigViewController - TeamConfigViewController - - - titleImage - UIImageView - - - - - IBProjectSource - Classes/GameConfigViewController.h - - - - MNEValueTrackingSlider - UISlider - - IBProjectSource - Classes/MNEValueTrackingSlider.h - - - - MapConfigViewController - UIViewController - - YES - - YES - mapButtonPressed: - segmentedControlChanged: - sliderChanged: - sliderEndedChanging: - - - YES - id - id - id - id - - - - YES - - YES - mapButtonPressed: - segmentedControlChanged: - sliderChanged: - sliderEndedChanging: - - - YES - - mapButtonPressed: - id - - - segmentedControlChanged: - id - - - sliderChanged: - id - - - sliderEndedChanging: - id - - - - - YES - - YES - maxLabel - previewButton - segmentedControl - slider - tableView - - - YES - UILabel - MapPreviewButtonView - UISegmentedControl - MNEValueTrackingSlider - UITableView - - - - YES - - YES - maxLabel - previewButton - segmentedControl - slider - tableView - - - YES - - maxLabel - UILabel - - - previewButton - MapPreviewButtonView - - - segmentedControl - UISegmentedControl - - - slider - MNEValueTrackingSlider - - - tableView - UITableView - - - - - IBProjectSource - Classes/MapConfigViewController.h - - - - MapPreviewButtonView - UIButton - - delegate - id - - - delegate - - delegate - id - - - - IBProjectSource - Classes/MapPreviewButtonView.h - - - - SchemeWeaponConfigViewController - UIViewController - - IBProjectSource - Classes/SchemeWeaponConfigViewController.h - - - - TeamConfigViewController - UIViewController - - IBProjectSource - Classes/TeamConfigViewController.h - - - - UIButton - - IBProjectSource - Classes/ExtraCategories.h - - - - UILabel - - - - UITableView - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CAAnimation.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CALayer.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - - - UIButton - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UIButton.h - - - - UIControl - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIControl.h - - - - UIImageView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIImageView.h - - - - UILabel - UIView - - IBFrameworkSource - UIKit.framework/Headers/UILabel.h - - - - UIResponder - NSObject - - - - UIScrollView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIScrollView.h - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.h - - - - UISegmentedControl - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UISegmentedControl.h - - - - UISlider - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UISlider.h - - - - UITableView - UIScrollView - - IBFrameworkSource - UIKit.framework/Headers/UITableView.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIPrintFormatter.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIView.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - - + 0 IBIPadFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - + NO com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - + YES - ../Hedgewars.xcodeproj 3 - - YES - - YES - backButton.png - background.png - helpButton.png - startGameButton.png - title~iphone.png - - - YES - {64, 64} - {1024, 768} - {64, 64} - {142, 64} - {270, 150} - - - 132 + + {64, 64} + {1024, 768} + {64, 64} + {142, 64} + {540, 300} + diff -r 83c0d96f86ea -r 182a42b79610 project_files/HedgewarsMobile/Classes/GameConfigViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController-iPhone.xib Fri Aug 14 21:27:55 2015 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController-iPhone.xib Sat Aug 15 00:22:04 2015 +0200 @@ -1,35 +1,28 @@ - + - 1056 - 10K549 - 823 - 1038.36 - 461.00 + 1792 + 14E46 + 7706 + 1348.17 + 758.70 com.apple.InterfaceBuilder.IBCocoaTouchPlugin - 132 - - - YES - - - - - YES - com.apple.InterfaceBuilder.IBCocoaTouchPlugin + 7703 - - YES - - YES - - - YES - - - - YES + + IBProxyObject + IBUIBarButtonItem + IBUISegmentedControl + IBUIToolbar + IBUIView + IBUIViewController + + + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + + IBFilesOwner IBCocoaTouchFramework @@ -39,19 +32,17 @@ IBCocoaTouchFramework - - 292 - - YES + + 274 + 266 - - YES + 292 - {{96, 8}, {270, 30}} + {{105, 8}, {270, 30}} NO 12345 @@ -59,55 +50,50 @@ 2 4 0 - - YES + Map Teams Details Help - - - YES + + - - - YES + + - - - YES + + {0, 0} {0, 0} {0, 0} {0, 0} - - - YES + + - + 1 MC42IDAuNiAwLjYAA - + {{0, 276}, {480, 44}} + NO NO IBCocoaTouchFramework 1 - - YES + Back IBCocoaTouchFramework @@ -137,13 +123,14 @@ 2 - + 274 {480, 276} + 3 MQA @@ -159,6 +146,7 @@ 274 {480, 276} + 3 MQA @@ -167,25 +155,48 @@ YES IBCocoaTouchFramework - + {480, 320} - + 3 MQA NO + 3 3 + + IBUISimulatedFreeformSizeMetricsSentinel + Freeform + IBCocoaTouchFramework MapConfigViewController-iPhone + 3 3 + + IBUIScreenMetrics + IBCocoaTouchFramework + iPhone 4-inch + + YES + + + + + + {320, 568} + {568, 320} + + + 2 + IBCocoaTouchFramework YES @@ -194,19 +205,20 @@ 1 + IBCocoaTouchFramework YES + IBCocoaTouchFramework YES - + - - YES + view @@ -216,6 +228,30 @@ 3 + + mapConfigViewController + + + + 33 + + + + teamConfigViewController + + + + 34 + + + + schemeWeaponConfigViewController + + + + 35 + + buttonPressed: @@ -242,30 +278,6 @@ - mapConfigViewController - - - - 33 - - - - teamConfigViewController - - - - 34 - - - - schemeWeaponConfigViewController - - - - 35 - - - view @@ -280,13 +292,12 @@ 43 - + - - YES + 0 - + @@ -304,25 +315,23 @@ 2 - - YES + - + 15 - - YES + - + @@ -343,10 +352,9 @@ 21 - - YES + - + @@ -386,629 +394,45 @@ SchemeWeaponConfigViewController View - + - - YES - - YES - -1.CustomClassName - -2.CustomClassName - 15.IBPluginDependency - 15.IBViewBoundsToFrameTransform - 16.IBPluginDependency - 18.IBPluginDependency - 19.IBPluginDependency - 2.IBEditorWindowLastContentRect - 2.IBPluginDependency - 20.IBPluginDependency - 22.IBPluginDependency - 30.CustomClassName - 30.IBEditorWindowLastContentRect - 30.IBPluginDependency - 31.CustomClassName - 31.IBEditorWindowLastContentRect - 31.IBPluginDependency - 32.CustomClassName - 32.IBEditorWindowLastContentRect - 32.IBPluginDependency - 40.IBPluginDependency - 40.IBViewBoundsToFrameTransform - 41.IBPluginDependency - 41.IBViewBoundsToFrameTransform - - - YES - GameConfigViewController - UIResponder - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAAAAAAAAw58AAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - {{40, 217}, {480, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - MapConfigViewController - {{0, 825}, {480, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - TeamConfigViewController - {{21, 802}, {480, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - SchemeWeaponConfigViewController - {{42, 779}, {480, 320}} - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAAAAAAAAw5QAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAAAAAAAAw5QAAA - - - - - YES - - - YES - - + + GameConfigViewController + 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 + MapConfigViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + TeamConfigViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + SchemeWeaponConfigViewController + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + - - YES - - - YES - - + 45 - - - YES - - GameConfigViewController - UIViewController - - YES - - YES - buttonPressed: - segmentPressed: - - - YES - id - id - - - - YES - - YES - buttonPressed: - segmentPressed: - - - YES - - buttonPressed: - id - - - segmentPressed: - id - - - - - YES - - YES - mapConfigViewController - schemeWeaponConfigViewController - teamConfigViewController - titleImage - - - YES - MapConfigViewController - SchemeWeaponConfigViewController - TeamConfigViewController - UIImageView - - - - YES - - YES - mapConfigViewController - schemeWeaponConfigViewController - teamConfigViewController - titleImage - - - YES - - mapConfigViewController - MapConfigViewController - - - schemeWeaponConfigViewController - SchemeWeaponConfigViewController - - - teamConfigViewController - TeamConfigViewController - - - titleImage - UIImageView - - - - - IBProjectSource - Classes/GameConfigViewController.h - - - - MapConfigViewController - UIViewController - - YES - - YES - mapButtonPressed: - segmentedControlChanged: - sliderChanged: - sliderEndedChanging: - - - YES - id - id - id - id - - - - YES - - YES - mapButtonPressed: - segmentedControlChanged: - sliderChanged: - sliderEndedChanging: - - - YES - - mapButtonPressed: - id - - - segmentedControlChanged: - id - - - sliderChanged: - id - - - sliderEndedChanging: - id - - - - - YES - - YES - maxLabel - previewButton - segmentedControl - slider - tableView - - - YES - UILabel - MapPreviewButtonView - UISegmentedControl - ValueTrackingSliderView - UITableView - - - - YES - - YES - maxLabel - previewButton - segmentedControl - slider - tableView - - - YES - - maxLabel - UILabel - - - previewButton - MapPreviewButtonView - - - segmentedControl - UISegmentedControl - - - slider - ValueTrackingSliderView - - - tableView - UITableView - - - - - IBProjectSource - Classes/MapConfigViewController.h - - - - MapPreviewButtonView - UIButton - - delegate - id - - - delegate - - delegate - id - - - - IBProjectSource - Classes/MapPreviewButtonView.h - - - - SchemeWeaponConfigViewController - UIViewController - - IBProjectSource - Classes/SchemeWeaponConfigViewController.h - - - - TeamConfigViewController - UIViewController - - IBProjectSource - Classes/TeamConfigViewController.h - - - - UILabel - - IBProjectSource - Classes/ExtraCategories.h - - - - UITableView - - - - ValueTrackingSliderView - UISlider - - IBProjectSource - Classes/MNEValueTrackingSlider.h - - - - - YES - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CAAnimation.h - - - - NSObject - - IBFrameworkSource - QuartzCore.framework/Headers/CALayer.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIAccessibility.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UINibLoading.h - - - - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIResponder.h - - - - UIBarButtonItem - UIBarItem - - IBFrameworkSource - UIKit.framework/Headers/UIBarButtonItem.h - - - - UIBarItem - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UIBarItem.h - - - - UIButton - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UIButton.h - - - - UIControl - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIControl.h - - - - UIImageView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIImageView.h - - - - UILabel - UIView - - IBFrameworkSource - UIKit.framework/Headers/UILabel.h - - - - UIResponder - NSObject - - - - UIScrollView - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIScrollView.h - - - - UISearchBar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UISearchBar.h - - - - UISearchDisplayController - NSObject - - IBFrameworkSource - UIKit.framework/Headers/UISearchDisplayController.h - - - - UISegmentedControl - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UISegmentedControl.h - - - - UISlider - UIControl - - IBFrameworkSource - UIKit.framework/Headers/UISlider.h - - - - UITableView - UIScrollView - - IBFrameworkSource - UIKit.framework/Headers/UITableView.h - - - - UIToolbar - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIToolbar.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UIPrintFormatter.h - - - - UIView - - IBFrameworkSource - UIKit.framework/Headers/UITextField.h - - - - UIView - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIView.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UINavigationController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UIPopoverController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UISplitViewController.h - - - - UIViewController - - IBFrameworkSource - UIKit.framework/Headers/UITabBarController.h - - - - UIViewController - UIResponder - - IBFrameworkSource - UIKit.framework/Headers/UIViewController.h - - - - + 0 IBCocoaTouchFramework - - com.apple.InterfaceBuilder.CocoaTouchPlugin.iPhoneOS - - + NO com.apple.InterfaceBuilder.CocoaTouchPlugin.InterfaceBuilder3 - + YES - ../Hedgewars.xcodeproj 3 - 132 diff -r 83c0d96f86ea -r 182a42b79610 project_files/HedgewarsMobile/Classes/GameConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Fri Aug 14 21:27:55 2015 +0200 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sat Aug 15 00:22:04 2015 +0200 @@ -69,6 +69,7 @@ if (self.helpPage == nil) self.helpPage = [[HelpPageLobbyViewController alloc] initWithNibName:@"HelpPageLobbyViewController-iPad" bundle:nil]; self.helpPage.view.alpha = 0; + self.helpPage.view.frame = self.view.frame; [self.view addSubview:self.helpPage.view]; [UIView beginAnimations:@"helplobby" context:NULL]; self.helpPage.view.alpha = 1; @@ -104,6 +105,9 @@ case 3: if (helpPage == nil) { helpPage = [[HelpPageLobbyViewController alloc] initWithNibName:@"HelpPageLobbyViewController-iPhone" bundle:nil]; + CGRect helpPageFrame = self.view.frame; + helpPageFrame.size.height -= 44; //toolbar height + self.helpPage.view.frame = helpPageFrame; [self.view addSubview:helpPage.view]; } // this message is compulsory otherwise the table won't be loaded at all @@ -344,6 +348,10 @@ [self.schemeWeaponConfigViewController willAnimateRotationToInterfaceOrientation:toInterfaceOrientation duration:duration]; + if (self.helpPage) + { + self.helpPage.view.frame = self.view.frame; + } } -(void) viewWillAppear:(BOOL)animated { diff -r 83c0d96f86ea -r 182a42b79610 project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPad.xib --- a/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPad.xib Fri Aug 14 21:27:55 2015 +0200 +++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPad.xib Sat Aug 15 00:22:04 2015 +0200 @@ -31,567 +31,681 @@ - 292 + 256 - - - 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}} + + + + 274 + {{0, 1}, {278, 50}} + + + NO + NO + IBIPadFramework + + NSImage + helpleft.png + + + + + 274 + {{22, -2}, {248, 54}} + + + NO + YES + 7 + NO + IBIPadFramework + Did you know you can customize almost everything in the settings page? + + 1 + MCAwIDAAA + darkTextColor + + + 1 + 10 + 0 + + Helvetica-Oblique + Helvetica + 1 + 14 + + + Helvetica-Oblique + 14 + 16 + + YES + 248 + + + {{10, 8}, {278, 52}} - - NO - YES - 7 - NO + + + 3 + MCAwAA + IBIPadFramework - Here you can choose which rules and which weapon set will be applied in game. - - - 1 - 10 - 0 - - - YES - 210 - + + + 297 + + + + 274 + {240, 102} + + + NO + NO + IBIPadFramework + + NSImage + helpabove.png + + + + + 292 + {{12, 19}, {109, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Map theme + + + 1 + 10 + + Helvetica-Bold + Helvetica + 2 + 18 + + + Helvetica-Bold + 18 + 16 + + YES + + + + 274 + {{11, 36}, {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 + + + {{742, 360}, {240, 102}} + + + + IBIPadFramework + + - 292 - {{155, 8}, {278, 50}} + 289 + + + + 274 + {240, 146} + + + NO + NO + IBIPadFramework + + + + + 292 + {{11, 22}, {109, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Map type + + + 1 + 10 + + + YES + + + + 274 + {{11, 41}, {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 + + + {{653, 202}, {240, 146}} - - NO - NO + + IBIPadFramework - - + - 292 - {{177, 6}, {248, 54}} + 289 + + + + 274 + {240, 101} + + + NO + NO + IBIPadFramework + + NSImage + helpright.png + + + + + 292 + {{9, 7}, {109, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Map preview + + + 1 + 10 + + + YES + + + + 274 + {{8, 25}, {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 + + + {{494, 20}, {240, 101}} - 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}} + 269 + + + + 274 + {242, 171} + + + NO + NO + IBIPadFramework + + + + + 292 + {{8, 25}, {109, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Teams + + + 1 + 10 + + + YES + + + + 274 + {{10, 45}, {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 + + + {{358, 389}, {242, 171}} - - 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}} + + + + 274 + {240, 104} + + + NO + NO + IBIPadFramework + + + + + 292 + {{23, 8}, {204, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Schemes and Weapons + + + 1 + 10 + + + YES + + + + 274 + {{23, 27}, {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 + + + {{142, 160}, {240, 104}} - - 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}} + 268 + + + + 274 + {240, 117} + + + NO + NO + IBIPadFramework + + NSImage + helpbottom.png + + + + + 292 + {{10, 8}, {138, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Max hedgehogs + + + 1 + 10 + + + YES + + + + 274 + {{11, 26}, {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 + + + {{35, 590}, {240, 117}} - - NO - NO + + IBIPadFramework - - NSImage - helpplain.png - - + + + 265 + + + + 274 + {240, 109} + + + NO + NO + IBIPadFramework + + + + + 292 + {{8, 6}, {138, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Size slider + + + 1 + 10 + + + YES + + + + 292 + {{11, 22}, {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 + + + {{695, 598}, {240, 109}} + + + + IBIPadFramework + + 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}} + + + + 274 + {240, 128} + + + NO + NO + IBIPadFramework + + NSImage + helpplain.png + + + + + 288 + {{6, 8}, {229, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Tap anywhere to dismiss + + + 1 + 10 + 1 + + + YES + + + + 274 + {{8, 32}, {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 + + + {{45, 360}, {240, 128}} - - NO - NO - IBIPadFramework - - - - - 292 - {{353, 637}, {138, 22}} - - - NO - YES - 7 - NO + + IBIPadFramework - Start button - - - 1 - 10 - - - YES - + - 292 - {{354, 650}, {218, 46}} + 269 + + + + 274 + {240, 61} + + + NO + NO + IBIPadFramework + + + + + 292 + {{8, 3}, {138, 22}} + + + NO + YES + 7 + NO + IBIPadFramework + Start button + + + 1 + 10 + + + YES + + + + 274 + {{11, 14}, {218, 46}} + + + NO + YES + 7 + NO + IBIPadFramework + This button starts the game. + + + 1 + 10 + 0 + + + YES + 218 + + + {{344, 646}, {240, 61}} - - NO - YES - 7 - NO + + IBIPadFramework - This button starts the game. - - - 1 - 10 - 0 - - - YES - 218 {1024, 768} - + 3 MCAwLjQAA @@ -665,182 +779,272 @@ 2 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + - 6 - + 60 + + + + + + + Teams Bubble + + + 43 + + - 7 - - + 44 + + + + + 45 + + - 8 - + 61 + + + + + + + Tap anywere Bubble 25 - + 26 - + 27 + + + + 62 + + + + + + + Start button Bubble - 28 - - + 49 + + + + + 50 + + + + + 51 + + - 29 - + 63 + + + + + + + Size slider Bubble + + + 37 + + - 30 - + 38 + + + + + 39 + + + + + 64 + + + + + + + Max hogs Bubble 34 - + 35 - + 36 + + + + 65 + + + + + + + Map theme Bubble + + + 28 + + - 37 - + 29 + + + + + 30 + + + + + 66 + + + + + + + Map type Bubble + + + 52 + + - 38 - + 53 + + + + + 54 + + + + + 67 + + + + + + + Map preview Bubble - 39 - + 6 + + + + + 7 + + + + + 8 + + + + + 68 + + + + + + + Schemes & Weapons Bubble 40 - + 41 - + 42 - - - - 43 - - - - - 44 - - - - - 45 - - - - - 49 - - + - 50 - - - - - 51 - + 69 + + + + + - - - 52 - - - - - 53 - - - - - 54 - - + Customize Bubble 58 - + 59 - + @@ -850,6 +1054,8 @@ UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIControl + + {581, 369} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -878,6 +1084,18 @@ 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 @@ -885,7 +1103,7 @@ - 59 + 70 0 diff -r 83c0d96f86ea -r 182a42b79610 project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPhone.xib Fri Aug 14 21:27:55 2015 +0200 +++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController-iPhone.xib Sat Aug 15 00:22:04 2015 +0200 @@ -30,19 +30,18 @@ IBCocoaTouchFramework - - 292 + + 274 - 268 + 274 - 292 + 290 {{20, 587}, {440, 52}} - NO YES 7 @@ -58,7 +57,7 @@ 10 0 1 - + Helvetica Helvetica 0 @@ -77,7 +76,6 @@ 292 {{20, 279}, {138, 22}} - NO YES 7 @@ -88,7 +86,7 @@ 1 10 - + Helvetica-Bold Helvetica 2 @@ -103,10 +101,9 @@ - 292 + 290 {{20, 298}, {440, 44}} - NO YES 7 @@ -118,7 +115,7 @@ 1 10 0 - + YES 440 @@ -128,7 +125,6 @@ 292 {{20, 511}, {204, 22}} - NO YES 7 @@ -139,16 +135,15 @@ 1 10 - + YES - 292 + 290 {{20, 530}, {433, 45}} - NO YES 7 @@ -160,7 +155,7 @@ 1 10 0 - + YES 433 @@ -170,7 +165,6 @@ 292 {{20, 68}, {109, 22}} - NO YES 7 @@ -181,16 +175,15 @@ 1 10 - + YES - 292 + 290 {{20, 88}, {440, 44}} - NO YES 7 @@ -202,7 +195,7 @@ 1 10 0 - + YES 440 @@ -212,7 +205,6 @@ 292 {{20, 140}, {109, 22}} - NO YES 7 @@ -223,16 +215,15 @@ 1 10 - + YES - 292 + 290 {{20, 164}, {440, 58}} - NO YES 7 @@ -244,7 +235,7 @@ 1 10 0 - + YES 440 @@ -254,7 +245,6 @@ 292 {{20, 229}, {109, 22}} - NO YES 7 @@ -265,16 +255,15 @@ 1 10 - + YES - 292 + 290 {{20, 244}, {440, 33}} - NO YES 7 @@ -286,7 +275,7 @@ 1 10 0 - + YES 440 @@ -296,7 +285,6 @@ 292 {{20, 347}, {138, 22}} - NO YES 7 @@ -307,16 +295,15 @@ 1 10 - + YES - 292 + 290 {{20, 367}, {440, 41}} - NO YES 7 @@ -328,7 +315,7 @@ 1 10 0 - + YES 440 @@ -338,7 +325,6 @@ 292 {{20, 418}, {109, 22}} - NO YES 7 @@ -349,16 +335,15 @@ 1 10 - + YES - 292 + 290 {{20, 436}, {433, 66}} - NO YES 7 @@ -370,17 +355,16 @@ 1 10 0 - + YES 433 - 292 - {{13, 3}, {440, 60}} + 290 + {{20, 3}, {440, 60}} - NO YES 7 @@ -410,15 +394,12 @@ {480, 276} - YES YES IBCocoaTouchFramework {480, 276} - - 2 MC45OTYwNzg0OTEyIDAuOTg4MjM1MzU0NCAxAA @@ -593,6 +574,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin UIResponder com.apple.InterfaceBuilder.IBCocoaTouchPlugin + {505, 338} com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -618,124 +600,7 @@ 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 diff -r 83c0d96f86ea -r 182a42b79610 project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.m --- a/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.m Fri Aug 14 21:27:55 2015 +0200 +++ b/project_files/HedgewarsMobile/Classes/HelpPageLobbyViewController.m Sat Aug 15 00:22:04 2015 +0200 @@ -35,7 +35,7 @@ // on iPhone the XIBs contain UIScrollView -(void) viewDidLoad { if (IS_IPAD() == NO){ - scrollView.contentSize = CGSizeMake(480,650); + scrollView.contentSize = CGSizeMake(self.view.frame.size.width, 650); scrollView.maximumZoomScale = 4.0; scrollView.minimumZoomScale = 0.75; scrollView.clipsToBounds = YES;