From 55825846ef0aea045a909fbd2cca34be8ea77af1 Mon Sep 17 00:00:00 2001 From: Simon Howard Date: Mon, 12 Sep 2011 22:21:53 +0000 Subject: Update OS X launcher to include box for Strife IWAD. Subversion-branch: /branches/v2-branch Subversion-revision: 2372 --- pkg/osx/IWADController.m | 5 - pkg/osx/Resources/launcher.nib/designable.nib | 237 ++++++++++++++++++++---- pkg/osx/Resources/launcher.nib/keyedobjects.nib | Bin 30957 -> 32366 bytes 3 files changed, 201 insertions(+), 41 deletions(-) diff --git a/pkg/osx/IWADController.m b/pkg/osx/IWADController.m index 4f3f393f..02f83238 100644 --- a/pkg/osx/IWADController.m +++ b/pkg/osx/IWADController.m @@ -286,11 +286,6 @@ static NSString *IWADFilenames[NUM_IWAD_TYPES + 1] = - (void) awakeFromNib { - // TODO: This is temporary: - self->heretic = self->doom1; - self->hexen = self->doom2; - self->strife = self->tnt; - [self->configWindow center]; // Set configuration for all IWADs from configuration file. diff --git a/pkg/osx/Resources/launcher.nib/designable.nib b/pkg/osx/Resources/launcher.nib/designable.nib index 6bb8f144..73a01abd 100644 --- a/pkg/osx/Resources/launcher.nib/designable.nib +++ b/pkg/osx/Resources/launcher.nib/designable.nib @@ -2,9 +2,9 @@ 1060 - 10J869 + 10K549 851 - 1038.35 + 1038.36 461.00 com.apple.InterfaceBuilder.CocoaPlugin @@ -12,9 +12,9 @@ YES - - + + YES @@ -809,7 +809,7 @@ 256 - {{14, 151}, {446, 11}} + {{14, 152}, {446, 11}} YES @@ -825,7 +825,7 @@ 256 - {{17, 121}, {369, 22}} + {{17, 122}, {369, 22}} YES @@ -842,7 +842,7 @@ 256 - {{393, 121}, {63, 23}} + {{393, 122}, {63, 23}} YES @@ -896,7 +896,7 @@ 256 - {{395, 73}, {63, 23}} + {{393, 73}, {63, 23}} YES @@ -917,7 +917,7 @@ 256 - {{14, 54}, {446, 11}} + {{14, 55}, {446, 11}} YES @@ -933,7 +933,7 @@ 256 - {{17, 24}, {369, 22}} + {{17, 25}, {369, 22}} YES @@ -950,7 +950,7 @@ 256 - {{395, 24}, {63, 23}} + {{393, 25}, {63, 23}} YES @@ -986,7 +986,7 @@ 256 - {{14, 103}, {446, 11}} + {{14, 55}, {446, 11}} YES @@ -1002,7 +1002,7 @@ 256 - {{17, 73}, {369, 22}} + {{17, 25}, {369, 22}} YES @@ -1019,7 +1019,7 @@ 256 - {{395, 73}, {63, 23}} + {{393, 25}, {63, 23}} YES @@ -1037,6 +1037,27 @@ 75 + + + 256 + {{393, 73}, {63, 23}} + + YES + + 67239424 + 134217728 + Set... + + + -2038021889 + 32 + + + + 400 + 75 + + 256 @@ -1095,7 +1116,7 @@ 256 - {{14, 146}, {446, 17}} + {{14, 145}, {446, 17}} YES @@ -1145,6 +1166,39 @@ 75 + + + 256 + {{14, 103}, {446, 11}} + + YES + + 67239424 + 272629760 + Strife IWAD location (strife1.wad): + + + + + + + + + 256 + {{17, 73}, {369, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + {{10, 33}, {472, 214}} @@ -1195,6 +1249,9 @@ IWADLocation + + IWADLocation + @@ -1647,6 +1704,30 @@ 414 + + + locationConfigBox + + + + 423 + + + + setButtonClicked: + + + + 424 + + + + strife + + + + 425 + @@ -2234,13 +2315,16 @@ YES - + + + + + + - - @@ -2252,16 +2336,16 @@ YES + - + + - - @@ -2571,6 +2655,54 @@ + + 415 + + + YES + + + + + + 416 + + + + + 417 + + + YES + + + + + + 418 + + + + + 419 + + + YES + + + + + + 420 + + + + + 422 + + + StrifeIWAD + @@ -2774,6 +2906,16 @@ 408.IBPluginDependency 408.IBViewBoundsToFrameTransform 408.ImportedFromIB2 + 415.IBPluginDependency + 415.IBViewBoundsToFrameTransform + 415.ImportedFromIB2 + 417.IBPluginDependency + 417.IBViewBoundsToFrameTransform + 417.ImportedFromIB2 + 419.IBPluginDependency + 419.IBViewBoundsToFrameTransform + 419.ImportedFromIB2 + 422.IBPluginDependency 5.IBPluginDependency 5.ImportedFromIB2 56.IBPluginDependency @@ -2902,12 +3044,12 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBiAAAxAqAAA + P4AAAL+AAABBYAAAwyAAAA com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBoAAAxAXAAA + P4AAAL+AAABBiAAAww8AAA {{469, 741}, {194, 73}} @@ -2915,52 +3057,52 @@ com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDxIAAwzQAAA + P4AAAL+AAABDyoAAwwcAAA com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBYAAAwxcAAA + P4AAAL+AAABBYAAAwuAAAA com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBcAAAwwQAAA + P4AAAL+AAABBiAAAwroAAA com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDxIAAwrwAAA + P4AAAL+AAABDzoAAwqwAAA com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBQAAAwswAAA + P4AAAL+AAABBYAAAwmAAAA com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBoAAAw9qAAA + P4AAAL+AAABBiAAAwjQAAA com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDxoAAw9sAAA + P4AAAL+AAABDzoAAwdAAAA com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABCRAAAwoQAAA + P4AAAL+AAABBYAAAwnwAAA com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABCUAAAwjwAAA + P4AAAL+AAABBiAAAwjAAAA com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDxYAAwrgAAA + P4AAAL+AAABDy4AAwfgAAA com.apple.InterfaceBuilder.CocoaPlugin @@ -3019,7 +3161,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABBiAAAwwgAAA + P4AAAL+AAABBiAAAwxAAAA com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3029,7 +3171,7 @@ com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABClAAAwwIAAA + P4AAAL+AAABBYAAAwyEAAA com.apple.InterfaceBuilder.CocoaPlugin @@ -3050,6 +3192,22 @@ com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBYAAAwtYAAA + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABBiAAAwq4AAA + + + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABD0YAAwpYAAA + + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -3078,7 +3236,7 @@ - 414 + 425 @@ -3157,6 +3315,7 @@ hexen iwadSelector plutonia + strife tnt @@ -3170,6 +3329,7 @@ id id id + id @@ -3184,6 +3344,7 @@ hexen iwadSelector plutonia + strife tnt @@ -3220,6 +3381,10 @@ plutonia id + + strife + id + tnt id diff --git a/pkg/osx/Resources/launcher.nib/keyedobjects.nib b/pkg/osx/Resources/launcher.nib/keyedobjects.nib index 2d9b8594..e23926a7 100644 Binary files a/pkg/osx/Resources/launcher.nib/keyedobjects.nib and b/pkg/osx/Resources/launcher.nib/keyedobjects.nib differ -- cgit v1.2.3