]> git.sesse.net Git - vlc/blobdiff - modules/gui/macosx/coredialogs.m
projects / vlc / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
macosx: CAS: sync steppers and fields, and add NumberFormatters (fixes #8598)
[vlc] / modules / gui / macosx / coredialogs.m
diff --git a/modules/gui/macosx/coredialogs.m b/modules/gui/macosx/coredialogs.m
index 9bb043ff4f089afdaab2e5d1f91b7c98c177a6e1..7d24fc63dcb7fd9b3500ecfff67b48017dc52cca 100644 (file)
--- a/modules/gui/macosx/coredialogs.m
+++ b/modules/gui/macosx/coredialogs.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * coredialogs.m: Mac OS X Core Dialogs
  *****************************************************************************
- * Copyright (C) 2005-2011 VLC authors and VideoLAN
+ * Copyright (C) 2005-2012 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan dot org>
@@ -43,10 +43,9 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 
 -(id)init
 {
-    if( _o_sharedInstance )
+    if (_o_sharedInstance)
         [self dealloc];
-    else
-    {
+    else {
         _o_sharedInstance = [super init];
         o_error_panel = [[VLCErrorPanel alloc] init];
         b_progress_cancelled = NO;
@@ -68,27 +67,27 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 
 -(void)performEventWithObject: (NSValue *)o_value ofType: (const char*)type
 {
-    NSString *o_type = [NSString stringWithUTF8String:type];
+    NSString *o_type = @(type);
 
-    if( [o_type isEqualToString: @"dialog-error"] )
+    if ([o_type isEqualToString: @"dialog-error"])
         [self performSelectorOnMainThread:@selector(showFatalDialog:) withObject:o_value waitUntilDone:YES];
-    else if( [o_type isEqualToString: @"dialog-critical"] )
+    else if ([o_type isEqualToString: @"dialog-critical"])
         [self performSelectorOnMainThread:@selector(showFatalWaitDialog:) withObject:o_value waitUntilDone:YES];
-    else if( [o_type isEqualToString: @"dialog-question"] )
+    else if ([o_type isEqualToString: @"dialog-question"])
         [self performSelectorOnMainThread:@selector(showQuestionDialog:) withObject:o_value waitUntilDone:YES];
-    else if( [o_type isEqualToString: @"dialog-login"] )
+    else if ([o_type isEqualToString: @"dialog-login"])
         [self performSelectorOnMainThread:@selector(showLoginDialog:) withObject:o_value waitUntilDone:YES];
-    else if( [o_type isEqualToString: @"dialog-progress-bar"] )
+    else if ([o_type isEqualToString: @"dialog-progress-bar"])
         [self performSelectorOnMainThread:@selector(showProgressDialogOnMainThread:) withObject: o_value waitUntilDone:YES];
     else
-        msg_Err( VLCIntf, "unhandled dialog type: '%s'", type );
+        msg_Err(VLCIntf, "unhandled dialog type: '%s'", type);
 }
 
 -(void)showFatalDialog: (NSValue *)o_value
 {
     dialog_fatal_t *p_dialog = [o_value pointerValue];
 
-    [o_error_panel addError: [NSString stringWithUTF8String: p_dialog->title] withMsg: [NSString stringWithUTF8String: p_dialog->message]];
+    [o_error_panel addError: @(p_dialog->title) withMsg: @(p_dialog->message)];
     [o_error_panel showPanel];
 }
 
@@ -97,7 +96,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
     dialog_fatal_t *p_dialog = [o_value pointerValue];
     NSAlert *o_alert;
 
-    o_alert = [NSAlert alertWithMessageText: [NSString stringWithUTF8String: p_dialog->title] defaultButton: _NS("OK") alternateButton: nil otherButton: nil informativeTextWithFormat: [NSString stringWithUTF8String: p_dialog->message]];
+    o_alert = [NSAlert alertWithMessageText: @(p_dialog->title) defaultButton: _NS("OK") alternateButton: nil otherButton: nil informativeTextWithFormat: @"%s", p_dialog->message];
     [o_alert setAlertStyle: NSCriticalAlertStyle];
     [o_alert runModal];
 }
@@ -109,22 +108,22 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
     NSString *o_yes, *o_no, *o_cancel;
     NSInteger i_returnValue = 0;
 
-    if( p_dialog->yes != NULL )
-        o_yes = [NSString stringWithUTF8String: p_dialog->yes];
-    if( p_dialog->no != NULL )
-        o_no = [NSString stringWithUTF8String: p_dialog->no];
-    if( p_dialog->cancel != NULL )
-        o_cancel = [NSString stringWithUTF8String: p_dialog->cancel];
+    if (p_dialog->yes != NULL)
+        o_yes = @(p_dialog->yes);
+    if (p_dialog->no != NULL)
+        o_no = @(p_dialog->no);
+    if (p_dialog->cancel != NULL)
+        o_cancel = @(p_dialog->cancel);
 
-    o_alert = [NSAlert alertWithMessageText: [NSString stringWithUTF8String: p_dialog->title] defaultButton: o_yes alternateButton:o_no otherButton: o_cancel informativeTextWithFormat: [NSString stringWithUTF8String: p_dialog->message]];
+    o_alert = [NSAlert alertWithMessageText: @(p_dialog->title) defaultButton: o_yes alternateButton:o_no otherButton: o_cancel informativeTextWithFormat: @"%s", p_dialog->message];
     [o_alert setAlertStyle: NSInformationalAlertStyle];
     i_returnValue = [o_alert runModal];
 
-    if( i_returnValue == NSAlertDefaultReturn )
+    if (i_returnValue == NSAlertDefaultReturn)
         p_dialog->answer = 1;
-    if( i_returnValue == NSAlertAlternateReturn )
+    if (i_returnValue == NSAlertAlternateReturn)
         p_dialog->answer = 2;
-    if( i_returnValue == NSAlertOtherReturn )
+    if (i_returnValue == NSAlertOtherReturn)
         p_dialog->answer = 3;
 }
 
@@ -133,29 +132,26 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
     dialog_login_t *p_dialog = [o_value pointerValue];
     NSInteger i_returnValue = 0;
 
-    [o_auth_title_txt setStringValue: [NSString stringWithUTF8String: p_dialog->title]];
-    [o_auth_win setTitle: [NSString stringWithUTF8String: p_dialog->title]];
-    [o_auth_description_txt setStringValue: [NSString stringWithUTF8String: p_dialog->message]];
+    [o_auth_title_txt setStringValue: @(p_dialog->title)];
+    [o_auth_win setTitle: @(p_dialog->title)];
+    [o_auth_description_txt setStringValue: @(p_dialog->message)];
     [o_auth_login_fld setStringValue: @""];
     [o_auth_pw_fld setStringValue: @""];
 
     [o_auth_win center];
     i_returnValue = [NSApp runModalForWindow: o_auth_win];
     [o_auth_win close];
-    if( i_returnValue )
+    if (i_returnValue)
     {
-        *p_dialog->username = strdup( [[o_auth_login_fld stringValue] UTF8String] );
-        *p_dialog->password = strdup( [[o_auth_pw_fld stringValue] UTF8String] );
-    }
-    else
-    {
-         *p_dialog->username = *p_dialog->password = NULL;
-    }
+        *p_dialog->username = strdup([[o_auth_login_fld stringValue] UTF8String]);
+        *p_dialog->password = strdup([[o_auth_pw_fld stringValue] UTF8String]);
+    } else
+        *p_dialog->username = *p_dialog->password = NULL;
 }
 
 -(IBAction)loginDialogAction:(id)sender
 {
-    if( [[sender title] isEqualToString: _NS("OK")] )
+    if ([[sender title] isEqualToString: _NS("OK")])
         [NSApp stopModalWithCode: 1];
     else
         [NSApp stopModalWithCode: 0];
@@ -166,35 +162,40 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
     /* we work-around a Cocoa limitation here, since you cannot delay an execution
      * on the main thread within a single call */
     b_progress_cancelled = NO;
-    if (VLCIntf)
-        [self performSelector:@selector(showProgressDialog:) withObject: o_value afterDelay:3.00];
-}
 
