/*****************************************************************************
* dialogProvider.m: Minimal Dialog Provider for Mac OS X
*****************************************************************************
- * Copyright (C) 2009-2010 the VideoLAN team
+ * Copyright (C) 2009-2011 the VideoLAN team
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne at videolan dot org>
+ * Pierre d'Herbemont <pdherbemont # videolan dot>
*
* 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
#import <vlc_common.h>
#import <vlc_plugin.h>
#import <vlc_dialog.h>
-#import <vlc_interface.h>
#import <vlc_extensions.h>
+#import <vlc_modules.h>
-#import <Cocoa/Cocoa.h>
-#import "VLCLoginPanel.h"
-#import "VLCProgressPanel.h"
+#import "dialogProvider.h"
+#import "VLCUIWidgets.h"
/*****************************************************************************
* Prototypes
static bool checkProgressPanel (void *);
static void destroyProgressPanel (void *);
-@interface VLCDialogDisplayer : NSObject
-{
- VLCProgressPanel *_currentProgressBarPanel;
-}
-
-+ (NSDictionary *)dictionaryForDialog:(const char *)title :(const char *)message :(const char *)yes :(const char *)no :(const char *)cancel;
-
-- (void)displayError:(NSDictionary *)dialog;
-- (void)displayCritical:(NSDictionary *)dialog;
-- (NSNumber *)displayQuestion:(NSDictionary *)dialog;
-- (NSDictionary *)displayLogin:(NSDictionary *)dialog;
-
-- (void)displayProgressBar:(NSDictionary *)dict;
-- (void)updateProgressPanel:(NSDictionary *)dict;
-- (void)destroyProgressPanel;
-- (NSNumber *)checkProgressPanel;
-
-- (void)updateExtensionDialog:(NSValue *)extensionDialog;
-
-- (id)resultFromSelectorOnMainThread:(SEL)sel withObject:(id)object;
-@end
-
-@interface VLCDialogButton : NSButton
-{
- extension_widget_t *widget;
-}
-@property (readwrite) extension_widget_t *widget;
-@end
-
-@implementation VLCDialogButton
-@synthesize widget;
-@end
-
-@interface VLCDialogPopUpButton : NSPopUpButton
-{
- extension_widget_t *widget;
-}
-@property (readwrite) extension_widget_t *widget;
-@end
-
-@implementation VLCDialogPopUpButton
-@synthesize widget;
-@end
-
-
-@interface VLCDialogTextField : NSTextField
-{
- extension_widget_t *widget;
-}
-@property (readwrite) extension_widget_t *widget;
-@end
-
-@implementation VLCDialogTextField
-@synthesize widget;
-@end
-
-@interface VLCDialogList : NSTableView
-{
- extension_widget_t *widget;
- NSMutableArray *contentArray;
-}
-@property (readwrite) extension_widget_t *widget;
-@property (readwrite, retain) NSMutableArray *contentArray;
-@end
-
-@implementation VLCDialogList
-@synthesize widget;
-@synthesize contentArray;
-
-- (NSInteger)numberOfRowsInTableView:(NSTableView *)aTableView
-{
- return [contentArray count];
-}
-
-- (id)tableView:(NSTableView *)aTableView objectValueForTableColumn:(NSTableColumn *)aTableColumn row:(NSInteger)rowIndex
-{
- return [[contentArray objectAtIndex:rowIndex] objectForKey:@"text"];
-}
-@end
-
-@interface VLCDialogGridView : NSView {
- NSUInteger _rowCount, _colCount;
- NSMutableArray *_gridedViews;
-}
-
-- (NSSize)flexSize:(NSSize)size;
-- (void)removeSubview:(NSView *)view;
-@end
-
-
-// Move this to separate file
-@implementation VLCDialogGridView
-
-- (void)dealloc
-{
- [_gridedViews release];
- [super dealloc];
-}
-
-- (void)recomputeCount
-{
- _colCount = 0;
- _rowCount = 0;
- for (NSDictionary *obj in _gridedViews)
- {
- NSUInteger row = [[obj objectForKey:@"row"] intValue];
- NSUInteger col = [[obj objectForKey:@"col"] intValue];
- if (col + 1 > _colCount)
- _colCount = col + 1;
- if (row + 1 > _rowCount)
- _rowCount = row + 1;
- }
-}
-
-- (void)recomputeWindowSize
-{
- [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(recomputeWindowSize) object:nil];
-
- NSWindow *window = [self window];
- NSRect frame = [window frame];
- NSRect contentRect = [window contentRectForFrameRect:frame];
- contentRect.size = [self flexSize:frame.size];
- NSRect newFrame = [window frameRectForContentRect:contentRect];
- newFrame.origin.y -= newFrame.size.height - frame.size.height;
- newFrame.origin.x -= (newFrame.size.width - frame.size.width) / 2;
- [window setFrame:newFrame display:YES animate:YES];
-}
-
-- (NSSize)objectSizeToFit:(NSView *)view
-{
- if ([view isKindOfClass:[NSControl class]]) {
- NSControl *control = (NSControl *)view;
- return [[control cell] cellSize];
- }
- return [view frame].size;
-}
-
-- (CGFloat)marginX
-{
- return 16;
-}
-- (CGFloat)marginY
-{
- return 8;
-}
-
-- (CGFloat)constrainedHeightOfRow:(NSUInteger)targetRow
-{
- CGFloat height = 0;
- for(NSDictionary *obj in _gridedViews) {
- NSUInteger row = [[obj objectForKey:@"row"] intValue];
- if (row != targetRow)
- continue;
- NSUInteger rowSpan = [[obj objectForKey:@"rowSpan"] intValue];
- if (rowSpan != 1)
- continue;
- NSView *view = [obj objectForKey:@"view"];
- if ([view autoresizingMask] & NSViewHeightSizable)
- continue;
- NSSize sizeToFit = [self objectSizeToFit:view];
- if (height < sizeToFit.height)
- height = sizeToFit.height;
- }
- return height;
-}
-
-- (CGFloat)remainingRowsHeight
-{
- NSUInteger height = [self marginY];
- if (!_rowCount)
- return 0;
- NSUInteger autosizedRows = 0;
- for (NSUInteger i = 0; i < _rowCount; i++) {
- CGFloat constrainedHeight = [self constrainedHeightOfRow:i];
- if (!constrainedHeight)
- autosizedRows++;
- height += constrainedHeight + [self marginY];
- }
- CGFloat remaining = 0;
- if (height < self.bounds.size.height && autosizedRows)
- remaining = (self.bounds.size.height - height) / autosizedRows;
- if (remaining < 0)
- remaining = 0;
-
- return remaining;
-}
-
-- (CGFloat)heightOfRow:(NSUInteger)targetRow
-{
- NSAssert(targetRow < _rowCount, @"accessing a non existing row");
- CGFloat height = [self constrainedHeightOfRow:targetRow];
- if (!height)
- height = [self remainingRowsHeight];
- return height;
-}
-
-
-- (CGFloat)topOfRow:(NSUInteger)targetRow
-{
- CGFloat top = [self marginY];
- for (NSUInteger i = 1; i < _rowCount - targetRow; i++)
- {
- top += [self heightOfRow:_rowCount - i] + [self marginY];
- }
- return top;
-}
-
-- (CGFloat)constrainedWidthOfColumn:(NSUInteger)targetColumn
-{
- CGFloat width = 0;
- for(NSDictionary *obj in _gridedViews) {
- NSUInteger col = [[obj objectForKey:@"col"] intValue];
- if (col != targetColumn)
- continue;
- NSUInteger colSpan = [[obj objectForKey:@"colSpan"] intValue];
- if (colSpan != 1)
- continue;
- NSView *view = [obj objectForKey:@"view"];
- if ([view autoresizingMask] & NSViewWidthSizable)
- return 0;
- NSSize sizeToFit = [self objectSizeToFit:view];
- if (width < sizeToFit.width)
- width = sizeToFit.width;
- }
- return width;
-}
-
-- (CGFloat)remainingColumnWidth
-{
- NSUInteger width = [self marginX];
- if (!_colCount)
- return 0;
- NSUInteger autosizedCol = 0;
- for (NSUInteger i = 0; i < _colCount; i++) {
- CGFloat constrainedWidth = [self constrainedWidthOfColumn:i];
- if (!constrainedWidth)
- autosizedCol++;
- width += constrainedWidth + [self marginX];
-
- }
- CGFloat remaining = 0;
- if (width < self.bounds.size.width && autosizedCol)
- remaining = (self.bounds.size.width - width) / autosizedCol;
- if (remaining < 0)
- remaining = 0;
- return remaining;
-}
-
-- (CGFloat)widthOfColumn:(NSUInteger)targetColumn
-{
- CGFloat width = [self constrainedWidthOfColumn:targetColumn];
- if (!width)
- width = [self remainingColumnWidth];
- return width;
-}
-
-
-- (CGFloat)leftOfColumn:(NSUInteger)targetColumn
-{
- CGFloat left = [self marginX];
- for (NSUInteger i = 0; i < targetColumn; i++)
- {
- left += [self widthOfColumn:i] + [self marginX];
-
- }
- return left;
-}
-
-- (void)relayout
-{
- for(NSDictionary *obj in _gridedViews) {
- NSUInteger row = [[obj objectForKey:@"row"] intValue];
- NSUInteger col = [[obj objectForKey:@"col"] intValue];
- NSUInteger rowSpan = [[obj objectForKey:@"rowSpan"] intValue];
- NSUInteger colSpan = [[obj objectForKey:@"colSpan"] intValue];
- NSView *view = [obj objectForKey:@"view"];
- NSRect rect;
-
- // Get the height
- if ([view autoresizingMask] & NSViewHeightSizable || rowSpan > 1) {
- CGFloat height = 0;
- for (NSUInteger r = 0; r < rowSpan; r++) {
- if (row + r >= _rowCount)
- break;
- height += [self heightOfRow:row + r] + [self marginY];
- }
- rect.size.height = height - [self marginY];
- }
- else
- rect.size.height = [self objectSizeToFit:view].height;
-
- // Get the width
- if ([view autoresizingMask] & NSViewWidthSizable) {
- CGFloat width = 0;
- for (NSUInteger c = 0; c < colSpan; c++)
- width += [self widthOfColumn:col + c] + [self marginX];
- rect.size.width = width - [self marginX];
- }
- else
- rect.size.width = [self objectSizeToFit:view].width;
-
- // Top corner
- rect.origin.y = [self topOfRow:row] + ([self heightOfRow:row] - rect.size.height) / 2;
- rect.origin.x = [self leftOfColumn:col];
-
- [view setFrame:rect];
- [view setNeedsDisplay:YES];
- }
-}
-
-- (NSMutableDictionary *)objectForView:(NSView *)view
-{
- for (NSMutableDictionary *dict in _gridedViews)
- {
- if ([dict objectForKey:@"view"] == view)
- return dict;
- }
- return nil;
-}
-
-- (void)addSubview:(NSView *)view atRow:(NSUInteger)row column:(NSUInteger)column rowSpan:(NSUInteger)rowSpan colSpan:(NSUInteger)colSpan
-{
- if (row + 1 > _rowCount)
- _rowCount = row + 1;
- if (column + 1 > _colCount)
- _colCount = column + 1;
-
- if (!_gridedViews)
- _gridedViews = [[NSMutableArray alloc] init];
-
- NSMutableDictionary *dict = [self objectForView:view];
- if (!dict) {
- dict = [NSMutableDictionary dictionary];
- [dict setObject:view forKey:@"view"];
- [_gridedViews addObject:dict];
- }
- [dict setObject:[NSNumber numberWithInt:rowSpan] forKey:@"rowSpan"];
- [dict setObject:[NSNumber numberWithInt:colSpan] forKey:@"colSpan"];
- [dict setObject:[NSNumber numberWithInt:row] forKey:@"row"];
- [dict setObject:[NSNumber numberWithInt:column] forKey:@"col"];
-
-
- [self addSubview:view];
- [self relayout];
-
- // Recompute the size of the window after making sure we won't see anymore update
- [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(recomputeWindowSize) object:nil];
- [self performSelector:@selector(recomputeWindowSize) withObject:nil afterDelay:0.1];
-}
-
-- (void)removeSubview:(NSView *)view
-{
- NSDictionary *dict = [self objectForView:view];
- if (dict)
- [_gridedViews removeObject:dict];
- [view removeFromSuperview];
-
- [self recomputeCount];
- [self recomputeWindowSize];
-
- [self relayout];
- [self setNeedsDisplay:YES];
-}
-
-- (void)setFrame:(NSRect)frameRect
-{
- [super setFrame:frameRect];
- [self relayout];
-}
-
-- (NSSize)flexSize:(NSSize)size
-{
- if (!_rowCount || !_colCount)
- return size;
-
- CGFloat minHeight = [self marginY];
- BOOL canFlexHeight = NO;
- for (NSUInteger i = 0; i < _rowCount; i++) {
- CGFloat constrained = [self constrainedHeightOfRow:i];
- if (!constrained) {
- canFlexHeight = YES;
- constrained = 128;
- }
- minHeight += constrained + [self marginY];
- }
-
- CGFloat minWidth = [self marginX];
- BOOL canFlexWidth = NO;
- for (NSUInteger i = 0; i < _colCount; i++) {
- CGFloat constrained = [self constrainedWidthOfColumn:i];
- if (!constrained) {
- canFlexWidth = YES;
- constrained = 128;
- }
- minWidth += constrained + [self marginX];
- }
- if (size.width < minWidth)
- size.width = minWidth;
- if (size.height < minHeight)
- size.height = minHeight;
- if (!canFlexHeight)
- size.height = minHeight;
- if (!canFlexWidth)
- size.width = minWidth;
- return size;
-}
-
-- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)frameSize
-{
- NSRect rect = NSMakeRect(0, 0, 0, 0);
- rect.size = frameSize;
- rect = [sender contentRectForFrameRect:rect];
- rect.size = [self flexSize:rect.size];
- rect = [sender frameRectForContentRect:rect];
- return rect.size;
-}
-
-@end
-
static inline NSDictionary *DictFromDialogFatal(dialog_fatal_t *dialog) {
return [VLCDialogDisplayer dictionaryForDialog:dialog->title :dialog->message :NULL :NULL :NULL];
vlc_module_begin()
/* Minimal interface. see intf.m */
set_shortname("Mac OS X Dialogs")
- add_shortcut("macosx_dialog_provider")
- add_shortcut("miosx")
+ add_shortcut("macosx_dialog_provider", "miosx")
set_description("Minimal Mac OS X Dialog Provider")
set_capability("interface", 0)
* it's almost certain that the client program will display error by
* itself. Moreover certain action might end up in an error, but
* the client wants to ignored them completely. */
- add_bool(prefix "hide-no-user-action-dialogs", true, NULL, T_HIDE_NOACTION, LT_HIDE_NOACTION, false)
+ add_bool(prefix "hide-no-user-action-dialogs", true, T_HIDE_NOACTION, LT_HIDE_NOACTION, false)
set_callbacks(OpenIntf, CloseIntf)
set_category(CAT_INTERFACE)
memset(p_intf->p_sys,0,sizeof(*p_intf->p_sys));
p_intf->p_sys->displayer = [[VLCDialogDisplayer alloc] init];
+ [p_intf->p_sys->displayer setIntf:p_intf];
bool hide = var_CreateGetBool(p_intf, prefix "hide-no-user-action-dialogs");
p_intf->p_sys->is_hidding_noaction_dialogs = hide;
var_AddCallback(p_intf,"dialog-extension",DisplayExtension,p_intf);
dialog_Register(p_intf);
+ /* subscribe to our last.fm announcements */
+ [[NSDistributedNotificationCenter defaultCenter] addObserver:p_intf->p_sys->displayer
+ selector:@selector(globalNotificationReceived:)
+ name:NULL
+ object:@"VLCLastFMSupport"
+ suspensionBehavior:NSNotificationSuspensionBehaviorDeliverImmediately];
+
msg_Dbg(p_intf,"Mac OS X dialog provider initialised");
return VLC_SUCCESS;
@implementation VLCDialogDisplayer
- (void)dealloc
{
+ [[NSDistributedNotificationCenter defaultCenter] removeObserver:self];
assert(!_currentProgressBarPanel); // This has to be closed on main thread.
[super dealloc];
}
+- (void)setIntf: (intf_thread_t *)p_mainintf
+{
+ p_intf = p_mainintf;
+}
+
+- (intf_thread_t *)intf
+{
+ return p_intf;
+}
+
+ (NSDictionary *)dictionaryForDialog:(const char *)title :(const char *)message :(const char *)yes :(const char *)no :(const char *)cancel
{
NSMutableDictionary *dict = [NSMutableDictionary dictionary];
return [NSNumber numberWithBool:[_currentProgressBarPanel isCancelled]];
}
+#pragma mark -
+#pragma mark Last.FM support
+- (void)globalNotificationReceived: (NSNotification *)theNotification
+{
+ NSLog(@"globalNotificationReceived");
+ NSDictionary *userData = [theNotification userInfo];
+ BOOL lastFMEnabled = [[userData objectForKey:@"enabled"] intValue];
+ NSString *lastFMUsername = [userData objectForKey:@"username"];
+ NSString *lastFMPassword = [userData objectForKey:@"password"];
+
+ if (module_exists("audioscrobbler")) {
+ if (lastFMEnabled)
+ config_AddIntf(p_intf, "audioscrobbler");
+ else
+ config_RemoveIntf(p_intf, "audioscrobbler");
+
+ config_PutPsz(p_intf, "lastfm-username", [lastFMUsername UTF8String]);
+ config_PutPsz(p_intf, "lastfm-password", [lastFMPassword UTF8String]);
+ config_SaveConfigFile(p_intf, "main");
+ config_SaveConfigFile(p_intf, "audioscrobbler");
+ }
+ else
+ msg_Err(p_intf,"Last.FM module not found, no action");
+}
+
#pragma mark -
#pragma mark Extensions Dialog
}
+- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)frameSize
+{
+ NSView *contentView = [sender contentView];
+ assert([contentView isKindOfClass:[VLCDialogGridView class]]);
+ VLCDialogGridView *gridView = (VLCDialogGridView *)contentView;
+
+ NSRect rect = NSMakeRect(0, 0, 0, 0);
+ rect.size = frameSize;
+ rect = [sender contentRectForFrameRect:rect];
+ rect.size = [gridView flexSize:rect.size];
+ rect = [sender frameRectForContentRect:rect];
+ return rect.size;
+}
+
+- (BOOL)windowShouldClose:(id)sender
+{
+ assert([sender isKindOfClass:[VLCDialogWindow class]]);
+ VLCDialogWindow *window = sender;
+ extension_dialog_t *dialog = [window dialog];
+ extension_DialogClosed(dialog);
+ dialog->p_sys_intf = NULL;
+ return YES;
+}
+
static NSView *createControlFromWidget(extension_widget_t *widget, id self)
{
assert(!widget->p_sys_intf);
[field setEditable:NO];
[field setBordered:NO];
[field setDrawsBackground:NO];
+ [field setFont:[NSFont systemFontOfSize:0]];
[[field cell] setControlSize:NSRegularControlSize];
[field setAutoresizingMask:NSViewNotSizable];
return field;
VLCDialogTextField *field = [[VLCDialogTextField alloc] init];
[field setWidget:widget];
[field setAutoresizingMask:NSViewWidthSizable];
+ [field setFont:[NSFont systemFontOfSize:0]];
[[field cell] setControlSize:NSRegularControlSize];
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(syncTextField:) name:NSControlTextDidChangeNotification object:field];
return field;
[imageView setImageScaling:NSImageScaleProportionallyUpOrDown];
return imageView;
}
+ case EXTENSION_WIDGET_SPIN_ICON:
+ {
+ NSProgressIndicator *spinner = [[NSProgressIndicator alloc] init];
+ [spinner setUsesThreadedAnimation:YES];
+ [spinner setStyle:NSProgressIndicatorSpinningStyle];
+ [spinner setDisplayedWhenStopped:YES];
+ [spinner startAnimation:self];
+ return spinner;
+ }
default:
assert(0);
return nil;
}
-static void updateControlFromWidget(NSView *control, extension_widget_t *widget)
+static void updateControlFromWidget(NSView *control, extension_widget_t *widget, id self)
{
switch (widget->type)
{
[attrString release];
break;
}
+ case EXTENSION_WIDGET_CHECK_BOX:
case EXTENSION_WIDGET_BUTTON:
{
assert([control isKindOfClass:[NSButton class]]);
[popup addItemWithTitle:[NSString stringWithUTF8String:value->psz_text]];
}
[popup synchronizeTitleAndSelectedItem];
+ [self popUpSelectionChanged:popup];
break;
}
if (!control && !shouldDestroy)
{
control = createControlFromWidget(widget, self);
- updateControlFromWidget(control, widget);
+ updateControlFromWidget(control, widget, self);
widget->p_sys_intf = control;
update = YES; // Force update and repositionning
[control setHidden:widget->b_hide];
if (update && !shouldDestroy)
{
- updateControlFromWidget(control, widget);
+ updateControlFromWidget(control, widget, self);
[control setHidden:widget->b_hide];
int row = widget->i_row - 1;
if (!dialog->i_width || !dialog->i_height)
size = NSMakeSize(640, 480);
- NSWindow *window = dialog->p_sys_intf;
+ VLCDialogWindow *window = dialog->p_sys_intf;
if (!window && !shouldDestroy)
{
NSRect content = NSMakeRect(0, 0, 1, 1);
- window = [[NSWindow alloc] initWithContentRect:content styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask backing:NSBackingStoreBuffered defer:NO];
+ window = [[VLCDialogWindow alloc] initWithContentRect:content styleMask:NSTitledWindowMask | NSClosableWindowMask | NSResizableWindowMask backing:NSBackingStoreBuffered defer:NO];
+ [window setDelegate:self];
+ [window setDialog:dialog];
[window setTitle:[NSString stringWithUTF8String:dialog->psz_title]];
VLCDialogGridView *gridView = [[VLCDialogGridView alloc] init];
[gridView setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
[window setContentView:gridView];
- [window setDelegate:gridView];
[gridView release];
dialog->p_sys_intf = window;
}
[window setDelegate:nil];
[window close];
dialog->p_sys_intf = NULL;
+ window = nil;
}
- if (!dialog->b_hide && ![window isVisible]) {
+ if (![window isVisible]) {
[window center];
[window makeKeyAndOrderFront:self];
}
projects / vlc / blobdiff