From 5cc04d6c52f36bc7d5fa73a7cf2897b297893482 Mon Sep 17 00:00:00 2001 From: Matt Mower Date: Mon, 5 Oct 2009 23:00:56 +0100 Subject: [PATCH] All the user to configure the transparency of layer windows. --- English.lproj/LayerManager.xib | 984 +++++++++++++++++++++++++++++---- src/datamodel/ELLayer.h | 62 ++- src/datamodel/ELLayer.m | 13 + 3 files changed, 931 insertions(+), 128 deletions(-) diff --git a/English.lproj/LayerManager.xib b/English.lproj/LayerManager.xib index 9aab3ff..e176173 100644 --- a/English.lproj/LayerManager.xib +++ b/English.lproj/LayerManager.xib @@ -1,23 +1,26 @@ - + 1050 - 9J61 - 677 - 949.46 - 353.00 + 10B504 + 732 + 1038.2 + 437.00 + + com.apple.InterfaceBuilder.CocoaPlugin + 732 + YES - + YES - com.apple.InterfaceBuilderKit com.apple.InterfaceBuilder.CocoaPlugin YES - + YES @@ -62,13 +65,13 @@ 256 - {365, 124} + {364, 124} YES 256 - {365, 17} + {364, 17} @@ -80,24 +83,24 @@ YES - - 4.400000e+01 - 1.000000e+01 - 3.402823e+38 + + 51 + 10 + 3.4028230607370965e+38 - 75628032 - 0 - Visible + 75628096 + 2048 + Enabled LucidaGrande - 1.100000e+01 + 11 3100 6 System headerColor - + 3 MQA @@ -112,7 +115,7 @@ - + 67239424 131072 @@ -120,7 +123,7 @@ 1215582719 130 - + NSImage NSSwitch @@ -137,26 +140,121 @@ YES - - 1.780000e+02 - 4.000000e+01 - 1.000000e+03 + + 44 + 10 + 3.4028230607370965e+38 - 75628032 - 0 - ID + 75628096 + 2048 + Visible + + + + + + 67239424 + 131072 + + + + 1215582719 + 130 + + + + + 200 + 25 + + 3 + YES + YES + + + + 42 + 40 + 1000 + + 75628096 + 2048 + Chan# 3 - MC4zMzMzMzI5OQA + MC4zMzMzMzI5ODU2AA - + 337772096 - 133120 + -2147350528 Text Cell + + + YES + + YES + allowsFloats + formatterBehavior + locale + negativeInfinitySymbol + nilSymbol + positiveInfinitySymbol + + + YES + + + + + + -∞ + + +∞ + + + # + # + + + + + + + + NaN + + YES + + + YES + + + + + 0 + 0 + YES + NO + 1 + AAAAAAAAAAAAAAAAAAAAAA + + + + 3 + YES + YES + YES + + . + , + NO + NO + YES + 6 @@ -164,7 +262,7 @@ controlBackgroundColor 3 - MC42NjY2NjY2OQA + MC42NjY2NjY2ODY1AA @@ -179,19 +277,19 @@ YES - - 8.000000e+01 - 4.000000e+01 - 1.000000e+03 + + 84 + 40 + 1000 - 75628032 - 0 - Channel + 75628096 + 2048 + ID - + 337772096 133120 Text Cell @@ -205,32 +303,31 @@ YES - - 5.100000e+01 - 1.000000e+01 - 3.402823e+38 + + 128 + 10 + 3.4028234663852886e+38 - 75628032 - 0 - Enabled + 75628096 + 2048 + Transparency - - 67239424 + + -2080244224 131072 - - 1215582719 - 130 - - - - - 200 - 25 + 1 + 0.0 + 1 + 0.0 + 0 + 1 + NO + NO 3 YES @@ -238,9 +335,9 @@ - 3.000000e+00 - 2.000000e+00 - + 3 + 2 + 6 System @@ -250,12 +347,15 @@ MC41AA - 1.700000e+01 - -698351616 + 17 + -700448768 + + 0 15 0 YES + 0 {{1, 17}, {364, 124}} @@ -272,19 +372,18 @@ _doScroller: - 3.700000e+01 - 1.947368e-01 + 37 + 0.1947367936372757 - 256 + -2147483392 {{-100, -100}, {364, 15}} - YES 1 _doScroller: - 9.972528e-01 + 0.99725282192230225 @@ -305,7 +404,7 @@ {{8, 42}, {381, 142}} - 146 + 18 @@ -325,7 +424,7 @@ Create LucidaGrande - 9.000000e+00 + 9 3614 @@ -358,6 +457,7 @@ enabledKnob.value channelDial.value enabledDial.value + alphaValue ELLayer YES @@ -512,34 +612,48 @@ 51 + + + value: arrangedObjects.alphaValue + + + + + + value: arrangedObjects.alphaValue + value + arrangedObjects.alphaValue + 2 + + + 58 + YES 0 - - YES - + -2 - - RmlsZSdzIE93bmVyA + + File's Owner -1 - + First Responder -3 - + Application @@ -549,7 +663,7 @@ YES - + 2 @@ -564,7 +678,7 @@ 3 - + 4 @@ -594,9 +708,10 @@ YES + + - @@ -626,6 +741,10 @@ 11 + + YES + + @@ -675,14 +794,31 @@ + + 52 + + + YES + + + + + + 54 + + + + + 57 + + + YES - + YES - -1.IBPluginDependency - -2.IBPluginDependency -3.IBPluginDependency 1.IBEditorWindowLastContentRect 1.IBPluginDependency @@ -692,14 +828,20 @@ 10.IBPluginDependency 11.IBPluginDependency 12.IBPluginDependency + 13.IBPluginDependency 17.IBPluginDependency 2.IBPluginDependency + 25.IBPluginDependency 3.IBPluginDependency 36.IBPluginDependency 4.IBPluginDependency 43.IBPluginDependency 44.IBPluginDependency 5.IBPluginDependency + 54.IBNumberFormatterBehaviorMetadataKey + 54.IBNumberFormatterLocalizesFormatMetadataKey + 54.IBPluginDependency + 57.IBPluginDependency 6.IBPluginDependency 7.IBPluginDependency 8.IBPluginDependency @@ -708,12 +850,10 @@ YES com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilderKit - com.apple.InterfaceBuilderKit {{338, 63}, {396, 190}} com.apple.InterfaceBuilder.CocoaPlugin {{338, 63}, {396, 190}} - + {3.40282e+38, 3.40282e+38} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin @@ -728,15 +868,19 @@ 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 YES - - YES - + YES @@ -744,15 +888,13 @@ YES - - YES - + YES - 51 + 58 @@ -770,21 +912,19 @@ NSDocument YES - + YES clearAll: clearCell: clearSelectedLayer: closeDocument: newLayer: + removeLayer: showOscillatorDesigner: startStop: toggleAbsorbToken: toggleGeneratorToken: - toggleKeyDisplay: - toggleNoteDisplay: toggleNoteToken: - toggleOctavesDisplay: toggleReboundToken: toggleSkipToken: toggleSpinToken: @@ -809,8 +949,6 @@ id id id - id - id @@ -833,8 +971,656 @@ + + YES + + NSActionCell + NSCell + + IBFrameworkSource + AppKit.framework/Headers/NSActionCell.h + + + + NSApplication + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSApplication.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSApplicationScripting.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSColorPanel.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSHelpManager.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSPageLayout.h + + + + NSApplication + + IBFrameworkSource + AppKit.framework/Headers/NSUserInterfaceItemSearching.h + + + + NSApplication + + IBFrameworkSource + BWToolkitFramework.framework/Headers/NSApplication+BWAdditions.h + + + + NSArrayController + NSObjectController + + IBFrameworkSource + AppKit.framework/Headers/NSArrayController.h + + + + NSButton + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSButton.h + + + + NSButtonCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSButtonCell.h + + + + NSCell + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSCell.h + + + + NSControl + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSControl.h + + + + NSController + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSController.h + + + + NSDocument + NSObject + + YES + + YES + printDocument: + revertDocumentToSaved: + runPageLayout: + saveDocument: + saveDocumentAs: + saveDocumentTo: + + + YES + id + id + id + id + id + id + + + + IBFrameworkSource + AppKit.framework/Headers/NSDocument.h + + + + NSDocument + + IBFrameworkSource + AppKit.framework/Headers/NSDocumentScripting.h + + + + NSFormatter + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFormatter.h + + + + NSManagedObjectContext + NSObject + + IBFrameworkSource + CoreData.framework/Headers/NSManagedObjectContext.h + + + + NSMenu + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSMenu.h + + + + NSNumberFormatter + NSFormatter + + IBFrameworkSource + Foundation.framework/Headers/NSNumberFormatter.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSAccessibility.h + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDictionaryController.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSDragging.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontManager.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSFontPanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSKeyValueBinding.h + + + + NSObject + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSNibLoading.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSOutlineView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSPasteboard.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSSavePanel.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableView.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSToolbarItem.h + + + + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSView.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSError.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSFileManager.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyValueObserving.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSKeyedArchiver.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObject.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSObjectScripting.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSPortCoder.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSRunLoop.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptClassDescription.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptKeyValueCoding.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptObjectSpecifiers.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSScriptWhoseTests.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSThread.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURL.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLConnection.h + + + + NSObject + + IBFrameworkSource + Foundation.framework/Headers/NSURLDownload.h + + + + NSObject + + IBFrameworkSource + HoneycombView.framework/Headers/LMHoneycombView.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUAppcast.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUAutomaticUpdateAlert.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUInstaller.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUUnarchiver.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUUpdateAlert.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUUpdatePermissionPrompt.h + + + + NSObject + + IBFrameworkSource + Sparkle.framework/Headers/SUUpdater.h + + + + NSObjectController + NSController + + IBFrameworkSource + AppKit.framework/Headers/NSObjectController.h + + + + NSPanel + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSPanel.h + + + + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSInterfaceStyle.h + + + + NSResponder + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSResponder.h + + + + NSScrollView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSScrollView.h + + + + NSScroller + NSControl + + IBFrameworkSource + AppKit.framework/Headers/NSScroller.h + + + + NSSliderCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSSliderCell.h + + + + NSTableColumn + NSObject + + IBFrameworkSource + AppKit.framework/Headers/NSTableColumn.h + + + + NSTableHeaderView + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSTableHeaderView.h + + + + NSTableView + NSControl + + + + NSTextFieldCell + NSActionCell + + IBFrameworkSource + AppKit.framework/Headers/NSTextFieldCell.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSClipView.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSMenuItem.h + + + + NSView + + IBFrameworkSource + AppKit.framework/Headers/NSRulerView.h + + + + NSView + NSResponder + + + + NSView + + IBFrameworkSource + BWToolkitFramework.framework/Headers/NSView+BWAdditions.h + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSDrawer.h + + + + NSWindow + NSResponder + + IBFrameworkSource + AppKit.framework/Headers/NSWindow.h + + + + NSWindow + + IBFrameworkSource + AppKit.framework/Headers/NSWindowScripting.h + + + + NSWindow + + IBFrameworkSource + BWToolkitFramework.framework/Headers/NSWindow+BWAdditions.h + + + + NSWindowController + NSResponder + + showWindow: + id + + + IBFrameworkSource + AppKit.framework/Headers/NSWindowController.h + + + 0 + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.macosx + + + + com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 + + + YES ../Elysium.xcodeproj 3 diff --git a/src/datamodel/ELLayer.h b/src/datamodel/ELLayer.h index ced39b3..7421cb5 100644 --- a/src/datamodel/ELLayer.h +++ b/src/datamodel/ELLayer.h @@ -23,55 +23,58 @@ @class ELLayerWindowController; @interface ELLayer : NSObject { - id _delegate; // This will be the view representing us in the UI + id _delegate; // This will be the view representing us in the UI - ELPlayer *_player; // The player we belong to - NSMutableArray *_cells; // The cells that make up the lattice structure of the layer - NSMutableArray *_playheads; // Array of playheads active on our surface - NSMutableArray *_playheadQueue; // Array of playheads to be queued onto the layer in the next beat - NSMutableArray *_generators; // Array of playhead generator tokens - int _beatCount; // Current beat number + ELPlayer *_player; // The player we belong to + NSMutableArray *_cells; // The cells that make up the lattice structure of the layer + NSMutableArray *_playheads; // Array of playheads active on our surface + NSMutableArray *_playheadQueue; // Array of playheads to be queued onto the layer in the next beat + NSMutableArray *_generators; // Array of playhead generator tokens + int _beatCount; // Current beat number - UInt64 _timeBase; // Our MIDI timebase, time of next beat can be calculated - // from this, the tempo, and the beatcount. This should be - // reset if the tempo is ever reset. + UInt64 _timeBase; // Our MIDI timebase, time of next beat can be calculated + // from this, the tempo, and the beatcount. This should be + // reset if the tempo is ever reset. - NSThread *_runner; // The thread that runs this layer - BOOL _isRunning; // Whether or not this layer is running + NSThread *_runner; // The thread that runs this layer + BOOL _isRunning; // Whether or not this layer is running - BOOL _dirty; // Layer or cell has been updated + BOOL _dirty; // Layer or cell has been updated - NSMutableDictionary *_scripts; + NSMutableDictionary *_scripts; // NSString *_scriptingTag; - NSMutableArray *_receivedNotes; + NSMutableArray *_receivedNotes; ELLayerWindowController *_windowController; - NSString *_layerId; + NSString *_layerId; - ELKey *_key; // If this layer is in a musical key + ELKey *_key; // If this layer is in a musical key - ELCell *_selectedCell; + ELCell *_selectedCell; - ELDial *_enabledDial; - ELDial *_channelDial; - ELDial *_tempoDial; - ELDial *_barLengthDial; - ELDial *_timeToLiveDial; - ELDial *_pulseEveryDial; - ELDial *_velocityDial; - ELDial *_emphasisDial; - ELDial *_tempoSyncDial; - ELDial *_noteLengthDial; - ELDial *_transposeDial; + ELDial *_enabledDial; + ELDial *_channelDial; + ELDial *_tempoDial; + ELDial *_barLengthDial; + ELDial *_timeToLiveDial; + ELDial *_pulseEveryDial; + ELDial *_velocityDial; + ELDial *_emphasisDial; + ELDial *_tempoSyncDial; + ELDial *_noteLengthDial; + ELDial *_transposeDial; } + + (NSPredicate *)deadPlayheadFilter; + - (id)initWithPlayer:(ELPlayer *)player; - (id)initWithPlayer:(ELPlayer *)player channel:(int)channel; + @property ELPlayer *player; @property id delegate; @property BOOL visible; @@ -84,6 +87,7 @@ @property (readonly) BOOL isRunning; @property ELLayerWindowController *windowController; +@property CGFloat alphaValue; @property (assign) ELDial *enabledDial; @property (assign) ELDial *channelDial; diff --git a/src/datamodel/ELLayer.m b/src/datamodel/ELLayer.m index 1776aaf..9f52c73 100644 --- a/src/datamodel/ELLayer.m +++ b/src/datamodel/ELLayer.m @@ -255,6 +255,19 @@ - (void)setScriptingTag:(NSString *)scriptingTag { } +@dynamic alphaValue; + + +- (CGFloat)alphaValue { + return [[[self windowController] window] alphaValue]; +} + + +- (void)setAlphaValue:(CGFloat)alphaValue { + [[[self windowController] window] setAlphaValue:alphaValue]; +} + + #pragma mark Utility methods - (int)timerResolution {