Commit fe0ec6a1 authored by Felix Paul Kühne's avatar Felix Paul Kühne

macosx/about: fix layout issue and simply code (close #10746)

parent 39d0b322
/***************************************************************************** /*****************************************************************************
* about.m: MacOS X About Panel * about.m: MacOS X About Panel
***************************************************************************** *****************************************************************************
* Copyright (C) 2001-2013 VLC authors and VideoLAN * Copyright (C) 2001-2014 VLC authors and VideoLAN
* $Id$ * $Id$
* *
* Authors: Derk-Jan Hartman <thedj@users.sourceforge.net> * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
...@@ -31,13 +31,9 @@ ...@@ -31,13 +31,9 @@
#import <vlc_about.h> #import <vlc_about.h>
#import "CompatibilityFixes.h" #import "CompatibilityFixes.h"
#ifdef __x86_64__ /* this is a bit weird, but we should be confident that there will be more than
* one arch to support again one day */
#define PLATFORM "Intel 64bit" #define PLATFORM "Intel 64bit"
#elif __i386__
#define PLATFORM "Intel 32bit"
#else
#define PLATFORM "PowerPC 32bit"
#endif
/***************************************************************************** /*****************************************************************************
* VLAboutBox implementation * VLAboutBox implementation
...@@ -107,10 +103,8 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -107,10 +103,8 @@ static VLAboutBox *_o_sharedInstance = nil;
NSString *compiler; NSString *compiler;
#ifdef __clang__ #ifdef __clang__
compiler = [NSString stringWithFormat:@"clang %s", __clang_version__]; compiler = [NSString stringWithFormat:@"clang %s", __clang_version__];
#elif __llvm__
compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__];
#else #else
compiler = [NSString stringWithFormat:@"gcc %s", __VERSION__]; compiler = [NSString stringWithFormat:@"llvm-gcc %s", __VERSION__];
#endif #endif
[o_revision_field setStringValue: [NSString stringWithFormat: _NS("Compiled by %s with %@"), VLC_CompileBy(), compiler]]; [o_revision_field setStringValue: [NSString stringWithFormat: _NS("Compiled by %s with %@"), VLC_CompileBy(), compiler]];
...@@ -254,14 +248,7 @@ static VLAboutBox *_o_sharedInstance = nil; ...@@ -254,14 +248,7 @@ static VLAboutBox *_o_sharedInstance = nil;
- (void)showGPL - (void)showGPL
{ {
[self showAbout]; [self showAbout];
[o_credits_scrollview setHidden:NO]; [self buttonAction:nil];
[o_credits_textview setHidden:NO];
[o_joinus_txt setHidden:YES];
[o_credits_textview setString:[NSString stringWithUTF8String:psz_license]];
[o_credits_textview scrollPoint:NSMakePoint(0, 0)];
b_restart = YES;
} }
/***************************************************************************** /*****************************************************************************
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment