/*****************************************************************************
* ExtensionsDialogProvider.m: Mac OS X Extensions Dialogs
*****************************************************************************
- * Copyright (C) 2005-2012 VLC authors and VideoLAN
+ * Copyright (C) 2010-2013 VLC authors and VideoLAN
* $Id$
*
- * Authors: Brendon Justin <brendonjustin at gmail.com>,
- * Derk-Jan Hartman <hartman at videolan dot org>,
- * Felix Paul Kühne <fkuehne at videolan dot org>
+ * Authors: Pierre d'Herbemont <pdherbemont # videolan org>
+ * Brendon Justin <brendonjustin@gmail.com>,
+ * Derk-Jan Hartman <hartman@videolan dot org>,
+ * Felix Paul Kühne <fkuehne@videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* VLCExtensionsDialogProvider implementation
*****************************************************************************/
-static int dialogCallback( vlc_object_t *p_this, const char *psz_variable,
+static int dialogCallback(vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val,
- void *param );
+ void *param);
static NSView *createControlFromWidget(extension_widget_t *widget, id self)
{
assert(!widget->p_sys_intf);
- switch (widget->type)
- {
+ switch (widget->type) {
case EXTENSION_WIDGET_HTML:
{
WebView *webView = [[WebView alloc] initWithFrame:NSMakeRect (0,0,1,1)];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(syncTextField:) name:NSControlTextDidChangeNotification object:field];
return field;
}
+ case EXTENSION_WIDGET_CHECK_BOX:
+ {
+ VLCDialogButton *button = [[VLCDialogButton alloc] init];
+ [button setButtonType:NSSwitchButton];
+ [button setWidget:widget];
+ [button setAction:@selector(triggerClick:)];
+ [button setTarget:self];
+ [[button cell] setControlSize:NSRegularControlSize];
+ [button setAutoresizingMask:NSViewWidthSizable];
+ return button;
+ }
case EXTENSION_WIDGET_BUTTON:
{
VLCDialogButton *button = [[VLCDialogButton alloc] init];
static void updateControlFromWidget(NSView *control, extension_widget_t *widget, id self)
{
- switch (widget->type)
- {
+ switch (widget->type) {
case EXTENSION_WIDGET_HTML:
{
// Get the web view
assert([control isKindOfClass:[NSTextView class]]);
NSTextView *textView = (NSTextView *)control;
NSString *string = [NSString stringWithUTF8String:widget->psz_text];
- NSAttributedString *attrString = [[NSAttributedString alloc] initWithHTML:[string dataUsingEncoding:NSUTF8StringEncoding] documentAttributes:NULL];
+ NSAttributedString *attrString = [[NSAttributedString alloc] initWithHTML:[string dataUsingEncoding: NSISOLatin1StringEncoding] documentAttributes:NULL];
[[textView textStorage] setAttributedString:attrString];
[textView setNeedsDisplay:YES];
[textView scrollRangeToVisible:NSMakeRange(0, 0)];
break;
assert([control isKindOfClass:[NSControl class]]);
NSControl *field = (NSControl *)control;
- NSString *string = [NSString stringWithUTF8String:widget->psz_text];
- NSAttributedString *attrString = [[NSAttributedString alloc] initWithHTML:[string dataUsingEncoding:NSUTF8StringEncoding] documentAttributes:NULL];
+ NSString *string = [NSString stringWithCString:widget->psz_text encoding:NSUTF8StringEncoding];
+ NSAttributedString *attrString = [[NSAttributedString alloc] initWithHTML:[string dataUsingEncoding: NSISOLatin1StringEncoding] documentAttributes:NULL];
[field setAttributedStringValue:attrString];
[attrString release];
break;
NSPopUpButton *popup = (NSPopUpButton *)control;
[popup removeAllItems];
struct extension_widget_value_t *value;
- for(value = widget->p_values; value != NULL; value = value->p_next)
- {
+ for (value = widget->p_values; value != NULL; value = value->p_next)
[popup addItemWithTitle:[NSString stringWithUTF8String:value->psz_text]];
- }
[popup synchronizeTitleAndSelectedItem];
[self popUpSelectionChanged:popup];
break;
}
-
case EXTENSION_WIDGET_LIST:
{
assert([control isKindOfClass:[NSScrollView class]]);
NSMutableArray *contentArray = [NSMutableArray array];
struct extension_widget_value_t *value;
- for(value = widget->p_values; value != NULL; value = value->p_next)
+ for (value = widget->p_values; value != NULL; value = value->p_next)
{
NSDictionary *entry = [NSDictionary dictionaryWithObjectsAndKeys:
[NSNumber numberWithInt:value->i_id], @"id",
{
assert([control isKindOfClass:[NSProgressIndicator class]]);
NSProgressIndicator *progressIndicator = (NSProgressIndicator *)control;
- if( widget->i_spin_loops != 0 )
+ if (widget->i_spin_loops != 0)
[progressIndicator startAnimation:self];
else
[progressIndicator stopAnimation:self];
/**
* Ask the dialogs provider to create a new dialog
**/
-static int dialogCallback( vlc_object_t *p_this, const char *psz_variable,
+static int dialogCallback(vlc_object_t *p_this, const char *psz_variable,
vlc_value_t old_val, vlc_value_t new_val,
- void *param )
+ void *param)
{
(void) p_this;
(void) psz_variable;
(void) param;
ExtensionsDialogProvider *p_edp = [ExtensionsDialogProvider sharedInstance:(intf_thread_t *)p_this];
- if( !p_edp )
+ if (!p_edp)
return VLC_EGENERIC;
- if( !new_val.p_address )
+ if (!new_val.p_address)
return VLC_EGENERIC;
- extension_dialog_t *p_dialog = ( extension_dialog_t* ) new_val.p_address;
+ extension_dialog_t *p_dialog = (extension_dialog_t*) new_val.p_address;
[p_edp manageDialog:p_dialog];
return VLC_SUCCESS;
}
- at implementation ExtensionsDialogProvider
+@implementation ExtensionsDialogProvider
static ExtensionsDialogProvider *_o_sharedInstance = nil;
+ (void)killInstance
{
- if (_o_sharedInstance)
- {
+ if (_o_sharedInstance) {
[_o_sharedInstance release];
}
}
- (id)initWithIntf:(intf_thread_t *)_p_intf
{
- if( _o_sharedInstance )
+ if (_o_sharedInstance)
[self dealloc];
- if ((self = [super init]))
- {
+ if ((self = [super init])) {
_o_sharedInstance = self;
p_intf = _p_intf;
// The Cocoa interface already called dialog_Register()
- var_Create( p_intf, "dialog-extension", VLC_VAR_ADDRESS );
- var_AddCallback( p_intf, "dialog-extension", dialogCallback, NULL );
+ var_Create(p_intf, "dialog-extension", VLC_VAR_ADDRESS);
+ var_AddCallback(p_intf, "dialog-extension", dialogCallback, NULL);
}
return _o_sharedInstance;
- (void)dealloc
{
- msg_Dbg( p_intf, "ExtensionsDialogProvider is quitting..." );
- var_DelCallback( p_intf, "dialog-extension", dialogCallback, NULL );
+ msg_Dbg(p_intf, "ExtensionsDialogProvider is quitting...");
+ var_DelCallback(p_intf, "dialog-extension", dialogCallback, NULL);
[super dealloc];
}
{
NSString *o_type = [NSString stringWithUTF8String:type];
- if( [o_type isEqualToString: @"dialog-extension"] )
- {
+ if ([o_type isEqualToString: @"dialog-extension"]) {
[self performSelectorOnMainThread:@selector(updateExtensionDialog:)
withObject:o_value
waitUntilDone:YES];
}
else
- msg_Err( VLCIntf, "unhandled dialog type: '%s'", type );
+ msg_Err(VLCIntf, "unhandled dialog type: '%s'", type);
}
- (void)triggerClick:(id)sender
struct extension_widget_value_t *value;
unsigned i = 0;
- for(value = [list widget]->p_values; value != NULL; value = value->p_next, i++)
+ for (value = [list widget]->p_values; value != NULL; value = value->p_next, i++)
value->b_selected = (i == [list selectedRow]);
}
VLCDialogPopUpButton *popup = sender;
struct extension_widget_value_t *value;
unsigned i = 0;
- for(value = [popup widget]->p_values; value != NULL; value = value->p_next, i++)
+ for (value = [popup widget]->p_values; value != NULL; value = value->p_next, i++)
value->b_selected = (i == [popup indexOfSelectedItem]);
}
extension_widget_t *widget;
VLCDialogWindow *dialogWindow = dialog->p_sys_intf;
- FOREACH_ARRAY(widget, dialog->widgets)
- {
+ FOREACH_ARRAY(widget, dialog->widgets) {
if (!widget)
- continue; /* Some widgets may be NULL at this point */
+ continue; /* Some widgets may be NULL@this point */
BOOL shouldDestroy = widget->b_kill;
NSView *control = widget->p_sys_intf;
BOOL update = widget->b_update;
- if (!control && !shouldDestroy)
- {
+ if (!control && !shouldDestroy) {
control = createControlFromWidget(widget, self);
updateControlFromWidget(control, widget, self);
widget->p_sys_intf = control;
[control setHidden:widget->b_hide];
}
- if (update && !shouldDestroy)
- {
+ if (update && !shouldDestroy) {
updateControlFromWidget(control, widget, self);
[control setHidden:widget->b_hide];
int row = widget->i_row - 1;
int col = widget->i_column - 1;
- int hsp = __MAX( 1, widget->i_horiz_span );
- int vsp = __MAX( 1, widget->i_vert_span );
- if( row < 0 )
- {
+ int hsp = __MAX(1, widget->i_horiz_span);
+ int vsp = __MAX(1, widget->i_vert_span);
+ if (row < 0) {
row = 4;
col = 0;
}
widget->b_update = false;
}
- if (shouldDestroy)
- {
+ if (shouldDestroy) {
VLCDialogGridView *gridView = (VLCDialogGridView *)[dialogWindow contentView];
[gridView removeSubview:control];
[control release];
VLCDialogWindow *dialogWindow = nil;
BOOL shouldDestroy = p_dialog->b_kill;
- if (!shouldDestroy)
- {
+ if (!shouldDestroy) {
NSRect content = NSMakeRect(0, 0, 1, 1);
- dialogWindow = [[VLCDialogWindow alloc] initWithContentRect:content
+ dialogWindow = [[VLCDialogWindow alloc] initWithContentRect:content
styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask
backing:NSBackingStoreBuffered
defer:NO];
[self updateWidgets:p_dialog];
- if (shouldDestroy)
- {
+ if (shouldDestroy) {
[dialogWindow setDelegate:nil];
[dialogWindow close];
p_dialog->p_sys_intf = NULL;
* Note: Lock on p_dialog->lock must be held. */
- (int)destroyExtensionDialog:(extension_dialog_t *)p_dialog
{
- assert( p_dialog );
+ assert(p_dialog);
- VLCDialogWindow *dialogWindow = ( VLCDialogWindow* ) p_dialog->p_sys_intf;
- if( !dialogWindow )
+ VLCDialogWindow *dialogWindow = (VLCDialogWindow*) p_dialog->p_sys_intf;
+ if (!dialogWindow) {
+ msg_Warn(VLCIntf, "dialog window not found");
return VLC_EGENERIC;
+ }
- [VLCDialogWindow release];
+ [dialogWindow setDelegate:nil];
+ [dialogWindow close];
+ dialogWindow = nil;
p_dialog->p_sys_intf = NULL;
- vlc_cond_signal( &p_dialog->cond );
+ vlc_cond_signal(&p_dialog->cond);
return VLC_SUCCESS;
}
{
extension_dialog_t *p_dialog = [o_value pointerValue];
- VLCDialogWindow *dialogWindow = ( VLCDialogWindow* ) p_dialog->p_sys_intf;
- if( p_dialog->b_kill && !dialogWindow )
- {
+ VLCDialogWindow *dialogWindow = (VLCDialogWindow*) p_dialog->p_sys_intf;
+ if (p_dialog->b_kill && !dialogWindow) {
/* This extension could not be activated properly but tried
to create a dialog. We must ignore it. */
return NULL;
}
vlc_mutex_lock(&p_dialog->lock);
- if( !p_dialog->b_kill && !dialogWindow )
- {
+ if (!p_dialog->b_kill && !dialogWindow) {
dialogWindow = [self createExtensionDialog:p_dialog];
BOOL visible = !p_dialog->b_hide;
- if (visible)
- {
+ if (visible) {
[dialogWindow center];
[dialogWindow makeKeyAndOrderFront:self];
- }
- else
- {
+ } else
[dialogWindow orderOut:nil];
- }
[dialogWindow setHas_lock:NO];
}
- else if( !p_dialog->b_kill && dialogWindow )
- {
+ else if (!p_dialog->b_kill && dialogWindow) {
[dialogWindow setHas_lock:YES];
[self updateWidgets:p_dialog];
- if( strcmp( [[dialogWindow title] UTF8String],
- p_dialog->psz_title ) != 0 )
- {
- NSString *titleString = [NSString stringWithCString:p_dialog->psz_title
- encoding:NSASCIIStringEncoding];
+ if (strcmp([[dialogWindow title] UTF8String],
+ p_dialog->psz_title) != 0) {
+ NSString *titleString = [NSString stringWithCString:p_dialog->psz_title
+ encoding:NSUTF8StringEncoding];
[dialogWindow setTitle:titleString];
}
BOOL visible = !p_dialog->b_hide;
if (visible)
- {
- [dialogWindow center];
[dialogWindow makeKeyAndOrderFront:self];
- }
else
- {
[dialogWindow orderOut:nil];
- }
}
- else if( p_dialog->b_kill )
- {
+ else if (p_dialog->b_kill) {
[self destroyExtensionDialog:p_dialog];
}
- vlc_cond_signal( &p_dialog->cond );
- vlc_mutex_unlock( &p_dialog->lock );
+ vlc_cond_signal(&p_dialog->cond);
+ vlc_mutex_unlock(&p_dialog->lock);
return dialogWindow;
}
/**
* Ask the dialog manager to create/update/kill the dialog. Thread-safe.
**/
-- (void)manageDialog:( extension_dialog_t *)p_dialog
+- (void)manageDialog:(extension_dialog_t *)p_dialog
{
- assert( p_dialog );
+ NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
+ assert(p_dialog);
ExtensionsManager *extMgr = [ExtensionsManager getInstance:p_intf];
- assert( extMgr != NULL );
+ assert(extMgr != NULL);
NSValue *o_value = [NSValue valueWithPointer:p_dialog];
[self performSelectorOnMainThread:@selector(updateExtensionDialog:)
withObject:o_value
waitUntilDone:YES];
+ [pool release];
}
- at end
+@end
projects / vlc / blobdiff