# 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 @@
<key>Content</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>615134AB116C2BA9001F16D1</string>
- <key>PBXProjectModuleLabel</key>
- <string>OverlayViewController.m</string>
- <key>PBXSplitModuleInNavigatorKey</key>
- <dict>
- <key>Split0</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>615134AC116C2BA9001F16D1</string>
- <key>PBXProjectModuleLabel</key>
- <string>OverlayViewController.m</string>
- <key>_historyCapacity</key>
- <integer>0</integer>
- <key>bookmark</key>
- <string>615134AD116C2BA9001F16D1</string>
- <key>history</key>
- <array>
- <string>615134A7116C2B99001F16D1</string>
- </array>
- </dict>
- <key>SplitCount</key>
- <string>1</string>
- </dict>
- <key>StatusBarVisibility</key>
- <true/>
- </dict>
- <key>Geometry</key>
- <dict>
- <key>Frame</key>
- <string>{{0, 20}, {938, 870}}</string>
- <key>PBXModuleWindowStatusBarHidden2</key>
- <false/>
- <key>RubberWindowFrame</key>
- <string>690 205 938 911 0 0 1920 1178 </string>
- </dict>
- </dict>
- <dict>
- <key>Content</key>
- <dict>
- <key>PBXProjectModuleGUID</key>
- <string>61513492116C2954001F16D1</string>
+ <string>615134B4116C2EE4001F16D1</string>
<key>PBXProjectModuleLabel</key>
<string>SDL_uikitappdelegate.m</string>
<key>PBXSplitModuleInNavigatorKey</key>
@@ -250,16 +210,16 @@
<key>Split0</key>
<dict>
<key>PBXProjectModuleGUID</key>
- <string>61513493116C2954001F16D1</string>
+ <string>615134B5116C2EE4001F16D1</string>
<key>PBXProjectModuleLabel</key>
<string>SDL_uikitappdelegate.m</string>
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>615134AE116C2BA9001F16D1</string>
+ <string>615134B6116C2EE4001F16D1</string>
<key>history</key>
<array>
- <string>61513488116C294A001F16D1</string>
+ <string>615134B2116C2ED7001F16D1</string>
</array>
</dict>
<key>SplitCount</key>
@@ -310,8 +270,6 @@
<key>Layout</key>
<array>
<dict>
- <key>BecomeActive</key>
- <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXBottomSmartGroupGIDs</key>
@@ -353,6 +311,7 @@
<string>611B0A94116B621600112153</string>
<string>61A11AD01168DB1F00359010</string>
<string>29B97317FDCFA39411CA2CEA</string>
+ <string>6100DB1711544E8400F455E0</string>
<string>6100DAD4115446B000F455E0</string>
<string>1C37FBAC04509CD000000102</string>
<string>1C37FABC05509CD000000102</string>
@@ -360,8 +319,7 @@
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
<array>
<array>
- <integer>25</integer>
- <integer>4</integer>
+ <integer>3</integer>
<integer>2</integer>
<integer>0</integer>
</array>
@@ -386,7 +344,7 @@
<real>235</real>
</array>
<key>RubberWindowFrame</key>
- <string>426 353 801 617 0 0 1920 1178 </string>
+ <string>302 390 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXSmartGroupTreeModule</string>
@@ -414,7 +372,7 @@
<key>_historyCapacity</key>
<integer>0</integer>
<key>bookmark</key>
- <string>615134AA116C2BA9001F16D1</string>
+ <string>615134B3116C2EE4001F16D1</string>
<key>history</key>
<array>
<string>6179889D114AA5BD00BA94A9</string>
@@ -508,7 +466,7 @@
<key>Frame</key>
<string>{{0, 0}, {544, 125}}</string>
<key>RubberWindowFrame</key>
- <string>426 353 801 617 0 0 1920 1178 </string>
+ <string>302 390 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>PBXNavigatorGroup</string>
@@ -516,6 +474,8 @@
<string>125pt</string>
</dict>
<dict>
+ <key>BecomeActive</key>
+ <true/>
<key>ContentConfiguration</key>
<dict>
<key>PBXProjectModuleGUID</key>
@@ -528,7 +488,7 @@
<key>Frame</key>
<string>{{0, 130}, {544, 446}}</string>
<key>RubberWindowFrame</key>
- <string>426 353 801 617 0 0 1920 1178 </string>
+ <string>302 390 801 617 0 0 1920 1178 </string>
</dict>
<key>Module</key>
<string>XCDetailModule</string>
@@ -692,18 +652,16 @@
<integer>5</integer>
<key>WindowOrderList</key>
<array>
- <string>615134AF116C2BA9001F16D1</string>
<string>6151343E116C1B07001F16D1</string>
<string>6151343F116C1B07001F16D1</string>
<string>1C78EAAD065D492600B07095</string>
<string>1CD10A99069EF8BA00B06720</string>
<string>61798848114AA42600BA94A9</string>
- <string>61513492116C2954001F16D1</string>
<string>/Users/vittorio/hedgewars/trunk/project_files/HedgewarsMobile/HedgewarsMobile.xcodeproj</string>
- <string>615134AB116C2BA9001F16D1</string>
+ <string>615134B4116C2EE4001F16D1</string>
</array>
<key>WindowString</key>
- <string>426 353 801 617 0 0 1920 1178 </string>
+ <string>302 390 801 617 0 0 1920 1178 </string>
<key>WindowToolsV3</key>
<array>
<dict>
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}}";
};
};