From 50501da26c0e6dba5acbc94510e9b88d8dc790f4 Mon Sep 17 00:00:00 2001 From: Paul Chote Date: Tue, 4 May 2010 01:10:09 +1200 Subject: [PATCH] Hacks for the osx launcher for playtest --- packaging/osx/launcher/Controller.m | 11 +- .../osx/launcher/English.lproj/MainMenu.xib | 306 ++++-------------- 2 files changed, 66 insertions(+), 251 deletions(-) diff --git a/packaging/osx/launcher/Controller.m b/packaging/osx/launcher/Controller.m index 6fb0841c5e..d24ea7af35 100644 --- a/packaging/osx/launcher/Controller.m +++ b/packaging/osx/launcher/Controller.m @@ -26,8 +26,10 @@ NSURL *settingsFile = [NSURL fileURLWithPath:[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"launcher.ini"]]; settings = [[Settings alloc] init]; [settings loadSettingsFile:settingsFile]; - + mods = [[NSArray arrayWithContentsOfFile:[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"mods.plist"]] retain]; + [modsList selectRow:1 byExtendingSelection:NO]; + } #pragma mark Main window @@ -92,6 +94,13 @@ return @""; } +- (BOOL)tableView:(NSTableView *)aTableView +shouldEditTableColumn:(NSTableColumn *)aTableColumn + row:(NSInteger)rowIndex +{ + return NO; +} + #pragma mark Downloads sheet -(IBAction)showDownloadSheet:(id)sender { diff --git a/packaging/osx/launcher/English.lproj/MainMenu.xib b/packaging/osx/launcher/English.lproj/MainMenu.xib index ac29216fba..5dfe5244f2 100644 --- a/packaging/osx/launcher/English.lproj/MainMenu.xib +++ b/packaging/osx/launcher/English.lproj/MainMenu.xib @@ -3,18 +3,18 @@ 1050 10D573 - 740 + 762 1038.29 460.00 com.apple.InterfaceBuilder.CocoaPlugin - 740 + 762 YES - + - + YES @@ -267,7 +267,7 @@ 5 2 - {{855, 436}, {367, 187}} + {{855, 471}, {254, 152}} 1954022400 Select Game NSWindow @@ -278,61 +278,21 @@ 256 YES - - - 289 - {{250, 49}, {103, 32}} - - YES - - 67239424 - 134217984 - Download - - LucidaGrande - 13 - 1044 - - - -2038284033 - 129 - - Gw - 200 - 25 - - - - - 289 - {{145, 49}, {105, 32}} - - YES - - 67239424 - 134217984 - From CD - - - -2038284033 - 129 - - Gw - 200 - 25 - - 289 - {{255, 12}, {98, 32}} + {{142, 12}, {98, 32}} YES -2080244224 134217728 Play - + + LucidaGrande + 13 + 1044 + -2038284033 129 @@ -355,43 +315,35 @@ 256 - {367, 85} + {367, 101} YES - - - 256 - {367, 17} - - - - - + + -2147483392 {{224, 0}, {16, 17}} - YES name - 245 + 253 40 1000 75628096 2048 Mod - + LucidaGrande 11 3100 - + 3 MC4zMzMzMzI5ODU2AA - + 6 System headerTextColor @@ -428,33 +380,6 @@ YES - - status - 116 - 40 - 1000 - - 75628096 - 2048 - Status - - - - - - 337772096 - 2048 - Text Cell - - - - - - 3 - YES - YES - - 3 2 @@ -472,17 +397,17 @@ 17 - -700448768 + 35651584 4 15 0 - YES + NO 0 - {{1, 17}, {367, 85}} + {{1, 1}, {367, 101}} @@ -496,7 +421,7 @@ _doScroller: - 0.8913043737411499 + 0.99019604921340942 @@ -506,58 +431,20 @@ 1 _doScroller: - 0.97577852010726929 + 0.99728262424468994 - - - 2304 - - YES - - - {{1, 0}, {367, 17}} - - - - - 4 - - - {{-1, 85}, {369, 103}} + {{-1, 50}, {369, 103}} 562 - - QSAAAEEgAABBmAAAQZgAAA - - - 268 - {{17, 60}, {129, 17}} - - YES - - 68288064 - 272630784 - Game data required - - - - 6 - System - controlColor - - - - - - {367, 187} + {254, 152} {{0, 0}, {1680, 1028}} @@ -659,7 +546,12 @@ 16 - + + 6 + System + controlColor + + @@ -795,14 +687,6 @@ 581 - - - showDownloadSheet: - - - - 582 - downloadSheet @@ -892,12 +776,12 @@ 618 - - showDownloadSheet: - - + + delegate + + - 626 + 627 @@ -1085,11 +969,8 @@ YES - - - - + @@ -1141,20 +1022,6 @@ - - 564 - - - YES - - - - - - 565 - - - 568 @@ -1261,7 +1128,6 @@ - @@ -1281,15 +1147,9 @@ YES - - - 602 - - - 603 @@ -1299,53 +1159,11 @@ - - 604 - - - YES - - - - - - 605 - - - 606 - - 622 - - - YES - - - - - - 623 - - - - - 624 - - - YES - - - - - - 625 - - - @@ -1415,8 +1233,6 @@ 558.IBPluginDependency 56.IBPluginDependency 56.ImportedFromIB2 - 564.IBPluginDependency - 565.IBPluginDependency 568.IBEditorWindowLastContentRect 568.IBPluginDependency 568.IBViewEditorWindowController.showingLayoutRectangles @@ -1441,15 +1257,8 @@ 599.IBPluginDependency 600.IBPluginDependency 601.IBPluginDependency - 602.IBPluginDependency 603.IBPluginDependency - 604.IBPluginDependency - 605.IBPluginDependency 606.IBPluginDependency - 622.IBPluginDependency - 623.IBPluginDependency - 624.IBPluginDependency - 625.IBPluginDependency 92.IBPluginDependency 92.ImportedFromIB2 @@ -1494,9 +1303,9 @@ {74, 862} {{6, 978}, {478, 20}} - {{740, 537}, {367, 187}} + {{637, 583}, {254, 152}} com.apple.InterfaceBuilder.CocoaPlugin - {{740, 537}, {367, 187}} + {{637, 583}, {254, 152}} {{33, 99}, {480, 360}} @@ -1518,12 +1327,10 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{1182, 152}, {379, 110}} + {{706, 152}, {379, 110}} com.apple.InterfaceBuilder.CocoaPlugin - {{1182, 152}, {379, 110}} + {{706, 152}, {379, 110}} com.apple.InterfaceBuilder.CocoaPlugin {{392, 653}, {190, 183}} @@ -1547,13 +1354,6 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin @@ -1573,7 +1373,7 @@ - 626 + 627 @@ -2049,14 +1849,6 @@ AppKit.framework/Headers/NSTableColumn.h - - NSTableHeaderView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSTableHeaderView.h - - NSTableView NSControl @@ -2134,6 +1926,7 @@ 0 + IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx @@ -2145,5 +1938,18 @@ YES ../OpenRA.xcodeproj 3 + + YES + + YES + NSMenuCheckmark + NSMenuMixedState + + + YES + {9, 8} + {7, 2} + +