# HG changeset patch # User koda # Date 1270609339 0 # Node ID 591c42242106d1c9a974a7bdecf3964026d0d628 # Parent 198ec44b6d92b983a104ee9ee3b68748b800390b much better diff -r 198ec44b6d92 -r 591c42242106 cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m --- a/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Wed Apr 07 02:58:12 2010 +0000 +++ b/cocoaTouch/SDLOverrides/SDL_uikitappdelegate.m Wed Apr 07 03:02:19 2010 +0000 @@ -89,7 +89,7 @@ OverlayViewController *overlayController; // overlay with controls, become visible after 2 seconds - overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController-iPhone" bundle:nil]; + overlayController = [[OverlayViewController alloc] initWithNibName:@"OverlayViewController" bundle:nil]; [uiwindow addSubview:overlayController.view]; [overlayController release]; diff -r 198ec44b6d92 -r 591c42242106 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Wed Apr 07 02:58:12 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.mode1v3 Wed Apr 07 03:02:19 2010 +0000 @@ -202,47 +202,7 @@ Content PBXProjectModuleGUID - 615134AB116C2BA9001F16D1 - PBXProjectModuleLabel - OverlayViewController.m - PBXSplitModuleInNavigatorKey - - Split0 - - PBXProjectModuleGUID - 615134AC116C2BA9001F16D1 - PBXProjectModuleLabel - OverlayViewController.m - _historyCapacity - 0 - bookmark - 615134AD116C2BA9001F16D1 - history - - 615134A7116C2B99001F16D1 - - - SplitCount - 1 - - StatusBarVisibility - - - Geometry - - Frame - {{0, 20}, {938, 870}} - PBXModuleWindowStatusBarHidden2 - - RubberWindowFrame - 690 205 938 911 0 0 1920 1178 - - - - Content - - PBXProjectModuleGUID - 61513492116C2954001F16D1 + 615134B4116C2EE4001F16D1 PBXProjectModuleLabel SDL_uikitappdelegate.m PBXSplitModuleInNavigatorKey @@ -250,16 +210,16 @@ Split0 PBXProjectModuleGUID - 61513493116C2954001F16D1 + 615134B5116C2EE4001F16D1 PBXProjectModuleLabel SDL_uikitappdelegate.m _historyCapacity 0 bookmark - 615134AE116C2BA9001F16D1 + 615134B6116C2EE4001F16D1 history - 61513488116C294A001F16D1 + 615134B2116C2ED7001F16D1 SplitCount @@ -310,8 +270,6 @@ Layout - BecomeActive - ContentConfiguration PBXBottomSmartGroupGIDs @@ -353,6 +311,7 @@ 611B0A94116B621600112153 61A11AD01168DB1F00359010 29B97317FDCFA39411CA2CEA + 6100DB1711544E8400F455E0 6100DAD4115446B000F455E0 1C37FBAC04509CD000000102 1C37FABC05509CD000000102 @@ -360,8 +319,7 @@ PBXSmartGroupTreeModuleOutlineStateSelectionKey - 25 - 4 + 3 2 0 @@ -386,7 +344,7 @@ 235 RubberWindowFrame - 426 353 801 617 0 0 1920 1178 + 302 390 801 617 0 0 1920 1178 Module PBXSmartGroupTreeModule @@ -414,7 +372,7 @@ _historyCapacity 0 bookmark - 615134AA116C2BA9001F16D1 + 615134B3116C2EE4001F16D1 history 6179889D114AA5BD00BA94A9 @@ -508,7 +466,7 @@ Frame {{0, 0}, {544, 125}} RubberWindowFrame - 426 353 801 617 0 0 1920 1178 + 302 390 801 617 0 0 1920 1178 Module PBXNavigatorGroup @@ -516,6 +474,8 @@ 125pt + BecomeActive + ContentConfiguration PBXProjectModuleGUID @@ -528,7 +488,7 @@ Frame {{0, 130}, {544, 446}} RubberWindowFrame - 426 353 801 617 0 0 1920 1178 + 302 390 801 617 0 0 1920 1178 Module XCDetailModule @@ -692,18 +652,16 @@ 5 WindowOrderList - 615134AF116C2BA9001F16D1 6151343E116C1B07001F16D1 6151343F116C1B07001F16D1 1C78EAAD065D492600B07095 1CD10A99069EF8BA00B06720 61798848114AA42600BA94A9 - 61513492116C2954001F16D1 /Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj - 615134AB116C2BA9001F16D1 + 615134B4116C2EE4001F16D1 WindowString - 426 353 801 617 0 0 1920 1178 + 302 390 801 617 0 0 1920 1178 WindowToolsV3 diff -r 198ec44b6d92 -r 591c42242106 project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser --- a/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Wed Apr 07 02:58:12 2010 +0000 +++ b/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj/vittorio.pbxuser Wed Apr 07 03:02:19 2010 +0000 @@ -193,6 +193,9 @@ 615134AA116C2BA9001F16D1 /* PBXTextBookmark */ = 615134AA116C2BA9001F16D1 /* PBXTextBookmark */; 615134AD116C2BA9001F16D1 /* PBXTextBookmark */ = 615134AD116C2BA9001F16D1 /* PBXTextBookmark */; 615134AE116C2BA9001F16D1 /* PBXTextBookmark */ = 615134AE116C2BA9001F16D1 /* PBXTextBookmark */; + 615134B2116C2ED7001F16D1 /* PBXBookmark */ = 615134B2116C2ED7001F16D1 /* PBXBookmark */; + 615134B3116C2EE4001F16D1 /* PBXTextBookmark */ = 615134B3116C2EE4001F16D1 /* PBXTextBookmark */; + 615134B6116C2EE4001F16D1 /* PBXTextBookmark */ = 615134B6116C2EE4001F16D1 /* PBXTextBookmark */; 615F1316116561BE002444F2 = 615F1316116561BE002444F2 /* PBXTextBookmark */; 615F134D11656569002444F2 = 615F134D11656569002444F2 /* PBXTextBookmark */; 615F147F11659AC5002444F2 = 615F147F11659AC5002444F2 /* PBXTextBookmark */; @@ -647,7 +650,7 @@ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; name = "SDL_uikitappdelegate.m: 101"; rLen = 0; - rLoc = 3118; + rLoc = 3111; rType = 0; vrLen = 1668; vrLoc = 2527; @@ -707,7 +710,7 @@ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; name = "SDL_uikitappdelegate.m: 101"; rLen = 0; - rLoc = 3118; + rLoc = 3111; rType = 0; vrLen = 1668; vrLoc = 2527; @@ -747,7 +750,7 @@ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; name = "SDL_uikitappdelegate.m: 101"; rLen = 0; - rLoc = 3118; + rLoc = 3111; rType = 0; vrLen = 1668; vrLoc = 2527; @@ -777,7 +780,7 @@ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; name = "SDL_uikitappdelegate.m: 101"; rLen = 0; - rLoc = 3118; + rLoc = 3111; rType = 0; vrLen = 1668; vrLoc = 2527; @@ -807,7 +810,7 @@ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; name = "SDL_uikitappdelegate.m: 101"; rLen = 0; - rLoc = 3118; + rLoc = 3111; rType = 0; vrLen = 1805; vrLoc = 2527; @@ -837,7 +840,7 @@ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; name = "SDL_uikitappdelegate.m: 101"; rLen = 0; - rLoc = 3118; + rLoc = 3111; rType = 0; vrLen = 1668; vrLoc = 2527; @@ -857,7 +860,7 @@ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; name = "SDL_uikitappdelegate.m: 101"; rLen = 0; - rLoc = 3118; + rLoc = 3111; rType = 0; vrLen = 1668; vrLoc = 2527; @@ -938,7 +941,7 @@ fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; name = "SDL_uikitappdelegate.m: 94"; rLen = 0; - rLoc = 2966; + rLoc = 2959; rType = 0; vrLen = 1806; vrLoc = 2528; @@ -1008,6 +1011,30 @@ vrLen = 1679; vrLoc = 2528; }; + 615134B2116C2ED7001F16D1 /* PBXBookmark */ = { + isa = PBXBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + }; + 615134B3116C2EE4001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61CE250C115E749A0098C467 /* OverlayViewController.m */; + name = "OverlayViewController.m: 17"; + rLen = 0; + rLoc = 391; + rType = 0; + vrLen = 196; + vrLoc = 51; + }; + 615134B6116C2EE4001F16D1 /* PBXTextBookmark */ = { + isa = PBXTextBookmark; + fRef = 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */; + name = "SDL_uikitappdelegate.m: 92"; + rLen = 0; + rLoc = 2945; + rType = 0; + vrLen = 1794; + vrLoc = 2528; + }; 615F1316116561BE002444F2 /* PBXTextBookmark */ = { isa = PBXTextBookmark; fRef = 61798863114AA4AA00BA94A9 /* SDL_uikitappdelegate.h */; @@ -1499,9 +1526,9 @@ }; 61798864114AA4AA00BA94A9 /* SDL_uikitappdelegate.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {873, 2119}}"; - sepNavSelRange = "{2851, 0}"; - sepNavVisRange = "{2528, 1679}"; + sepNavIntBoundsRect = "{{0, 0}, {873, 2106}}"; + sepNavSelRange = "{2945, 0}"; + sepNavVisRange = "{2528, 1794}"; sepNavWindowFrame = "{{1045, 206}, {803, 674}}"; }; }; @@ -1966,9 +1993,9 @@ }; 61CE250C115E749A0098C467 /* OverlayViewController.m */ = { uiCtxt = { - sepNavIntBoundsRect = "{{0, 0}, {915, 4134}}"; - sepNavSelRange = "{990, 0}"; - sepNavVisRange = "{0, 2273}"; + sepNavIntBoundsRect = "{{0, 0}, {483, 4251}}"; + sepNavSelRange = "{391, 0}"; + sepNavVisRange = "{51, 196}"; sepNavWindowFrame = "{{690, 149}, {938, 967}}"; }; };