vlc | branch: master | Felix Paul Kühne <[email protected]> | Sun Apr 8 19:04:04 2012 +0200| [84e84d3fab2140eb7ed4e1bfef2c47adf8ebb9ef] | committer: Felix Paul Kühne
macosx: removed VLCControllerView, which was superseeded by VLBrushedMetalImageView and VLCThreePartDropView > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=84e84d3fab2140eb7ed4e1bfef2c47adf8ebb9ef --- .../macosx/Resources/English.lproj/MainMenu.xib | 24 ++---- modules/gui/macosx/misc.h | 12 +--- modules/gui/macosx/misc.m | 91 -------------------- 3 files changed, 7 insertions(+), 120 deletions(-) diff --git a/extras/package/macosx/Resources/English.lproj/MainMenu.xib b/extras/package/macosx/Resources/English.lproj/MainMenu.xib index 6fb61b2..5078bf5 100644 --- a/extras/package/macosx/Resources/English.lproj/MainMenu.xib +++ b/extras/package/macosx/Resources/English.lproj/MainMenu.xib @@ -21,16 +21,16 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="1617"/> + <integer value="4850"/> + <integer value="29"/> <integer value="4596"/> <integer value="4722"/> - <integer value="2770"/> + <integer value="21"/> + <integer value="1617"/> <integer value="2730"/> - <integer value="29"/> - <integer value="915"/> - <integer value="4850"/> <integer value="4948"/> - <integer value="4756"/> + <integer value="2770"/> + <integer value="915"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -11224,7 +11224,6 @@ LCAuLi4</string> <string>1996.ImportedFromIB2</string> <string>1997.IBPluginDependency</string> <string>1997.ImportedFromIB2</string> - <string>2.CustomClassName</string> <string>2.IBPluginDependency</string> <string>2.ImportedFromIB2</string> <string>202.IBPluginDependency</string> @@ -12072,7 +12071,6 @@ LCAuLi4</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> - <string>VLCControllerView</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -13173,11 +13171,6 @@ LCAuLi4</string> </object> </object> <object class="IBPartialClassDescription"> - <string key="className">VLCControllerView</string> - <string key="superclassName">NSView</string> - <reference key="sourceIdentifier" ref="516086310"/> - </object> - <object class="IBPartialClassDescription"> <string key="className">VLCControls</string> <string key="superclassName">NSObject</string> <object class="NSMutableDictionary" key="actions"> @@ -15818,11 +15811,6 @@ LCAuLi4</string> <reference key="sourceIdentifier" ref="386911354"/> </object> <object class="IBPartialClassDescription"> - <string key="className">VLCControllerView</string> - <string key="superclassName">NSView</string> - <reference key="sourceIdentifier" ref="386911354"/> - </object> - <object class="IBPartialClassDescription"> <string key="className">VLCCustomWindowButtonPrototype</string> <string key="superclassName">NSButton</string> <object class="IBClassDescriptionSource" key="sourceIdentifier" id="672431580"> diff --git a/modules/gui/macosx/misc.h b/modules/gui/macosx/misc.h index 3d5e00d..64795b7 100644 --- a/modules/gui/macosx/misc.h +++ b/modules/gui/macosx/misc.h @@ -86,16 +86,6 @@ /***************************************************************************** - * VLCControllerView - *****************************************************************************/ - -@interface VLCControllerView : NSView -{ -} - -@end - -/***************************************************************************** * VLBrushedMetalImageView *****************************************************************************/ @@ -187,7 +177,7 @@ @end /***************************************************************************** - * VLCThreePartImageView interface + * VLCThreePartDropView interface *****************************************************************************/ @interface VLCThreePartDropView : VLCThreePartImageView { diff --git a/modules/gui/macosx/misc.m b/modules/gui/macosx/misc.m index 39d17a6..6063b85 100644 --- a/modules/gui/macosx/misc.m +++ b/modules/gui/macosx/misc.m @@ -378,97 +378,6 @@ static NSMutableArray *blackoutWindows = NULL; @end /***************************************************************************** - * VLCControllerView - *****************************************************************************/ - -@implementation VLCControllerView - -- (void)dealloc -{ - [self unregisterDraggedTypes]; - [super dealloc]; -} - -- (void)awakeFromNib -{ - [self registerForDraggedTypes:[NSArray arrayWithObjects:NSTIFFPboardType, - NSFilenamesPboardType, nil]]; -} - -- (NSDragOperation)draggingEntered:(id <NSDraggingInfo>)sender -{ - if ((NSDragOperationGeneric & [sender draggingSourceOperationMask]) - == NSDragOperationGeneric) - { - return NSDragOperationGeneric; - } - else - { - return NSDragOperationNone; - } -} - -- (BOOL)prepareForDragOperation:(id <NSDraggingInfo>)sender -{ - return YES; -} - -- (BOOL)performDragOperation:(id <NSDraggingInfo>)sender -{ - NSPasteboard *o_paste = [sender draggingPasteboard]; - NSArray *o_types = [NSArray arrayWithObjects: NSFilenamesPboardType, nil]; - NSString *o_desired_type = [o_paste availableTypeFromArray:o_types]; - NSData *o_carried_data = [o_paste dataForType:o_desired_type]; - - if( o_carried_data ) - { - if ([o_desired_type isEqualToString:NSFilenamesPboardType]) - { - NSArray *o_array = [NSArray array]; - NSArray *o_values = [[o_paste propertyListForType: NSFilenamesPboardType] sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)]; - NSUInteger count = [o_values count]; - - input_thread_t * p_input = pl_CurrentInput( VLCIntf ); - BOOL b_returned = NO; - - if (count == 1 && p_input) - { - b_returned = input_AddSubtitle( p_input, make_URI([[o_values objectAtIndex:0] UTF8String], NULL), true ); - vlc_object_release( p_input ); - if(!b_returned) - return YES; - } - else if( p_input ) - vlc_object_release( p_input ); - - for( NSUInteger i = 0; i < count; i++) - { - NSDictionary *o_dic; - char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], NULL); - if( !psz_uri ) - continue; - - o_dic = [NSDictionary dictionaryWithObject:[NSString stringWithCString:psz_uri encoding:NSUTF8StringEncoding] forKey:@"ITEM_URL"]; - - free( psz_uri ); - o_array = [o_array arrayByAddingObject: o_dic]; - } - [(VLCPlaylist *)[[VLCMain sharedInstance] playlist] appendArray: o_array atPos: -1 enqueue:NO]; - return YES; - } - } - [self setNeedsDisplay:YES]; - return YES; -} - -- (void)concludeDragOperation:(id <NSDraggingInfo>)sender -{ - [self setNeedsDisplay:YES]; -} - -@end - -/***************************************************************************** * VLBrushedMetalImageView *****************************************************************************/ _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
