epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use a tableview for the mod list

Browse Source
This commit is contained in:
Paul Chote
2010-04-17 00:11:55 +12:00
parent b964524ea7
commit 623b12f5fb
5 changed files with 436 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
packaging/osx/launcher/Controller.h
View File

@@ -20,9 +20,12 @@
@class Settings; @class Settings;
@interface Controller : NSObject { @interface Controller : NSObject {
// Main Window // Main Window
NSDictionary *modButtonMappings; IBOutlet NSWindow *mainWindow;
Settings *settings; Settings *settings;
IBOutlet id modsList;
NSArray *mods;
// Package Downloader // Package Downloader
NSString *localDownloadPath; NSString *localDownloadPath;
@@ -31,9 +34,6 @@
long long expectedData; long long expectedData;
long long downloadedData; long long downloadedData;
BOOL downloading; BOOL downloading;
IBOutlet NSWindow *mainWindow;
// Download Sheet // Download Sheet
IBOutlet NSWindow *downloadSheet; IBOutlet NSWindow *downloadSheet;

41
packaging/osx/launcher/Controller.m
View File

@@ -25,24 +25,49 @@
{ {
NSURL *settingsFile = [NSURL fileURLWithPath:[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"launcher.ini"]]; NSURL *settingsFile = [NSURL fileURLWithPath:[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"launcher.ini"]];
settings = [[Settings alloc] init]; settings = [[Settings alloc] init];
[settings loadSettingsFile:settingsFile]; [settings loadSettingsFile:settingsFile];
modButtonMappings = [[NSDictionary dictionaryWithObjectsAndKeys: mods = [[NSArray arrayWithContentsOfFile:[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"mods.plist"]] retain];
@"cnc",@"C&C",
@"ra",@"Red Alert",
nil] retain];
} }
#pragma mark Main window
-(IBAction)launchApp:(id)sender -(IBAction)launchApp:(id)sender
{ {
[settings setValue:[modButtonMappings objectForKey:[sender title]] forSetting:@"InitialMods"]; NSString *modString = [[mods objectAtIndex:[modsList selectedRow]] objectForKey:@"Mods"];
[settings setValue:modString forSetting:@"InitialMods"];
[settings save]; [settings save];
[[NSWorkspace sharedWorkspace] launchApplication:[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"OpenRA.app"]]; [[NSWorkspace sharedWorkspace] launchApplication:[[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"OpenRA.app"]];
[NSApp terminate: nil]; [NSApp terminate: nil];
} }
- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
{
return [mods count];
}
- (id)tableView:(NSTableView *)table
objectValueForTableColumn:(NSTableColumn *)column
row:(NSInteger)row
{
if (row >= [mods count])
return @"";
if ([[column identifier] isEqualToString:@"name"])
{
return [[mods objectAtIndex:row] objectForKey:@"Name"];
}
if ([[column identifier] isEqualToString:@"status"])
{
// Todo: get mod status
return @"Todo";//[[mods objectAtIndex:row] objectForKey:@"Name"];
}
return @"";
}
#pragma mark Downloads sheet
-(IBAction)showDownloadSheet:(id)sender -(IBAction)showDownloadSheet:(id)sender
{ {
[NSApp beginSheet:downloadSheet modalForWindow:mainWindow [NSApp beginSheet:downloadSheet modalForWindow:mainWindow
@@ -158,7 +183,7 @@
- (void) dealloc - (void) dealloc
{ {
[modButtonMappings release]; [mods release];
[settings release]; [settings release];
[super dealloc]; [super dealloc];
} }

470
packaging/osx/launcher/English.lproj/MainMenu.xib
View File

@@ -2,19 +2,19 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10">
<data> <data>
<int key="IBDocument.SystemTarget">1050</int> <int key="IBDocument.SystemTarget">1050</int>
<string key="IBDocument.SystemVersion">10C540</string> <string key="IBDocument.SystemVersion">10D573</string>
<string key="IBDocument.InterfaceBuilderVersion">740</string> <string key="IBDocument.InterfaceBuilderVersion">740</string>
<string key="IBDocument.AppKitVersion">1038.25</string> <string key="IBDocument.AppKitVersion">1038.29</string>
<string key="IBDocument.HIToolboxVersion">458.00</string> <string key="IBDocument.HIToolboxVersion">460.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">740</string> <string key="NS.object.0">740</string>
</object> </object>
<object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<integer value="29"/>
<integer value="569"/>
<integer value="372"/> <integer value="372"/>
<integer value="569"/>
<integer value="29"/>
</object> </object>
<object class="NSArray" key="IBDocument.PluginDependencies"> <object class="NSArray" key="IBDocument.PluginDependencies">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
@@ -265,11 +265,11 @@
<string key="NSName">_NSMainMenu</string> <string key="NSName">_NSMainMenu</string>
</object> </object>
<object class="NSWindowTemplate" id="972006081"> <object class="NSWindowTemplate" id="972006081">
<int key="NSWindowStyleMask">7</int> <int key="NSWindowStyleMask">5</int>
<int key="NSWindowBacking">2</int> <int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{855, 474}, {424, 149}}</string> <string key="NSWindowRect">{{855, 438}, {324, 185}}</string>
<int key="NSWTFlags">1954022400</int> <int key="NSWTFlags">1954022400</int>
<string key="NSWindowTitle">OpenRA Launcher</string> <string key="NSWindowTitle">Select Game</string>
<string key="NSWindowClass">NSWindow</string> <string key="NSWindowClass">NSWindow</string>
<nil key="NSViewClass"/> <nil key="NSViewClass"/>
<string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string>
@@ -278,41 +278,21 @@
<int key="NSvFlags">256</int> <int key="NSvFlags">256</int>
<object class="NSMutableArray" key="NSSubviews"> <object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSButton" id="832841451">
<reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">289</int>
<string key="NSFrame">{{109, 60}, {96, 32}}</string>
<reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="926167763">
<int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">C&amp;C</string>
<object class="NSFont" key="NSSupport" id="991316619">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="832841451"/>
<int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">129</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
<object class="NSButton" id="317974207"> <object class="NSButton" id="317974207">
<reference key="NSNextResponder" ref="439893737"/> <reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">289</int> <int key="NSvFlags">289</int>
<string key="NSFrame">{{285, 4}, {103, 32}}</string> <string key="NSFrame">{{109, 12}, {103, 32}}</string>
<reference key="NSSuperview" ref="439893737"/> <reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="5050367"> <object class="NSButtonCell" key="NSCell" id="5050367">
<int key="NSCellFlags">67239424</int> <int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217984</int> <int key="NSCellFlags2">134217984</int>
<string key="NSContents">Download</string> <string key="NSContents">Download</string>
<reference key="NSSupport" ref="991316619"/> <object class="NSFont" key="NSSupport" id="991316619">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="317974207"/> <reference key="NSControlView" ref="317974207"/>
<int key="NSButtonFlags">-2038284033</int> <int key="NSButtonFlags">-2038284033</int>
<int key="NSButtonFlags2">129</int> <int key="NSButtonFlags2">129</int>
@@ -325,13 +305,13 @@
<object class="NSButton" id="590256431"> <object class="NSButton" id="590256431">
<reference key="NSNextResponder" ref="439893737"/> <reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">289</int> <int key="NSvFlags">289</int>
<string key="NSFrame">{{222, 60}, {98, 32}}</string> <string key="NSFrame">{{212, 12}, {98, 32}}</string>
<reference key="NSSuperview" ref="439893737"/> <reference key="NSSuperview" ref="439893737"/>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="1057175677"> <object class="NSButtonCell" key="NSCell" id="1057175677">
<int key="NSCellFlags">-2080244224</int> <int key="NSCellFlags">-2080244224</int>
<int key="NSCellFlags2">134217728</int> <int key="NSCellFlags2">134217728</int>
<string key="NSContents">Red Alert</string> <string key="NSContents">Play</string>
<reference key="NSSupport" ref="991316619"/> <reference key="NSSupport" ref="991316619"/>
<reference key="NSControlView" ref="590256431"/> <reference key="NSControlView" ref="590256431"/>
<int key="NSButtonFlags">-2038284033</int> <int key="NSButtonFlags">-2038284033</int>
@@ -342,40 +322,201 @@
<int key="NSPeriodicInterval">25</int> <int key="NSPeriodicInterval">25</int>
</object> </object>
</object> </object>
<object class="NSTextField" id="244830610"> <object class="NSScrollView" id="989141335">
<reference key="NSNextResponder" ref="439893737"/> <reference key="NSNextResponder" ref="439893737"/>
<int key="NSvFlags">266</int> <int key="NSvFlags">274</int>
<string key="NSFrame">{{117, 107}, {190, 17}}</string> <object class="NSMutableArray" key="NSSubviews">
<reference key="NSSuperview" ref="439893737"/> <bool key="EncodedWithXMLCoder">YES</bool>
<bool key="NSEnabled">YES</bool> <object class="NSClipView" id="302837443">
<object class="NSTextFieldCell" key="NSCell" id="904324407"> <reference key="NSNextResponder" ref="989141335"/>
<int key="NSCellFlags">68288064</int> <int key="NSvFlags">2304</int>
<int key="NSCellFlags2">138413056</int> <object class="NSMutableArray" key="NSSubviews">
<string key="NSContents">Select Game</string> <bool key="EncodedWithXMLCoder">YES</bool>
<reference key="NSSupport" ref="991316619"/> <object class="NSTableView" id="936286094">
<reference key="NSControlView" ref="244830610"/> <reference key="NSNextResponder" ref="302837443"/>
<object class="NSColor" key="NSBackgroundColor" id="621445755"> <int key="NSvFlags">256</int>
<int key="NSColorSpace">6</int> <string key="NSFrameSize">{282, 87}</string>
<string key="NSCatalogName">System</string> <reference key="NSSuperview" ref="302837443"/>
<string key="NSColorName">controlColor</string> <bool key="NSEnabled">YES</bool>
<object class="NSColor" key="NSColor"> <object class="NSTableHeaderView" key="NSHeaderView" id="397405427">
<int key="NSColorSpace">3</int> <reference key="NSNextResponder" ref="691245284"/>
<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes> <int key="NSvFlags">256</int>
<string key="NSFrameSize">{282, 17}</string>
<reference key="NSSuperview" ref="691245284"/>
<reference key="NSTableView" ref="936286094"/>
</object>
<object class="_NSCornerView" key="NSCornerView" id="509614395">
<reference key="NSNextResponder" ref="989141335"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{224, 0}, {16, 17}}</string>
<reference key="NSSuperview" ref="989141335"/>
</object>
<object class="NSMutableArray" key="NSTableColumns">
<bool key="EncodedWithXMLCoder">YES</bool>
<object class="NSTableColumn" id="983810101">
<string key="NSIdentifier">name</string>
<double key="NSWidth">186</double>
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Mod</string>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
<object class="NSColor" key="NSBackgroundColor" id="50730769">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
</object>
<object class="NSColor" key="NSTextColor" id="125232019">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">headerTextColor</string>
<object class="NSColor" key="NSColor" id="442080890">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
</object>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="777734909">
<int key="NSCellFlags">337772096</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Text Cell</string>
<reference key="NSSupport" ref="991316619"/>
<reference key="NSControlView" ref="936286094"/>
<object class="NSColor" key="NSBackgroundColor" id="379661612">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlBackgroundColor</string>
<object class="NSColor" key="NSColor" id="924942065">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2ODY1AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="543526229">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
<reference key="NSColor" ref="442080890"/>
</object>
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
<bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="936286094"/>
</object>
<object class="NSTableColumn" id="479594694">
<string key="NSIdentifier">status</string>
<double key="NSWidth">90</double>
<double key="NSMinWidth">40</double>
<double key="NSMaxWidth">1000</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
<int key="NSCellFlags">75628096</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Status</string>
<reference key="NSSupport" ref="26"/>
<reference key="NSBackgroundColor" ref="50730769"/>
<reference key="NSTextColor" ref="125232019"/>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="532026052">
<int key="NSCellFlags">337772096</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Text Cell</string>
<reference key="NSSupport" ref="991316619"/>
<reference key="NSControlView" ref="936286094"/>
<reference key="NSBackgroundColor" ref="379661612"/>
<reference key="NSTextColor" ref="543526229"/>
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
<bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="936286094"/>
</object>
</object>
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">2</double>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
<object class="NSColor" key="NSGridColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">gridColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC41AA</bytes>
</object>
</object>
<double key="NSRowHeight">17</double>
<int key="NSTvFlags">-700448768</int>
<reference key="NSDelegate"/>
<reference key="NSDataSource"/>
<int key="NSColumnAutoresizingStyle">4</int>
<int key="NSDraggingSourceMaskForLocal">15</int>
<int key="NSDraggingSourceMaskForNonLocal">0</int>
<bool key="NSAllowsTypeSelect">YES</bool>
<int key="NSTableViewDraggingDestinationStyle">0</int>
</object>
</object> </object>
<string key="NSFrame">{{1, 17}, {282, 87}}</string>
<reference key="NSSuperview" ref="989141335"/>
<reference key="NSNextKeyView" ref="936286094"/>
<reference key="NSDocView" ref="936286094"/>
<reference key="NSBGColor" ref="379661612"/>
<int key="NScvFlags">4</int>
</object> </object>
<object class="NSColor" key="NSTextColor" id="543526229"> <object class="NSScroller" id="417375470">
<int key="NSColorSpace">6</int> <reference key="NSNextResponder" ref="989141335"/>
<string key="NSCatalogName">System</string> <int key="NSvFlags">-2147483392</int>
<string key="NSColorName">controlTextColor</string> <string key="NSFrame">{{224, 17}, {15, 102}}</string>
<object class="NSColor" key="NSColor"> <reference key="NSSuperview" ref="989141335"/>
<int key="NSColorSpace">3</int> <reference key="NSTarget" ref="989141335"/>
<bytes key="NSWhite">MAA</bytes> <string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.8913043737411499</double>
</object>
<object class="NSScroller" id="943241156">
<reference key="NSNextResponder" ref="989141335"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 140}, {282, 15}}</string>
<reference key="NSSuperview" ref="989141335"/>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="989141335"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.97577852010726929</double>
</object>
<object class="NSClipView" id="691245284">
<reference key="NSNextResponder" ref="989141335"/>
<int key="NSvFlags">2304</int>
<object class="NSMutableArray" key="NSSubviews">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="397405427"/>
</object> </object>
<string key="NSFrame">{{1, 0}, {282, 17}}</string>
<reference key="NSSuperview" ref="989141335"/>
<reference key="NSNextKeyView" ref="397405427"/>
<reference key="NSDocView" ref="397405427"/>
<reference key="NSBGColor" ref="379661612"/>
<int key="NScvFlags">4</int>
</object> </object>
<reference ref="509614395"/>
</object> </object>
<string key="NSFrame">{{20, 60}, {284, 105}}</string>
<reference key="NSSuperview" ref="439893737"/>
<reference key="NSNextKeyView" ref="302837443"/>
<int key="NSsFlags">562</int>
<reference key="NSVScroller" ref="417375470"/>
<reference key="NSHScroller" ref="943241156"/>
<reference key="NSContentView" ref="302837443"/>
<reference key="NSHeaderClipView" ref="691245284"/>
<reference key="NSCornerView" ref="509614395"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
</object> </object>
</object> </object>
<string key="NSFrameSize">{424, 149}</string> <string key="NSFrameSize">{324, 185}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
</object> </object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
@@ -477,7 +618,12 @@
<int key="NSfFlags">16</int> <int key="NSfFlags">16</int>
</object> </object>
<reference key="NSControlView" ref="268272919"/> <reference key="NSControlView" ref="268272919"/>
<reference key="NSBackgroundColor" ref="621445755"/> <object class="NSColor" key="NSBackgroundColor" id="621445755">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<reference key="NSColor" ref="924942065"/>
</object>
<reference key="NSTextColor" ref="543526229"/> <reference key="NSTextColor" ref="543526229"/>
</object> </object>
</object> </object>
@@ -589,14 +735,6 @@
</object> </object>
<int key="connectionID">493</int> <int key="connectionID">493</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">launchApp:</string>
<reference key="source" ref="941221793"/>
<reference key="destination" ref="832841451"/>
</object>
<int key="connectionID">536</int>
</object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection"> <object class="IBActionConnection" key="connection">
<string key="label">launchApp:</string> <string key="label">launchApp:</string>
@@ -701,6 +839,22 @@
</object> </object>
<int key="connectionID">597</int> <int key="connectionID">597</int>
</object> </object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">modsList</string>
<reference key="source" ref="941221793"/>
<reference key="destination" ref="936286094"/>
</object>
<int key="connectionID">617</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">dataSource</string>
<reference key="source" ref="936286094"/>
<reference key="destination" ref="941221793"/>
</object>
<int key="connectionID">618</int>
</object>
</object> </object>
<object class="IBMutableOrderedSet" key="objectRecords"> <object class="IBMutableOrderedSet" key="objectRecords">
<object class="NSArray" key="orderedObjects"> <object class="NSArray" key="orderedObjects">
@@ -887,10 +1041,9 @@
<reference key="object" ref="439893737"/> <reference key="object" ref="439893737"/>
<object class="NSMutableArray" key="children"> <object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool> <bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="317974207"/> <reference ref="989141335"/>
<reference ref="590256431"/> <reference ref="590256431"/>
<reference ref="832841451"/> <reference ref="317974207"/>
<reference ref="244830610"/>
</object> </object>
<reference key="parent" ref="972006081"/> <reference key="parent" ref="972006081"/>
</object> </object>
@@ -917,21 +1070,6 @@
<reference key="object" ref="105068016"/> <reference key="object" ref="105068016"/>
<reference key="parent" ref="992780483"/> <reference key="parent" ref="992780483"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">533</int>
<reference key="object" ref="832841451"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="926167763"/>
</object>
<reference key="parent" ref="439893737"/>
<string key="objectName">cnc</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">534</int>
<reference key="object" ref="926167763"/>
<reference key="parent" ref="832841451"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">535</int> <int key="objectID">535</int>
<reference key="object" ref="941221793"/> <reference key="object" ref="941221793"/>
@@ -952,20 +1090,6 @@
<reference key="object" ref="1057175677"/> <reference key="object" ref="1057175677"/>
<reference key="parent" ref="590256431"/> <reference key="parent" ref="590256431"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">551</int>
<reference key="object" ref="244830610"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="904324407"/>
</object>
<reference key="parent" ref="439893737"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">552</int>
<reference key="object" ref="904324407"/>
<reference key="parent" ref="244830610"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">558</int> <int key="objectID">558</int>
<reference key="object" ref="597055072"/> <reference key="object" ref="597055072"/>
@@ -1083,6 +1207,71 @@
<reference key="object" ref="536845483"/> <reference key="object" ref="536845483"/>
<reference key="parent" ref="921568248"/> <reference key="parent" ref="921568248"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">598</int>
<reference key="object" ref="989141335"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="417375470"/>
<reference ref="943241156"/>
<reference ref="936286094"/>
<reference ref="397405427"/>
</object>
<reference key="parent" ref="439893737"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">599</int>
<reference key="object" ref="417375470"/>
<reference key="parent" ref="989141335"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">600</int>
<reference key="object" ref="943241156"/>
<reference key="parent" ref="989141335"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">601</int>
<reference key="object" ref="936286094"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="983810101"/>
<reference ref="479594694"/>
</object>
<reference key="parent" ref="989141335"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">602</int>
<reference key="object" ref="397405427"/>
<reference key="parent" ref="989141335"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">603</int>
<reference key="object" ref="983810101"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="777734909"/>
</object>
<reference key="parent" ref="936286094"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">604</int>
<reference key="object" ref="479594694"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
<reference ref="532026052"/>
</object>
<reference key="parent" ref="936286094"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">605</int>
<reference key="object" ref="532026052"/>
<reference key="parent" ref="479594694"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">606</int>
<reference key="object" ref="777734909"/>
<reference key="parent" ref="983810101"/>
</object>
</object> </object>
</object> </object>
<object class="NSMutableDictionary" key="flattenedProperties"> <object class="NSMutableDictionary" key="flattenedProperties">
@@ -1144,12 +1333,8 @@
<string>492.IBPluginDependency</string> <string>492.IBPluginDependency</string>
<string>5.IBPluginDependency</string> <string>5.IBPluginDependency</string>
<string>5.ImportedFromIB2</string> <string>5.ImportedFromIB2</string>
<string>533.IBPluginDependency</string>
<string>534.IBPluginDependency</string>
<string>548.IBPluginDependency</string> <string>548.IBPluginDependency</string>
<string>549.IBPluginDependency</string> <string>549.IBPluginDependency</string>
<string>551.IBPluginDependency</string>
<string>552.IBPluginDependency</string>
<string>553.IBPluginDependency</string> <string>553.IBPluginDependency</string>
<string>554.IBPluginDependency</string> <string>554.IBPluginDependency</string>
<string>557.IBPluginDependency</string> <string>557.IBPluginDependency</string>
@@ -1178,6 +1363,15 @@
<string>590.IBPluginDependency</string> <string>590.IBPluginDependency</string>
<string>595.IBPluginDependency</string> <string>595.IBPluginDependency</string>
<string>596.IBPluginDependency</string> <string>596.IBPluginDependency</string>
<string>598.IBPluginDependency</string>
<string>599.IBPluginDependency</string>
<string>600.IBPluginDependency</string>
<string>601.IBPluginDependency</string>
<string>602.IBPluginDependency</string>
<string>603.IBPluginDependency</string>
<string>604.IBPluginDependency</string>
<string>605.IBPluginDependency</string>
<string>606.IBPluginDependency</string>
<string>92.IBPluginDependency</string> <string>92.IBPluginDependency</string>
<string>92.ImportedFromIB2</string> <string>92.ImportedFromIB2</string>
</object> </object>
@@ -1217,14 +1411,14 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/> <integer value="1"/>
<string>{{525, 802}, {197, 73}}</string> <string>{{525, 802}, {197, 73}}</string>
<string>{{226, 836}, {221, 20}}</string> <string>{{226, 933}, {221, 20}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/> <integer value="1"/>
<string>{74, 862}</string> <string>{74, 862}</string>
<string>{{6, 978}, {478, 20}}</string> <string>{{6, 978}, {478, 20}}</string>
<string>{{740, 575}, {424, 149}}</string> <string>{{740, 539}, {324, 185}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>{{740, 575}, {424, 149}}</string> <string>{{740, 539}, {324, 185}}</string>
<integer value="1"/> <integer value="1"/>
<string>{{33, 99}, {480, 360}}</string> <string>{{33, 99}, {480, 360}}</string>
<boolean value="NO"/> <boolean value="NO"/>
@@ -1245,10 +1439,6 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/> <integer value="1"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1273,6 +1463,15 @@
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<integer value="1"/> <integer value="1"/>
</object> </object>
</object> </object>
@@ -1292,7 +1491,7 @@
</object> </object>
</object> </object>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">597</int> <int key="maxID">621</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions"> <object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1330,6 +1529,7 @@
<string>downloadSheet</string> <string>downloadSheet</string>
<string>infoText</string> <string>infoText</string>
<string>mainWindow</string> <string>mainWindow</string>
<string>modsList</string>
<string>statusText</string> <string>statusText</string>
</object> </object>
<object class="NSMutableArray" key="dict.values"> <object class="NSMutableArray" key="dict.values">
@@ -1342,6 +1542,7 @@
<string>id</string> <string>id</string>
<string>NSWindow</string> <string>NSWindow</string>
<string>id</string> <string>id</string>
<string>id</string>
</object> </object>
</object> </object>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1559,7 +1760,7 @@
</object> </object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">NSObject</string> <string key="className">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier"> <object class="IBClassDescriptionSource" key="sourceIdentifier" id="668894599">
<string key="majorKey">IBFrameworkSource</string> <string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSTableView.h</string> <string key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
</object> </object>
@@ -1742,6 +1943,43 @@
<string key="minorKey">AppKit.framework/Headers/NSResponder.h</string> <string key="minorKey">AppKit.framework/Headers/NSResponder.h</string>
</object> </object>
</object> </object>
<object class="IBPartialClassDescription">
<string key="className">NSScrollView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSScrollView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSScroller</string>
<string key="superclassName">NSControl</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSScroller.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTableColumn</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSTableColumn.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTableHeaderView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBFrameworkSource</string>
<string key="minorKey">AppKit.framework/Headers/NSTableHeaderView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSTableView</string>
<string key="superclassName">NSControl</string>
<reference key="sourceIdentifier" ref="668894599"/>
</object>
<object class="IBPartialClassDescription"> <object class="IBPartialClassDescription">
<string key="className">NSTextField</string> <string key="className">NSTextField</string>
<string key="superclassName">NSControl</string> <string key="superclassName">NSControl</string>

4
packaging/osx/launcher/OpenRA.xcodeproj/project.pbxproj
View File

@@ -13,6 +13,7 @@
8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; }; 8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; }; 8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
DA1241101151F194002EFE2B /* OpenRa.icns in Resources */ = {isa = PBXBuildFile; fileRef = DA12410F1151F194002EFE2B /* OpenRa.icns */; }; DA1241101151F194002EFE2B /* OpenRa.icns in Resources */ = {isa = PBXBuildFile; fileRef = DA12410F1151F194002EFE2B /* OpenRa.icns */; };
DA28A92A117878EC00342835 /* mods.plist in Resources */ = {isa = PBXBuildFile; fileRef = DA28A929117878EC00342835 /* mods.plist */; };
DAAB5C7911536D6500DCCB80 /* Settings.m in Sources */ = {isa = PBXBuildFile; fileRef = DAAB5C7811536D6500DCCB80 /* Settings.m */; }; DAAB5C7911536D6500DCCB80 /* Settings.m in Sources */ = {isa = PBXBuildFile; fileRef = DAAB5C7811536D6500DCCB80 /* Settings.m */; };
DAFD657B11520799001F4C97 /* launcher.ini in Resources */ = {isa = PBXBuildFile; fileRef = DAFD657A11520799001F4C97 /* launcher.ini */; }; DAFD657B11520799001F4C97 /* launcher.ini in Resources */ = {isa = PBXBuildFile; fileRef = DAFD657A11520799001F4C97 /* launcher.ini */; };
/* End PBXBuildFile section */ /* End PBXBuildFile section */
@@ -31,6 +32,7 @@
8D1107310486CEB800E47090 /* OpenRA-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OpenRA-Info.plist"; sourceTree = "<group>"; }; 8D1107310486CEB800E47090 /* OpenRA-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "OpenRA-Info.plist"; sourceTree = "<group>"; };
8D1107320486CEB800E47090 /* OpenRA.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenRA.app; sourceTree = BUILT_PRODUCTS_DIR; }; 8D1107320486CEB800E47090 /* OpenRA.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = OpenRA.app; sourceTree = BUILT_PRODUCTS_DIR; };
DA12410F1151F194002EFE2B /* OpenRa.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = OpenRa.icns; sourceTree = "<group>"; }; DA12410F1151F194002EFE2B /* OpenRa.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = OpenRa.icns; sourceTree = "<group>"; };
DA28A929117878EC00342835 /* mods.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = mods.plist; sourceTree = "<group>"; };
DAAB5C7711536D6500DCCB80 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = "<group>"; }; DAAB5C7711536D6500DCCB80 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = "<group>"; };
DAAB5C7811536D6500DCCB80 /* Settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Settings.m; sourceTree = "<group>"; }; DAAB5C7811536D6500DCCB80 /* Settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Settings.m; sourceTree = "<group>"; };
DAFD657A11520799001F4C97 /* launcher.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = launcher.ini; sourceTree = "<group>"; }; DAFD657A11520799001F4C97 /* launcher.ini */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = launcher.ini; sourceTree = "<group>"; };
@@ -114,6 +116,7 @@
DA12410F1151F194002EFE2B /* OpenRa.icns */, DA12410F1151F194002EFE2B /* OpenRa.icns */,
089C165CFE840E0CC02AAC07 /* InfoPlist.strings */, 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */,
1DDD58140DA1D0A300B32029 /* MainMenu.xib */, 1DDD58140DA1D0A300B32029 /* MainMenu.xib */,
DA28A929117878EC00342835 /* mods.plist */,
); );
name = Resources; name = Resources;
sourceTree = "<group>"; sourceTree = "<group>";
@@ -175,6 +178,7 @@
1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */, 1DDD58160DA1D0A300B32029 /* MainMenu.xib in Resources */,
DA1241101151F194002EFE2B /* OpenRa.icns in Resources */, DA1241101151F194002EFE2B /* OpenRa.icns in Resources */,
DAFD657B11520799001F4C97 /* launcher.ini in Resources */, DAFD657B11520799001F4C97 /* launcher.ini in Resources */,
DA28A92A117878EC00342835 /* mods.plist in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

41
packaging/osx/launcher/mods.plist Normal file
View File

@@ -0,0 +1,41 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<array>
<dict>
<key>Name</key>
<string>Command &amp; Conquer</string>
<key>Mods</key>
<string>cnc</string>
<key>RequiredFiles</key>
<dict>
<key>mods/ra/packages/conquer.mix</key>
<string>http://open-ra.org/packages/cnc-packages.zip</string>
</dict>
</dict>
<dict>
<key>Name</key>
<string>Red Alert</string>
<key>Mods</key>
<string>ra</string>
<key>RequiredFiles</key>
<dict>
<key>mods/ra/packages/main.mix</key>
<string>http://open-ra.org/packages/ra-packages.zip</string>
</dict>
</dict>
<dict>
<key>Name</key>
<string>Red Alert with The Aftermath</string>
<key>Mods</key>
<string>ra,aftermath</string>
<key>RequiredFiles</key>
<dict>
<key>mods/ra/packages/main.mix</key>
<string>http://open-ra.org/packages/ra-packages.zip</string>
<key>mods/aftermath/packages/expand2.mix</key>
<string>http://open-ra.org/packages/aftermath-packages.zip</string>
</dict>
</dict>
</array>
</plist>