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

diff --git a/extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib
index 60c4a677243f85b12b46840ea5cbca9263cf407f..caa145399be68f2f553bde81854ff67da0ca2ac9 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib and b/extras/MacOSX/Resources/English.lproj/Interaction.nib/keyedobjects.nib differ

diff --git a/modules/gui/macosx/interaction.h b/modules/gui/macosx/interaction.h
index 3cf6561c26824f98692c0cc79ba0e69b590491c5..018af7330a7a14292c961bec3d43be7364665a1f 100644 (file)
--- a/modules/gui/macosx/interaction.h
+++ b/modules/gui/macosx/interaction.h
@@ -2,7 +2,7 @@
  * interaction.h: Mac OS X interaction dialogs
  *****************************************************************************
  * Copyright (C) 2005-2006 the VideoLAN team
- * $Id:$
+ * $Id$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan dot org>
  *          Felix Kühne <fkuehne at videolan dot org>

diff --git a/modules/gui/macosx/interaction.m b/modules/gui/macosx/interaction.m
index 19b44b3699e60e8667dadbe279be0a95a241f5e1..94387f0014be3734a0054996ce9bdc44e0cb38d5 100644 (file)
--- a/modules/gui/macosx/interaction.m
+++ b/modules/gui/macosx/interaction.m
@@ -2,7 +2,7 @@
  * interaction.h: Mac OS X interaction dialogs
  *****************************************************************************
  * Copyright (C) 2005-2006 the VideoLAN team
- * $Id $
+ * $Id:$
  *
  * Authors: Derk-Jan Hartman <hartman at videolan dot org>
  *          Felix Kühne <fkuehne at videolan dot org>
@@ -116,7 +116,11 @@
         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 : ""];
@@ -161,26 +165,26 @@
         }
         if( p_dialog->i_flags & DIALOG_OK_CANCEL )
         {
+            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 )
         {
+            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 setUsesThreadedAnimation: YES];
             [o_prog_bar setDoubleValue: 0];
             [NSApp beginSheet: o_prog_win modalForWindow: o_window \
-                modalDelegate: self didEndSelector: \
-                nil \
-                contextInfo: nil];
+                modalDelegate: self didEndSelector: nil contextInfo: nil];
             [o_prog_win makeKeyWindow];
         }
         else
@@ -217,11 +221,19 @@
     int i = 0;
     for( i = 0 ; i< p_dialog->i_widgets; i++ )
     {
-        /*msg_Dbg( p_intf, "update event, current value %i for index %i",
-        (int)(p_dialog->pp_widgets[i]->val.f_float), 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]];
+        }
     }
 }