* slightly enlarged the progress_for_downloads-panel-to-be and fixed some bugs in...

[vlc] / modules / gui / macosx / interaction.m

diff --git a/modules/gui/macosx/interaction.m b/modules/gui/macosx/interaction.m
index 61bec635a602582cbde833b9742cae3b0412f31c..94387f0014be3734a0054996ce9bdc44e0cb38d5 100644 (file)
--- a/modules/gui/macosx/interaction.m
+++ b/modules/gui/macosx/interaction.m
@@ -1,10 +1,11 @@
 /*****************************************************************************
  * interaction.h: Mac OS X interaction dialogs
  *****************************************************************************
- * Copyright (C) 2001-2005 the VideoLAN team
- * $Id: vout.h 13803 2005-12-18 18:54:28Z bigben $
+ * Copyright (C) 2005-2006 the VideoLAN team
+ * $Id:$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan dot org>
+ *          Felix Kühne <fkuehne at 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
@@ -114,6 +115,13 @@
     if( !p_dialog )
         msg_Err( p_intf, "serious issue (p_dialog == nil)" );
 
+    if( !nib_interact_loaded )
+    {
+        nib_interact_loaded = [NSBundle loadNibNamed:@"Interaction" owner:self];
+        [o_prog_cancel_btn setTitle: _NS("Cancel")];
+        [o_prog_bar setUsesThreadedAnimation: YES];
+    }
+
     NSString *o_title = [NSString stringWithUTF8String:p_dialog->psz_title ? p_dialog->psz_title : "title"];
     NSString *o_description = [NSString stringWithUTF8String:p_dialog->psz_description ? p_dialog->psz_description : ""];
     
@@ -151,21 +159,36 @@
         for( i = 0; i < p_dialog->i_widgets; i++ )
         {
             msg_Dbg( p_intf, "widget: %s", p_dialog->pp_widgets[i]->psz_text );
-            o_description = [o_description stringByAppendingString:
-                                [NSString stringWithUTF8String: p_dialog->pp_widgets[i]->psz_text]];
+            o_description = [o_description stringByAppendingString: \
+                [NSString stringWithUTF8String: \
+                    p_dialog->pp_widgets[i]->psz_text]];
         }
         if( p_dialog->i_flags & DIALOG_OK_CANCEL )
         {
-            NSBeginInformationalAlertSheet( o_title, @"OK" , @"Cancel", nil, o_window, self,
-                @selector(sheetDidEnd: returnCode: contextInfo:), NULL, nil, o_description );
+            msg_Dbg( p_intf, "requested flag: DIALOG_OK_CANCEL" );
+            NSBeginInformationalAlertSheet( o_title, @"OK" , @"Cancel", nil, \
+                o_window, self,@selector(sheetDidEnd: returnCode: contextInfo:),\
+                NULL, nil, o_description );
         }
         else if( p_dialog->i_flags & DIALOG_YES_NO_CANCEL )
         {
-            NSBeginInformationalAlertSheet( o_title, @"Yes", @"Cancel", @"No", o_window, self,
-                @selector(sheetDidEnd: returnCode: contextInfo:), NULL, nil, o_description );
+            msg_Dbg( p_intf, "requested flag: DIALOG_YES_NO_CANCEL" );
+            NSBeginInformationalAlertSheet( o_title, @"Yes", @"No", @"Cancel", \
+                o_window, self,@selector(sheetDidEnd: returnCode: contextInfo:),\
+                NULL, nil, o_description );
+        }
+        else if( p_dialog->i_type & WIDGET_PROGRESS )
+        {
+            msg_Dbg( p_intf, "requested type: WIDGET_PROGRESS" );
+            [o_prog_title setStringValue: o_title];
+            [o_prog_description setStringValue: o_description];
+            [o_prog_bar setDoubleValue: 0];
+            [NSApp beginSheet: o_prog_win modalForWindow: o_window \
+                modalDelegate: self didEndSelector: nil contextInfo: nil];
+            [o_prog_win makeKeyWindow];
         }
         else
-            msg_Dbg( p_intf, "requested dialog type not implemented yet" );
+            msg_Warn( p_intf, "requested dialog type not implemented yet" );
     }
 }
 
@@ -195,12 +218,33 @@
 
 -(void)updateDialog
 {
-    msg_Dbg( p_intf, "update event" );
+    int i = 0;
+    for( i = 0 ; i< p_dialog->i_widgets; i++ )
+    {
+        if( p_dialog->i_type & WIDGET_PROGRESS )
+        {
+            [o_prog_bar setDoubleValue: \
+                (double)(p_dialog->pp_widgets[i]->val.f_float)];
+            if( [o_prog_bar doubleValue] == 100.0 )
+            {
+                /* we are done, let's hide */
+                [self hideDialog];
+                return;
+            }
+            [o_prog_description setStringValue: [NSString stringWithUTF8String:\
+                p_dialog->pp_widgets[i]->val.psz_string]];
+        }
+    }
 }
 
 -(void)hideDialog
 {
     msg_Dbg( p_intf, "hide event" );
+    if( p_dialog->i_type & WIDGET_PROGRESS )
+    {
+        [NSApp endSheet: o_prog_win];
+        [o_prog_win close];
+    }
 }
 
 -(void)destroyDialog
@@ -208,9 +252,14 @@
     msg_Dbg( p_intf, "destroy event" );
 }
 
--(void)dealloc
+- (IBAction)cancelAndClose:(id)sender
 {
-    [super dealloc];
+    /* tell the core that the dialog was cancelled */
+    vlc_mutex_lock( &p_dialog->p_interaction->object_lock );
+    p_dialog->i_return = DIALOG_CANCELLED;
+    p_dialog->i_status = ANSWERED_DIALOG;
+    vlc_mutex_unlock( &p_dialog->p_interaction->object_lock );
+    msg_Dbg( p_intf, "dialog cancelled" );
 }
 
-@end
\ No newline at end of file
+@end