diff --git a/extras/package/macosx/Resources/English.lproj/About.xib b/extras/package/macosx/Resources/English.lproj/About.xib index e0c2154d0d39be371fec29754a732a919bb41d45..64eb1efc15b48973c2bf67fb566a60d8cc1bee72 100644 --- a/extras/package/macosx/Resources/English.lproj/About.xib +++ b/extras/package/macosx/Resources/English.lproj/About.xib @@ -2,10 +2,10 @@ 1050 - 11E53 + 12D78 851 - 1138.47 - 569.00 + 1187.37 + 626.00 YES @@ -21,9 +21,8 @@ YES - - + YES @@ -48,7 +47,7 @@ 7 2 - {{173, 155}, {600, 275}} + {{173, 99}, {721, 331}} 1886912512 About VLC media player NSWindow @@ -63,38 +62,6 @@ 256 YES - - - 256 - - YES - - YES - Apple PDF pasteboard type - Apple PICT pasteboard type - Apple PNG pasteboard type - NSFilenamesPboardType - NeXT Encapsulated PostScript v1.2 pasteboard type - NeXT TIFF v4.0 pasteboard type - - - {{33, 70}, {153, 172}} - - YES - - 130560 - 33554432 - - NSImage - vlc - - 2 - 2 - 0 - NO - - YES - 256 @@ -125,7 +92,7 @@ NeXT TIFF v4.0 pasteboard type - {356, 85} + {415, 204} @@ -143,7 +110,7 @@ - 356 + 415 1 @@ -163,7 +130,7 @@ YES - + 6 System selectedTextBackgroundColor @@ -172,7 +139,7 @@ MC42NjY2NjY2NjY3AA - + 6 System selectedTextColor @@ -194,7 +161,7 @@ YES - + 1 MCAwIDEAA @@ -211,16 +178,17 @@ 6 {564, 10000000} + {430, 204} - {371, 125} + {430, 204} - {1, -1} + {5, 5} 0 4 @@ -230,6 +198,7 @@ -2147483392 {{-100, -100}, {15, 99}} + NO _doScroller: 1 @@ -239,6 +208,7 @@ -2147483392 {{-100, -100}, {87, 18}} + NO 1 _doScroller: @@ -246,23 +216,59 @@ 0.94565220000000005 - {{209, 20}, {371, 125}} + {{271, 63}, {430, 204}} 133120 + 0.25 + 4 + 1 + + + + 256 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{20, 62}, {246, 246}} + + YES + + 0 + 33554432 + + NSImage + vlc + + 0 + 3 + 0 + NO + + NO + YES 256 - {{209, 197}, {371, 18}} + {{271, 249}, {430, 18}} YES - -2077098431 - 138413056 + -2077228991 + 4195328 Version 0.9.0-svn Grischenko (PPC/x86) LucidaGrande-Bold @@ -274,7 +280,7 @@ 6 System textBackgroundColor - + 3 MQA @@ -284,16 +290,17 @@ MC4xNTcwMjQ5OSAwLjE1NzAyNDk5IDAuMTU3MDI0OTkAA + NO 256 - {{209, 178}, {371, 16}} + {{271, 230}, {430, 16}} YES - -2077098431 - 138413056 + -2077228991 + 4195328 Copyright (c) 1997-2008 the VideoLAN team LucidaGrande @@ -307,16 +314,17 @@ MC4xNTcwMjQ5OSAwLjE1NzAyNDk5IDAuMTU3MDI0OTkAA + NO 256 - {{209, 151}, {371, 26}} + {{271, 203}, {430, 26}} YES - -2078147071 - 138412032 + -2078277631 + 4194304 Compiled by fpk with llvm-gcc 4.2.1 (Based on Apple Inc. build 5658) (LLVM build 2335.11.00) @@ -326,16 +334,17 @@ MC4xNTcwMjQ5OSAwLjE1NzAyNDk5IDAuMTU3MDI0OTkAA + NO 256 - {{209, 223}, {371, 29}} + {{271, 279}, {479, 29}} YES - 69336577 - 138412032 + 69206017 + 4194304 VLC media player LucidaGrande @@ -343,49 +352,124 @@ 16 - + 6 System controlColor - + 6 System controlTextColor + NO - + - 256 - {{51, 12}, {103, 32}} + 268 + {{271, 63}, {430, 131}} + _NS:3939 YES - - 67239424 + + 67108864 + 1346371584 + VkxDIG1lZGlhIHBsYXllciBpcyBhIGZyZWUgYW5kIG9wZW4gc291cmNlIG1lZGlhIHBsYXllciwgZW5j +b2RlciBhbmQgc3RyZWFtZXIgbWFkZSBieSB0aGUgdm9sdW50ZWVycyBvZiB0aGUgVmlkZW9MQU4gY29t +bXVuaXR5LgpWTEMgdXNlcyBpdHMgaW50ZXJuYWwgY29kZWNzIGFuZCB3b3JrcyBvbiBlc3NlbnRpYWxs +eSBldmVyeSBwb3B1bGFyIHBsYXRmb3JtIGFuZCBjYW4gcmVhZCBhbG1vc3QgZXZlcnkgZmlsZXMsIENE +cywgRFZEcywgbmV0d29yayBzdHJlYW1zLCBjYXB0dXJlIGNhcmRzIGFuZCBvdGhlciBtZWRpYSBmb3Jt +YXRzIQpIZWxwIGFuZCBqb2luIHVzIS4 + + LucidaGrande + 13 + 16 + + _NS:3939 + + + + + NO + + + + 268 + {{90, 19}, {106, 23}} + + _NS:2498 + YES + + -2080374784 134217728 - Licence + Authors LucidaGrande 13 1040 - - -2038284033 - 1 - + _NS:2498 + + -2033434624 + 162 - - - - 200 - 25 + + 400 + 75 + NO + + + + 268 + {{307, 19}, {106, 23}} + + _NS:2498 + YES + + -2080374784 + 134217728 + License + + _NS:2498 + + -2033434624 + 162 + + + 400 + 75 + + NO + + + + 268 + {{524, 19}, {106, 23}} + + _NS:2498 + YES + + -2080374784 + 134217728 + Credits + + _NS:2498 + + -2033434624 + 162 + + + 400 + 75 + + NO - {600, 275} + {721, 331} {{0, 0}, {1280, 778}} @@ -472,7 +556,7 @@ YES - 67239424 + 67108864 134217728 @@ -481,7 +565,7 @@ 16 - -2038284033 + -2038284288 35 LucidaGrande @@ -495,6 +579,7 @@ 200 25 + NO @@ -503,7 +588,7 @@ YES - 67239424 + 67108864 134217728 @@ -512,7 +597,7 @@ 16 - -2038284033 + -2038284288 35 LucidaGrande @@ -526,6 +611,7 @@ 200 25 + NO @@ -534,12 +620,12 @@ YES - 67239424 + 67108864 134217728 - -2038284033 + -2038284288 35 @@ -549,6 +635,7 @@ 200 25 + NO {480, 400} @@ -560,152 +647,6 @@ help YES - - 15 - 2 - {{356, 183}, {480, 360}} - 1886912512 - Licence - - NSWindow - - - View - - - {1.7976931348623157e+308, 1.7976931348623157e+308} - {480, 360} - - - 256 - - YES - - - 274 - - YES - - - 2304 - - YES - - - 2322 - {478, 14} - - - - - - - - - - - YES - - - 6 - - - - 478 - 1 - - - 100674401 - 0 - - - - YES - - YES - NSBackgroundColor - NSColor - - - YES - - - - - - - YES - - YES - NSColor - NSUnderline - - - YES - - - - - - - 1 - - 6 - {478, 10000000} - {114, 0} - - - - {{1, 1}, {478, 358}} - - - - - - {4, -5} - 1 - - 4 - - - - -2147483392 - {{-30, 1}, {15, 344}} - - - _doScroller: - 1 - - - - -2147483392 - {{-100, -100}, {87, 18}} - - 1 - - _doScroller: - 1 - 0.94565220000000005 - - - {480, 360} - - - 133650 - - - - - - {480, 360} - - - {{0, 0}, {1280, 778}} - {480, 382} - {1.7976931348623157e+308, 1.7976931348623157e+308} - gpl - YES - @@ -782,30 +723,6 @@ 2243 - - - o_gpl_btn - - - - 2248 - - - - showGPL: - - - - 2249 - - - - o_gpl_window - - - - 2250 - o_name_field @@ -814,14 +731,6 @@ 2252 - - - o_gpl_field - - - - 2255 - o_help_home_btn @@ -878,6 +787,70 @@ 2267 + + + o_authors_btn + + + + 2292 + + + + o_gpl_btn + + + + 2293 + + + + o_credits_btn + + + + 2294 + + + + buttonAction: + + + + 2295 + + + + buttonAction: + + + + 2296 + + + + buttonAction: + + + + 2297 + + + + o_joinus_txt + + + + 2299 + + + + o_icon_view + + + + 2300 + @@ -917,13 +890,16 @@ YES + + - - - + + + + @@ -979,15 +955,6 @@ - - 2244 - - - YES - - - - 1349 @@ -1048,41 +1015,6 @@ - - 2245 - - - YES - - - - Licence - - - 2246 - - - YES - - - - - - 2253 - - - YES - - - - - - - - 2254 - - - 2270 @@ -1103,11 +1035,6 @@ - - 2274 - - - 2275 @@ -1133,16 +1060,6 @@ - - 2280 - - - - - 2281 - - - -3 @@ -1163,6 +1080,62 @@ + + 2284 + + + YES + + + + + + 2285 + + + + + 2286 + + + YES + + + + + + 2287 + + + + + 2288 + + + YES + + + + + + 2289 + + + + + 2290 + + + YES + + + + + + 2291 + + + @@ -1181,18 +1154,23 @@ 1345.windowTemplate.hasMinSize 1345.windowTemplate.minSize 1348.IBPluginDependency + 1348.IBViewBoundsToFrameTransform 1348.ImportedFromIB2 1349.ImportedFromIB2 2231.IBPluginDependency + 2231.IBViewBoundsToFrameTransform 2231.ImportedFromIB2 2232.IBPluginDependency + 2232.IBViewBoundsToFrameTransform 2232.ImportedFromIB2 2233.IBPluginDependency + 2233.IBViewBoundsToFrameTransform 2233.ImportedFromIB2 2234.IBPluginDependency 2234.IBViewBoundsToFrameTransform 2234.ImportedFromIB2 2235.IBPluginDependency + 2235.IBViewBoundsToFrameTransform 2235.ImportedFromIB2 2239.IBEditorWindowLastContentRect 2239.IBPluginDependency @@ -1204,21 +1182,6 @@ 2240.ImportedFromIB2 2241.IBPluginDependency 2241.ImportedFromIB2 - 2244.IBPluginDependency - 2244.IBViewBoundsToFrameTransform - 2244.ImportedFromIB2 - 2245.IBEditorWindowLastContentRect - 2245.IBPluginDependency - 2245.IBWindowTemplateEditedContentRect - 2245.ImportedFromIB2 - 2245.windowTemplate.hasMinSize - 2245.windowTemplate.minSize - 2246.IBPluginDependency - 2246.ImportedFromIB2 - 2253.IBPluginDependency - 2253.ImportedFromIB2 - 2254.IBPluginDependency - 2254.ImportedFromIB2 2256.IBPluginDependency 2256.ImportedFromIB2 2257.IBPluginDependency @@ -1230,7 +1193,6 @@ 2271.IBPluginDependency 2272.IBPluginDependency 2273.IBPluginDependency - 2274.IBPluginDependency 2275.IBPluginDependency 2276.IBPluginDependency 2277.IBPluginDependency @@ -1238,10 +1200,18 @@ 2278.IBShouldRemoveOnLegacySave 2279.IBPluginDependency 2279.IBShouldRemoveOnLegacySave - 2280.IBPluginDependency - 2280.IBShouldRemoveOnLegacySave - 2281.IBPluginDependency - 2281.IBShouldRemoveOnLegacySave + 2284.IBPluginDependency + 2284.IBViewBoundsToFrameTransform + 2285.IBPluginDependency + 2286.IBPluginDependency + 2286.IBViewBoundsToFrameTransform + 2287.IBPluginDependency + 2288.IBPluginDependency + 2288.IBViewBoundsToFrameTransform + 2289.IBPluginDependency + 2290.IBPluginDependency + 2290.IBViewBoundsToFrameTransform + 2291.IBPluginDependency YES @@ -1250,27 +1220,42 @@ com.apple.InterfaceBuilder.CocoaPlugin - {{332, 392}, {600, 275}} + {{815, 967}, {721, 331}} com.apple.InterfaceBuilder.CocoaPlugin - {{332, 392}, {600, 275}} + {{815, 967}, {721, 331}} {231.86799999999999, 107} com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDUQAAw5mAAA + com.apple.InterfaceBuilder.CocoaPlugin + + AUI0AABDHQAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDUQAAw7yAAA + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDgYAAw7IAAA + com.apple.InterfaceBuilder.CocoaPlugin - P4AAAL+AAABDUQAAwy8AAA + P4AAAL+AAABDdwAAw6mAAA com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDXQAAw88AAA + {{452, 244}, {480, 400}} com.apple.InterfaceBuilder.CocoaPlugin @@ -1283,45 +1268,43 @@ com.apple.WebKitIBPlugin com.apple.InterfaceBuilder.CocoaPlugin - - P4AAAL+AAABCigAAwigAAA - - {{452, 316}, {480, 360}} com.apple.InterfaceBuilder.CocoaPlugin - {{452, 316}, {480, 360}} - - {480, 360} com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABDh4AAw0QAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin + + P4AAAL+AAABCggAAwiAAAA + com.apple.InterfaceBuilder.CocoaPlugin com.apple.InterfaceBuilder.CocoaPlugin - + + P4AAAL+AAABDpgAAwiAAAA + com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - + + P4AAAL+AAABECUAAwiAAAA + com.apple.InterfaceBuilder.CocoaPlugin - @@ -1340,7 +1323,7 @@ - 2283 + 2300 @@ -1353,6 +1336,25 @@ + + VLAboutBox + NSObject + + IBUserSource + + + + + VLCApplication + NSApplication + + IBUserSource + + + + + + YES VLAboutBox NSObject @@ -1360,8 +1362,8 @@ YES YES + buttonAction: helpGoHome: - showGPL: YES @@ -1373,17 +1375,17 @@ YES YES + buttonAction: helpGoHome: - showGPL: YES - helpGoHome: + buttonAction: id - showGPL: + helpGoHome: id @@ -1393,17 +1395,20 @@ YES o_about_window + o_authors_btn + o_color_backdrop o_copyright_field + o_credits_btn o_credits_scrollview o_credits_textview o_gpl_btn - o_gpl_field - o_gpl_window o_help_bwd_btn o_help_fwd_btn o_help_home_btn o_help_web_view o_help_window + o_icon_view + o_joinus_txt o_name_field o_name_version_field o_revision_field @@ -1421,6 +1426,9 @@ id id id + WebView + id + id id id id @@ -1432,17 +1440,20 @@ YES o_about_window + o_authors_btn + o_color_backdrop o_copyright_field + o_credits_btn o_credits_scrollview o_credits_textview o_gpl_btn - o_gpl_field - o_gpl_window o_help_bwd_btn o_help_fwd_btn o_help_home_btn o_help_web_view o_help_window + o_icon_view + o_joinus_txt o_name_field o_name_version_field o_revision_field @@ -1454,27 +1465,31 @@ id - o_copyright_field + o_authors_btn id - o_credits_scrollview + o_color_backdrop id - o_credits_textview + o_copyright_field id - o_gpl_btn + o_credits_btn + id + + + o_credits_scrollview id - o_gpl_field + o_credits_textview id - o_gpl_window + o_gpl_btn id @@ -1491,12 +1506,20 @@ o_help_web_view - id + WebView o_help_window id + + o_icon_view + id + + + o_joinus_txt + id + o_name_field id @@ -1512,16 +1535,8 @@ - IBUserSource - - - - - VLCApplication - NSApplication - - IBUserSource - + IBDocumentRelativeSource + ../../../../../modules/gui/macosx/about.h diff --git a/modules/gui/macosx/MainMenu.m b/modules/gui/macosx/MainMenu.m index 91bc9596d5f044ca663096348d294fcd3f7e22e8..32afe6b5fb43ce825af354d89ecf49f652e2dc90 100644 --- a/modules/gui/macosx/MainMenu.m +++ b/modules/gui/macosx/MainMenu.m @@ -1046,7 +1046,7 @@ static VLCMainMenu *_o_sharedInstance = nil; - (IBAction)showLicense:(id)sender { [self initAbout]; - [o_about showGPL: sender]; + [o_about showGPL]; } - (IBAction)viewHelp:(id)sender diff --git a/modules/gui/macosx/about.h b/modules/gui/macosx/about.h index d96efb07e7f875b5c4b43b3666f53b4598850c62..1889cb5e40a11e64d863928bb33c27867ea1f999 100644 --- a/modules/gui/macosx/about.h +++ b/modules/gui/macosx/about.h @@ -1,7 +1,7 @@ /***************************************************************************** * about.h: MacOS X About Panel ***************************************************************************** - * Copyright (C) 2001-2012 VLC authors and VideoLAN + * Copyright (C) 2001-2013 VLC authors and VideoLAN * $Id$ * * Authors: Derk-Jan Hartman @@ -37,8 +37,11 @@ IBOutlet id o_credits_textview; IBOutlet id o_credits_scrollview; IBOutlet id o_gpl_btn; + IBOutlet id o_credits_btn; + IBOutlet id o_authors_btn; IBOutlet id o_name_field; - id o_color_backdrop; + IBOutlet id o_icon_view; + IBOutlet id o_joinus_txt; NSTimer *o_scroll_timer; float f_current; @@ -47,26 +50,21 @@ BOOL b_restart; BOOL b_isSetUp; + NSString *o_authors; + /* generic help window */ IBOutlet id o_help_window; IBOutlet WebView *o_help_web_view; //we may _not_ use id here because of method name collisions IBOutlet id o_help_bwd_btn; IBOutlet id o_help_fwd_btn; IBOutlet id o_help_home_btn; - - /* licence window */ - IBOutlet id o_gpl_window; - IBOutlet id o_gpl_field; } + (VLAboutBox *)sharedInstance; - (void)showAbout; - (void)showHelp; -- (IBAction)showGPL:(id)sender; +- (void)showGPL; +- (IBAction)buttonAction:(id)sender; - (IBAction)helpGoHome:(id)sender; @end - -@interface VLAboutColoredBackdrop : NSView - -@end diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m index 3229dbfa56e5b6176848038484d165b81eaa9ca2..677170868f3259cb42f18b576dcfce159af9b3af 100644 --- 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-2012 VLC authors and VideoLAN + * Copyright (C) 2001-2013 VLC authors and VideoLAN * $Id$ * * Authors: Derk-Jan Hartman @@ -63,8 +63,8 @@ static VLAboutBox *_o_sharedInstance = nil; - (void) dealloc { + [o_authors release]; [[NSNotificationCenter defaultCenter] removeObserver: self]; - [o_color_backdrop release]; [super dealloc]; } @@ -72,10 +72,6 @@ static VLAboutBox *_o_sharedInstance = nil; { if (!OSX_SNOW_LEOPARD) [o_about_window setCollectionBehavior: NSWindowCollectionBehaviorFullScreenAuxiliary]; - - /* add a colored backdrop to get a white window background */ - o_color_backdrop = [[VLAboutColoredBackdrop alloc] initWithFrame: [[o_about_window contentView] frame]]; - [[o_about_window contentView] addSubview: o_color_backdrop positioned: NSWindowBelow relativeTo: nil]; } /***************************************************************************** @@ -104,7 +100,7 @@ static VLAboutBox *_o_sharedInstance = nil; #else compiler = [NSString stringWithFormat:@"gcc %s", __VERSION__]; #endif - [o_revision_field setStringValue: [NSString stringWithFormat: _NS("Compiled by %@ with %@"), [NSString stringWithUTF8String:VLC_CompileBy()], compiler]]; + [o_revision_field setStringValue: [NSString stringWithFormat: _NS("Compiled by %s with %@"), VLC_CompileBy(), compiler]]; /* Setup the nameversion field */ [o_name_version_field setStringValue: [NSString stringWithFormat:@"Version %s (%s)", VERSION_MESSAGE, PLATFORM]]; @@ -117,13 +113,23 @@ static VLAboutBox *_o_sharedInstance = nil; [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\n%@\n\n", - [_NS(INTF_ABOUT_MSG) stringByReplacingOccurrencesOfString:@"\n" withString:@" "], - authors, - [[NSString stringWithUTF8String: psz_thanks] stringByReplacingOccurrencesOfString:@"\n" withString:@" " options:0 range:NSRangeFromString(@"680 2")]]]; + o_authors = [tmpArray componentsJoinedByString:@"\n\n"]; + [o_authors retain]; + + /* setup join us! */ + NSString *joinus = [NSString stringWithString:_NS("

