From 1cfa4409aff87bc730f32744693a02eb7dc57187 Mon Sep 17 00:00:00 2001
From: Simon Howard
Date: Mon, 13 Jun 2011 23:45:10 +0000
Subject: Rework configuration window; add Heretic/Hexen configuration boxes.
Subversion-branch: /branches/raven-branch
Subversion-revision: 2348
---
pkg/osx/IWADController.m | 4 -
pkg/osx/Resources/launcher.nib/designable.nib | 1488 +++++++++++++++--------
pkg/osx/Resources/launcher.nib/keyedobjects.nib | Bin 27157 -> 30957 bytes
3 files changed, 981 insertions(+), 511 deletions(-)
diff --git a/pkg/osx/IWADController.m b/pkg/osx/IWADController.m
index b420d59d..ec181350 100644
--- a/pkg/osx/IWADController.m
+++ b/pkg/osx/IWADController.m
@@ -279,10 +279,6 @@ static NSString *IWADFilenames[NUM_IWAD_TYPES + 1] =
- (void) awakeFromNib
{
- // TODO: This is temporary:
- self->heretic = self->doom1;
- self->hexen = self->doom2;
-
[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 b3e76d22..6bb8f144 100644
--- a/pkg/osx/Resources/launcher.nib/designable.nib
+++ b/pkg/osx/Resources/launcher.nib/designable.nib
@@ -12,9 +12,9 @@
@@ -2327,39 +2659,55 @@
232.ImportedFromIB2
233.ImportedFromIB2
234.IBPluginDependency
+ 234.IBViewBoundsToFrameTransform
234.ImportedFromIB2
235.IBPluginDependency
+ 235.IBViewBoundsToFrameTransform
235.ImportedFromIB2
236.IBPluginDependency
+ 236.IBViewBoundsToFrameTransform
236.ImportedFromIB2
238.IBPluginDependency
+ 238.IBViewBoundsToFrameTransform
238.ImportedFromIB2
239.IBPluginDependency
+ 239.IBViewBoundsToFrameTransform
239.ImportedFromIB2
24.IBEditorWindowLastContentRect
24.IBPluginDependency
24.ImportedFromIB2
240.IBPluginDependency
+ 240.IBViewBoundsToFrameTransform
240.ImportedFromIB2
241.IBPluginDependency
+ 241.IBViewBoundsToFrameTransform
241.ImportedFromIB2
242.IBPluginDependency
+ 242.IBViewBoundsToFrameTransform
242.ImportedFromIB2
243.IBPluginDependency
+ 243.IBViewBoundsToFrameTransform
243.ImportedFromIB2
244.IBPluginDependency
+ 244.IBViewBoundsToFrameTransform
244.ImportedFromIB2
245.IBPluginDependency
+ 245.IBViewBoundsToFrameTransform
245.ImportedFromIB2
246.IBPluginDependency
+ 246.IBViewBoundsToFrameTransform
246.ImportedFromIB2
247.IBPluginDependency
+ 247.IBViewBoundsToFrameTransform
247.ImportedFromIB2
248.IBPluginDependency
+ 248.IBViewBoundsToFrameTransform
248.ImportedFromIB2
249.IBPluginDependency
+ 249.IBViewBoundsToFrameTransform
249.ImportedFromIB2
250.IBPluginDependency
+ 250.IBViewBoundsToFrameTransform
250.ImportedFromIB2
270.ImportedFromIB2
274.IBPluginDependency
@@ -2388,9 +2736,6 @@
301.ImportedFromIB2
320.IBPluginDependency
320.ImportedFromIB2
- 349.IBPluginDependency
- 350.IBPluginDependency
- 351.IBPluginDependency
369.IBPluginDependency
370.IBEditorWindowLastContentRect
370.IBPluginDependency
@@ -2401,7 +2746,34 @@
379.IBPluginDependency
380.IBPluginDependency
383.IBPluginDependency
+ 383.IBViewBoundsToFrameTransform
384.IBPluginDependency
+ 386.IBPluginDependency
+ 386.IBViewBoundsToFrameTransform
+ 387.IBPluginDependency
+ 388.IBPluginDependency
+ 389.IBPluginDependency
+ 390.IBPluginDependency
+ 391.IBPluginDependency
+ 391.IBViewBoundsToFrameTransform
+ 392.IBPluginDependency
+ 393.IBPluginDependency
+ 393.IBViewBoundsToFrameTransform
+ 394.IBPluginDependency
+ 397.IBPluginDependency
+ 397.IBViewBoundsToFrameTransform
+ 397.ImportedFromIB2
+ 399.IBPluginDependency
+ 399.IBViewBoundsToFrameTransform
+ 399.ImportedFromIB2
+ 401.IBPluginDependency
+ 402.IBPluginDependency
+ 405.IBPluginDependency
+ 405.IBViewBoundsToFrameTransform
+ 405.ImportedFromIB2
+ 408.IBPluginDependency
+ 408.IBViewBoundsToFrameTransform
+ 408.ImportedFromIB2
5.IBPluginDependency
5.ImportedFromIB2
56.IBPluginDependency
@@ -2498,9 +2870,9 @@
- {{421, 438}, {480, 316}}
+ {{358, 421}, {518, 308}}
com.apple.InterfaceBuilder.CocoaPlugin
- {{421, 438}, {480, 316}}
+ {{358, 421}, {518, 308}}
{213, 107}
@@ -2514,39 +2886,87 @@
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABD24AAw5+AAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABBiAAAwz8AAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABDxoAAxBJAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABBiAAAxAqAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABBoAAAxAXAAA
+
{{469, 741}, {194, 73}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABDxIAAwzQAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABBYAAAwxcAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABBcAAAwwQAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABDxIAAwrwAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABBQAAAwswAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABBoAAAw9qAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABDxoAAw9sAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABCRAAAwoQAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABCUAAAwjwAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABDxYAAwrgAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABD2gAAwqIAAA
+
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2576,19 +2996,59 @@
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+ {{540, 701}, {238, 113}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
- {{540, 701}, {238, 113}}
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABBiAAAwhwAAA
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABBUAAAw5YAAA
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABBiAAAwwgAAA
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABBgAAAw0EAAA
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABClAAAwwIAAA
+
+
+ com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABBUAAAw1EAAA
+
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABDxIAAww0AAA
+
+
com.apple.InterfaceBuilder.CocoaPlugin
+
+ P4AAAL+AAABDxIAAw0AAAA
+
+
com.apple.InterfaceBuilder.CocoaPlugin
com.apple.InterfaceBuilder.CocoaPlugin
@@ -2618,7 +3078,7 @@
- 385
+ 414
@@ -2693,6 +3153,8 @@
configWindow
doom1
doom2
+ heretic
+ hexen
iwadSelector
plutonia
tnt
@@ -2706,6 +3168,8 @@
id
id
id
+ id
+ id
@@ -2716,6 +3180,8 @@
configWindow
doom1
doom2
+ heretic
+ hexen
iwadSelector
plutonia
tnt
@@ -2738,6 +3204,14 @@
doom2
id
+
+ heretic
+ id
+
+
+ hexen
+ id
+
iwadSelector
id
diff --git a/pkg/osx/Resources/launcher.nib/keyedobjects.nib b/pkg/osx/Resources/launcher.nib/keyedobjects.nib
index 7df7670c..2d9b8594 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