* Patch from Basil Achermann to handle esc and space keyboard events in VLCControl...

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

diff --git a/modules/gui/macosx/about.m b/modules/gui/macosx/about.m
index 7dc1890d9584f44d7e81c4b39c7f07e40b2f9aee..a86a0aea612b0da8e64cb39ad334c2044d98e4f9 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-2005 VideoLAN
+ * Copyright (C) 2001-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Derk-Jan Hartman <thedj@users.sourceforge.net>
@@ -18,7 +18,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -57,9 +57,6 @@ static VLAboutBox *_o_sharedInstance = nil;
         NSString *o_name;
         NSString *o_version;
         NSString *o_thanks_path;
-        
-               /* Load the needed nib-file */
-               [NSBundle loadNibNamed:@"About" owner:self];
                
         /* Get the info dictionary (Info.plist) */
         o_info_dict = [[NSBundle mainBundle] infoDictionary];
@@ -77,14 +74,23 @@ static VLAboutBox *_o_sharedInstance = nil;
         
         /* Setup the version field */
         o_version = [o_info_dict objectForKey:@"CFBundleVersion"];
+        
+        /* setup the creator / revision field */
+        if( VLC_Changeset() != "exported" )
+        [o_revision_field setStringValue: [NSString stringWithFormat: \
+            _NS("Compiled by %s, based on SVN revision %s"), VLC_CompileBy(), \
+            VLC_Changeset()]];
+        else
+        [o_revision_field setStringValue: [NSString stringWithFormat: \
+            _NS("Compiled by %s"), VLC_CompileBy()]];
     
         /* Setup the nameversion field */
-        o_name_version = [NSString stringWithFormat:@"%@ - Version %@", o_name, o_version];
+        o_name_version = [NSString stringWithFormat:@"Version %@", o_version];
         [o_name_version_field setStringValue: o_name_version];
         
         /* Setup our credits */
         o_credits_path = [[NSBundle mainBundle] pathForResource:@"AUTHORS" ofType:nil];
-        o_credits = [[NSString alloc] initWithData: [NSData dataWithContentsOfFile: o_credits_path ] encoding:NSWindowsCP1252StringEncoding];
+        o_credits = [[NSString alloc] initWithData: [NSData dataWithContentsOfFile: o_credits_path ] encoding:NSUTF8StringEncoding];
         
         /* Parse the authors string */
         NSMutableString *o_outString = [NSMutableString stringWithFormat: @"%@\n\n", _NS(INTF_ABOUT_MSG)];
@@ -128,7 +134,7 @@ static VLAboutBox *_o_sharedInstance = nil;
         /* Parse the thanks string */
         o_thanks_path = [[NSBundle mainBundle] pathForResource:@"THANKS" ofType:nil];
         o_thanks = [[NSString alloc] initWithData: [NSData dataWithContentsOfFile: 
-                        o_thanks_path ] encoding:NSWindowsCP1252StringEncoding];
+                        o_thanks_path ] encoding:NSUTF8StringEncoding];
         
         NSScanner *o_scan_thanks = [NSScanner scannerWithString: o_thanks];
         [o_scan_thanks scanUpToCharactersFromSet: o_stopSet intoString: nil];