--(void)showProgressDialog: (NSValue *)o_value
-{
     dialog_progress_bar_t *p_dialog = [o_value pointerValue];
 
     if (!p_dialog || b_progress_cancelled)
         return;
 
-    if( p_dialog->title != NULL )
-    {
-        [o_prog_win setTitle: [NSString stringWithUTF8String: p_dialog->title]];
-        [o_prog_title_txt setStringValue: [NSString stringWithUTF8String: p_dialog->title]];
-    }
-    else
+    if (p_dialog->title != NULL)
     {
+        [o_prog_win setTitle: @(p_dialog->title)];
+        [o_prog_title_txt setStringValue: @(p_dialog->title)];
+    } else {
         [o_prog_win setTitle: @""];
         [o_prog_title_txt setStringValue: @""];
     }
-    if( p_dialog->cancel != NULL )
-        [o_prog_cancel_btn setTitle: [NSString stringWithUTF8String: p_dialog->cancel]];
+    if (p_dialog->cancel != NULL)
+        [o_prog_cancel_btn setTitle: @(p_dialog->cancel)];
     else
         [o_prog_cancel_btn setTitle: _NS("Cancel")];
-    if( p_dialog->message != NULL )
-        [o_prog_description_txt setStringValue: [NSString stringWithUTF8String: p_dialog->message]];
+    if (p_dialog->message != NULL)
+        [o_prog_description_txt setStringValue: @(p_dialog->message)];
     else
         [o_prog_description_txt setStringValue: @""];
+
+    if (VLCIntf)
+        [self performSelector:@selector(showProgressDialog:) withObject: o_value afterDelay:3.00];
+}
+
+-(void)showProgressDialog: (NSValue *)o_value
+{
+    dialog_progress_bar_t *p_dialog = [o_value pointerValue];
+
+    if (!p_dialog || b_progress_cancelled)
+        return;
+
     [o_prog_bar setDoubleValue: 0];
     [o_prog_bar setIndeterminate: YES];
     [o_prog_bar startAnimation: self];
@@ -213,8 +214,8 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 -(void)destroyProgressPanel
 {
     b_progress_cancelled = YES;
-    [o_prog_bar stopAnimation: self];
-    [o_prog_win close];
+    [o_prog_bar performSelectorOnMainThread:@selector(stopAnimation:) withObject:self waitUntilDone:YES];
+    [o_prog_win performSelectorOnMainThread:@selector(close) withObject:nil waitUntilDone:YES];
 }
 
 -(IBAction)progDialogAction:(id)sender
@@ -242,7 +243,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 {
     [super init];
 
-    if( !b_nib_loaded )
+    if (!b_nib_loaded)
         b_nib_loaded = [NSBundle loadNibNamed:@"ErrorPanel" owner:self];
 
     /* init data sources */
@@ -283,7 +284,7 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
     [ourError
         addAttribute: NSFontAttributeName
         value: [NSFont boldSystemFontOfSize:11]
-        range: NSMakeRange( 0, [o_error length])];
+        range: NSMakeRange(0, [o_error length])];
     [o_errors addObject: ourError];
     [ourError release];
 
@@ -315,11 +316,11 @@ static VLCCoreDialogProvider *_o_sharedInstance = nil;
 - (id)tableView:(NSTableView *)theDataTable objectValueForTableColumn:
     (NSTableColumn *)theTableColumn row: (NSInteger)row
 {
-    if( [[theTableColumn identifier] isEqualToString: @"error_msg"] )
-        return [o_errors objectAtIndex: row];
+    if ([[theTableColumn identifier] isEqualToString: @"error_msg"])
+        return o_errors[row];
 
-    if( [[theTableColumn identifier] isEqualToString: @"icon"] )
-        return [o_icons objectAtIndex: row];
+    if ([[theTableColumn identifier] isEqualToString: @"icon"])
+        return o_icons[row];
 
     return @"unknown identifier";
 }
Unnamed repository; edit this file 'description' to name the repository.