VLC media player is a free and open source media player, encoder and streamer made by the volunteers of the " + "VideoLAN" + " community.

VLC uses its internal codecs and works on essentially every popular platform and can read" + "almost every files, CDs, DVDs, network streams, capture cards and other media formats!

" + "Help " + "and join us!")]; + NSAttributedString *joinus_readytorender = [[NSAttributedString alloc] initWithHTML:[joinus dataUsingEncoding:NSUTF8StringEncoding allowLossyConversion:YES] documentAttributes:NULL]; + [o_joinus_txt setAllowsEditingTextAttributes: YES]; + [o_joinus_txt setSelectable: YES]; + [o_joinus_txt setAttributedStringValue:joinus_readytorender]; + + [joinus_readytorender release]; + [o_credits_textview setString: @""]; /* Setup the window */ [o_credits_textview setDrawsBackground: NO]; @@ -133,11 +139,31 @@ static VLAboutBox *_o_sharedInstance = nil; [o_about_window center]; [o_gpl_btn setTitle: _NS("License")]; + if (config_GetInt(VLCIntf, "macosx-icon-change")) { + /* After day 354 of the year, the usual VLC cone is replaced by another cone + * wearing a Father Xmas hat. + * Note: this icon doesn't represent an endorsement of The Coca-Cola Company. + */ + NSCalendar *gregorian = + [[NSCalendar alloc] initWithCalendarIdentifier:NSGregorianCalendar]; + NSUInteger dayOfYear = [gregorian ordinalityOfUnit:NSDayCalendarUnit inUnit:NSYearCalendarUnit forDate:[NSDate date]]; + [gregorian release]; + + if (dayOfYear >= 354) + [o_icon_view setImage: [NSImage imageNamed:@"vlc-xmas"]]; + } + b_isSetUp = YES; } /* Show the window */ b_restart = YES; + [o_credits_scrollview setHidden:YES]; + [o_credits_textview setHidden:YES]; + [o_joinus_txt setHidden:NO]; + [o_copyright_field setHidden:NO]; + [o_revision_field setHidden:NO]; + [o_name_version_field setHidden:NO]; [o_credits_textview scrollPoint:NSMakePoint(0, 0)]; [o_about_window makeKeyAndOrderFront: nil]; } @@ -177,6 +203,7 @@ static VLAboutBox *_o_sharedInstance = nil; if (f_current >= f_end) { /* 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) { + sleep(2); b_restart = YES; [o_credits_textview scrollPoint:NSMakePoint(0, 0)]; } else @@ -185,17 +212,41 @@ static VLAboutBox *_o_sharedInstance = nil; } } +- (IBAction)buttonAction:(id)sender +{ + [o_credits_scrollview setHidden:NO]; + [o_credits_textview setHidden:NO]; + [o_joinus_txt setHidden:YES]; + [o_copyright_field setHidden:YES]; + [o_revision_field setHidden:YES]; + [o_name_version_field setHidden:YES]; + + if (sender == o_authors_btn) + [o_credits_textview setString:o_authors]; + else if (sender == o_credits_btn) + [o_credits_textview setString:[[NSString stringWithUTF8String: psz_thanks] stringByReplacingOccurrencesOfString:@"\n" withString:@" " options:0 range:NSRangeFromString(@"680 2")]]; + else + [o_credits_textview setString:[NSString stringWithUTF8String: psz_license]]; + + [o_credits_textview scrollPoint:NSMakePoint(0, 0)]; + b_restart = YES; +} + /***************************************************************************** * VLC GPL Window, action called from the about window and the help menu *****************************************************************************/ -- (IBAction)showGPL:(id)sender +- (void)showGPL { - [o_gpl_window setTitle: _NS("License")]; - [o_gpl_field setString: [NSString stringWithUTF8String: psz_license]]; + [self showAbout]; + [o_credits_scrollview setHidden:NO]; + [o_credits_textview setHidden:NO]; + [o_joinus_txt setHidden:YES]; + + [o_credits_textview setString:[NSString stringWithUTF8String: psz_license]]; - [o_gpl_window center]; - [o_gpl_window makeKeyAndOrderFront: sender]; + [o_credits_textview scrollPoint:NSMakePoint(0, 0)]; + b_restart = YES; } /***************************************************************************** @@ -229,12 +280,3 @@ static VLAboutBox *_o_sharedInstance = nil; } @end - -@implementation VLAboutColoredBackdrop - -- (void)drawRect:(NSRect)rect { - [[NSColor whiteColor] setFill]; - NSRectFill(rect); -} - -@end