# HG changeset patch # User koda # Date 1329066514 -3600 # Node ID beab48f963d512e1cb2fe1f819a9905d2da14d80 # Parent 6b7560b37eef01ace0eac4a09ca6d5cbd084c1ab restored interface on iphone diff -r 6b7560b37eef -r beab48f963d5 project_files/HedgewarsMobile/Classes/GameConfigViewController.m --- a/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Feb 12 19:38:32 2012 +0400 +++ b/project_files/HedgewarsMobile/Classes/GameConfigViewController.m Sun Feb 12 18:08:34 2012 +0100 @@ -312,7 +312,7 @@ self.mapConfigViewController.maxLabel = maxLabel; [maxLabel release]; } else { - self.mapConfigViewController.view.frame = CGRectMake(0, 0, screenRect.size.height, screenRect.size.width-44); + self.mapConfigViewController.view.frame = CGRectMake(0, 0, screenRect.size.width, screenRect.size.height-44); } [self.view addSubview:self.mapConfigViewController.view]; [self.view bringSubviewToFront:self.mapConfigViewController.slider]; diff -r 6b7560b37eef -r beab48f963d5 project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib --- a/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib Sun Feb 12 19:38:32 2012 +0400 +++ b/project_files/HedgewarsMobile/Classes/MapConfigViewController-iPhone.xib Sun Feb 12 18:08:34 2012 +0100 @@ -104,17 +104,30 @@ MC42NjY2NjY2NjY3AA - + 292 - {{119, 207}, {149, 23}} + {{71, 196}, {145, 44}} NO + YES + 7 + NO IBCocoaTouchFramework - 0 - 0 - 0.05000000074505806 - 0.05000000074505806 + Loading... + + Helvetica-Bold + 17 + 16 + + + 2 + MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA + + + 1 + 10 + 1 @@ -143,56 +156,6 @@ MC41AA - - - 292 - {{9, 221}, {97, 35}} - - NO - YES - 7 - NO - IBCocoaTouchFramework - Loading... - - Helvetica-Bold - 17 - 16 - - - 2 - MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA - - - 1 - 10 - 1 - - - - 292 - {{109, 237}, {169, 29}} - - NO - YES - 7 - NO - IBCocoaTouchFramework - Label - - Helvetica-Oblique - 22 - 16 - - - 2 - MC45NDExNzY1MzM3IDAuODE1Njg2MzQ1MSAwAA - - - 1 - 10 - 1 - 274 @@ -215,6 +178,18 @@ 10 10 + + + 292 + {{52, 239}, {184, 23}} + + NO + IBCocoaTouchFramework + 0 + 0 + 0.05000000074505806 + 0.05000000074505806 + {480, 276} @@ -254,14 +229,6 @@ 16 - - sizeLabel - - - - 18 - - sliderChanged: @@ -362,11 +329,10 @@ YES - - + @@ -387,23 +353,16 @@ - 8 - - - - 9 - 17 - - - - 25 + + YES + Table View (Themes) @@ -417,6 +376,11 @@ + + 8 + + + @@ -429,15 +393,15 @@ 1.IBPluginDependency 11.IBPluginDependency 11.IBViewBoundsToFrameTransform - 17.IBPluginDependency - 17.IBViewBoundsToFrameTransform 25.IBPluginDependency 25.IBViewBoundsToFrameTransform 35.IBPluginDependency 35.IBViewBoundsToFrameTransform 7.IBPluginDependency 7.IBViewBoundsToFrameTransform + 8.CustomClassName 8.IBPluginDependency + 8.IBViewBoundsToFrameTransform 9.CustomClassName 9.IBPluginDependency 9.IBViewBoundsToFrameTransform @@ -450,11 +414,7 @@ com.apple.InterfaceBuilder.IBCocoaTouchPlugin com.apple.InterfaceBuilder.IBCocoaTouchPlugin - P4AAAL+AAABB+AAAw4QAAA - - com.apple.InterfaceBuilder.IBCocoaTouchPlugin - - P4AAAL+AAABCyAAAw2YAAA + AUKOAABDRAAAA com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -468,7 +428,11 @@ P4AAAL+AAABBUAAAwigAAA + ValueTrackingSliderView com.apple.InterfaceBuilder.IBCocoaTouchPlugin + + P4AAAL+AAABCWAAAw4IAAA + MapPreviewButtonView com.apple.InterfaceBuilder.IBCocoaTouchPlugin @@ -553,7 +517,6 @@ maxLabel previewButton segmentedControl - sizeLabel slider tableView @@ -562,8 +525,7 @@ UILabel MapPreviewButtonView UISegmentedControl - UILabel - UISlider + ValueTrackingSliderView UITableView @@ -574,7 +536,6 @@ maxLabel previewButton segmentedControl - sizeLabel slider tableView @@ -593,12 +554,8 @@ UISegmentedControl - sizeLabel - UILabel - - slider - UISlider + ValueTrackingSliderView tableView @@ -632,14 +589,22 @@ UILabel - + IBProjectSource - ExtraCategories.h + Classes/ExtraCategories.h UITableView - + + + + ValueTrackingSliderView + UISlider + + IBProjectSource + Classes/ValueTrackingSliderView.h + diff -r 6b7560b37eef -r beab48f963d5 project_files/HedgewarsMobile/Classes/SettingsContainerViewController.m --- a/project_files/HedgewarsMobile/Classes/SettingsContainerViewController.m Sun Feb 12 19:38:32 2012 +0400 +++ b/project_files/HedgewarsMobile/Classes/SettingsContainerViewController.m Sun Feb 12 18:08:34 2012 +0100 @@ -66,7 +66,7 @@ [sbvc release]; } self.baseController.targetController = nil; - self.baseController.view.frame = CGRectMake(0, 0, screenRect.size.height, screenRect.size.width); + self.baseController.view.frame = screenRect; [self.view addSubview:self.baseController.view]; }