ASF: help stupid compiler

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

diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index dc0ef540d7745ef432cf48cc9c48c0384e37c34a..e02ae55c97119f71ab1c7d7db43093ded61542fe 100644 (file)
--- a/modules/gui/macosx/about.m
+++ b/modules/gui/macosx/about.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * about.m: MacOS X About Panel
  *****************************************************************************
- * Copyright (C) 2001-2007 the VideoLAN team
+ * Copyright (C) 2001-2011 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -29,6 +29,7 @@
 #import "about.h"
 #import <vlc_intf_strings.h>
 #import <vlc_about.h>
+#import "CompatibilityFixes.h"
 
 #ifdef __x86_64__
 #define PLATFORM "Intel 64bit"
@@ -61,6 +62,18 @@ static VLAboutBox *_o_sharedInstance = nil;
     return _o_sharedInstance;
 }
 
+- (void) dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver: self];
+    [super dealloc];
+}
+
+- (void)awakeFromNib
+{
+    if (OSX_LION)
+        [o_about_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary];
+}
+
 /*****************************************************************************
 * VLC About Window
 *****************************************************************************/
@@ -74,7 +87,7 @@ static VLAboutBox *_o_sharedInstance = nil;
                                                  selector: @selector(VLCWillTerminate)
                                                      name: NSApplicationWillTerminateNotification
                                                    object: nil];
-        
+
         /* Get the localized info dictionary (InfoPlist.strings) */
         NSDictionary *o_local_dict;
         o_local_dict = [[NSBundle mainBundle] localizedInfoDictionary];
@@ -86,18 +99,35 @@ static VLAboutBox *_o_sharedInstance = nil;
         [o_about_window setTitle: _NS("About VLC media player")];
 
         /* setup the creator / revision field */
-        [o_revision_field setStringValue: 
-            [NSString stringWithFormat: _NS("Compiled by %s"), VLC_CompileBy()]];
- 
+        NSString *compiler;
+#ifdef __clang__
+        compiler = [NSString stringWithFormat:@"clang %s", __clang_version__];
+#elif __llvm__
+        compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__];
+#else
+        compiler = [NSString stringWithFormat:@"gcc %s", __VERSION__];
+#endif
+        [o_revision_field setStringValue: [NSString stringWithFormat: _NS("Compiled by %@ with %@"), [NSString stringWithUTF8String:VLC_CompileBy()], compiler]];
+
         /* Setup the nameversion field */
-        [o_name_version_field setStringValue: [NSString stringWithFormat:@"Version %s (%s)", VLC_Version(), PLATFORM]];
+        [o_name_version_field setStringValue: [NSString stringWithFormat:@"Version %s (%s)", VERSION_MESSAGE, PLATFORM]];
+        
+        NSMutableArray *tmpArray = [NSMutableArray arrayWithArray: [[NSString stringWithUTF8String: psz_authors]componentsSeparatedByString:@"\n\n"]];
+        NSUInteger count = [tmpArray count];
+        for( NSUInteger i = 0; i < count; i++ )
+        {
+            [tmpArray replaceObjectAtIndex:i withObject:[[tmpArray objectAtIndex:i]stringByReplacingOccurrencesOfString:@"\n" withString:@", "]];
+            [tmpArray replaceObjectAtIndex:i withObject:[[tmpArray objectAtIndex:i]stringByReplacingOccurrencesOfString:@", -" withString:@"\n-" options:0 range:NSRangeFromString(@"0 30")]];
+            [tmpArray replaceObjectAtIndex:i withObject:[[tmpArray objectAtIndex:i]stringByReplacingOccurrencesOfString:@"-, " withString:@"-\n" options:0 range:NSRangeFromString(@"0 30")]];
+            [tmpArray replaceObjectAtIndex:i withObject:[[tmpArray objectAtIndex:i]stringByTrimmingCharactersInSet:[NSCharacterSet characterSetWithCharactersInString:@","]]];
+        }
+        NSString *authors = [tmpArray componentsJoinedByString:@"\n\n"];
 
         /* setup the authors and thanks field */
-        [o_credits_textview setString: [NSString stringWithFormat: @"%@\n\n\n\n%@\n%@\n\n%@", 
-                                            _NS(INTF_ABOUT_MSG), 
-                                            _NS("VLC was brought to you by:"),
-                                            [NSString stringWithUTF8String: psz_authors], 
-                                            [NSString stringWithUTF8String: psz_thanks]]];
+        [o_credits_textview setString: [NSString stringWithFormat: @"%@\n\n\n\n\n\n%@\n\n%@\n\n", 
+                                        [_NS(INTF_ABOUT_MSG) stringByReplacingOccurrencesOfString:@"\n" withString:@" "],
+                                        authors,
+                                        [[NSString stringWithUTF8String: psz_thanks] stringByReplacingOccurrencesOfString:@"\n" withString:@" " options:0 range:NSRangeFromString(@"680 2")]]];
 
         /* Setup the window */
         [o_credits_textview setDrawsBackground: NO];
@@ -106,12 +136,13 @@ static VLAboutBox *_o_sharedInstance = nil;
         [o_about_window setMenu:nil];
         [o_about_window center];
         [o_gpl_btn setTitle: _NS("License")];
-        
+
         b_isSetUp = YES;
     }
- 
+
     /* Show the window */
     b_restart = YES;
+    [o_credits_textview scrollPoint:NSMakePoint( 0, 0 )];
     [o_about_window makeKeyAndOrderFront: nil];
 }
 
@@ -134,7 +165,7 @@ static VLAboutBox *_o_sharedInstance = nil;
     if( b_restart )
     {
         /* Reset the starttime */
-        i_start = [NSDate timeIntervalSinceReferenceDate] + 3.0;
+        i_start = [NSDate timeIntervalSinceReferenceDate] + 4.0;
         f_current = 0;
         f_end = [o_credits_textview bounds].size.height - [o_credits_scrollview bounds].size.height;
         b_restart = NO;
@@ -142,16 +173,23 @@ static VLAboutBox *_o_sharedInstance = nil;
 
     if( [NSDate timeIntervalSinceReferenceDate] >= i_start )
     {
-        /* Scroll to the position */
-        [o_credits_textview scrollPoint:NSMakePoint( 0, f_current )];
- 
         /* Increment the scroll position */
         f_current += 0.005;
- 
+
+        /* Scroll to the position */
+        [o_credits_textview scrollPoint:NSMakePoint( 0, f_current )];
+
         /* If at end, restart at the top */
         if( f_current >= f_end )
         {
-            b_restart = YES;
+            /* f_end may be wrong on first run, so don't trust it too much */
+            if( f_end == [o_credits_textview bounds].size.height - [o_credits_scrollview bounds].size.height ) 
+            {
+                b_restart = YES;
+                [o_credits_textview scrollPoint:NSMakePoint( 0, 0 )];
+            }
+            else
+                f_end = [o_credits_textview bounds].size.height - [o_credits_scrollview bounds].size.height;
         }
     }
 }