* ./README.MacOSX.rtf: added two remarks on subtitle support.

* ./extras/MacOSX/vlc.pbroj/project.pbxproj
  - Added .wma filetype
  - Added README, COPYING etc. to resources
* ALL: Added a Help menu.

diff --git a/README.MacOSX.rtf b/README.MacOSX.rtf
index b64d4716b49c77b7ea27b431d12e9983804b9f7d..f5406d44db804f2f995496d5c6e9bb1a9e428eba 100644 (file)
--- a/README.MacOSX.rtf
+++ b/README.MacOSX.rtf
@@ -75,14 +75,16 @@ Simply drag VLC from the place where you have installed it, to the Trash.\
 \f1\b \ul 9. Support for files with subtitles \
 
 \f0\b0 \ulnone Support for subtitles in separate files is still very much in a testing fase. DVD subtitles can be used trough the Controls->Subtitles menu-item.\
+- Subfiles need to be opened at the same moment as the video to which you want to add subtitles. You can do this in the File->Open menu.\
 - As of yet it is not yet possible to adapt the font, size of the text and/or position.\
 - You need to specify the subtitle when you open the file.\
 - A subtitle is global instead of bound to a playlist-item.  This will be fixed in a future version.\
 - Only MicroDVD, SubRIP and SSA1-4 subtitle files are supported at the moment.\
+- Subs can only be added to .avi  and mpg movie files at the moment\
 \
 \
 Thanks for reading this file. For additional information, subscribe to the vlc mailing list on \ul http://www.videolan.org/support/lists.html\ulnone .\
 -- \
 Christophe Massiot <massiot@via.ecp.fr> and\
 Derk-Jan Hartman <thedj@users.sourceforge.net> for the VideoLAN team.\
-$Id: README.MacOSX.rtf,v 1.8 2003/01/25 12:42:13 hartman Exp $}
\ No newline at end of file
+$Id: README.MacOSX.rtf,v 1.9 2003/01/25 18:42:17 hartman Exp $}
\ No newline at end of file

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
index 01b56810194919341152c08088d952a10671b408..e755e060c7099c4be0cdedab98ad9017fb5aa0d0 100644 (file)
--- a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
+++ b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
@@ -36,7 +36,11 @@
             ACTIONS = {
                 clearRecentItems = id; 
                 closeError = id; 
+                openLicense = id; 
+                openReadMe = id; 
                 openRecentItem = id; 
+                openWebsite = id; 
+                reportABug = id; 
                 timesliderUpdate = id; 
                 viewPreferences = id; 
             }; 
@@ -77,6 +81,7 @@
                 "o_mi_hide" = id; 
                 "o_mi_hide_others" = id; 
                 "o_mi_language" = id; 
+                "o_mi_license" = id; 
                 "o_mi_loop" = id; 
                 "o_mi_messages" = id; 
                 "o_mi_minimize" = id; 
@@ -95,6 +100,8 @@
                 "o_mi_previous" = id; 
                 "o_mi_program" = id; 
                 "o_mi_quit" = id; 
+                "o_mi_readme" = id; 
+                "o_mi_reportabug" = id; 
                 "o_mi_screen" = id; 
                 "o_mi_select_all" = id; 
                 "o_mi_show_all" = id; 
@@ -104,12 +111,14 @@
                 "o_mi_title" = id; 
                 "o_mi_vol_down" = id; 
                 "o_mi_vol_up" = id; 
+                "o_mi_website" = id; 
                 "o_msgs_btn_ok" = id; 
                 "o_msgs_panel" = id; 
                 "o_mu_audio" = id; 
                 "o_mu_controls" = id; 
                 "o_mu_edit" = id; 
                 "o_mu_file" = id; 
+                "o_mu_help" = id; 
                 "o_mu_video" = id; 
                 "o_mu_window" = id; 
                 "o_playlist" = id; 

diff --git a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib
index 9e09405313b1e99b6a3e45e2a3fbdfd800ec5f55..ff5f964a33507954de5a54e456e913d7d3abea33 100644 (file)
Binary files a/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib and b/extras/MacOSX/Resources/English.lproj/MainMenu.nib/objects.nib differ

diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index c32e92e2dd3bad00a4293834cf2e33f452a856be..aa4bb2755183f81088783c4cdf1dc306810cebeb 100644 (file)
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -124,6 +124,18 @@
                        <key>CFBundleTypeRole</key>
                        <string>Viewer</string>
                </dict>
+               <dict>
+                       <key>CFBundleTypeExtensions</key>
+                       <array>
+                               <string>wma</string>
+                       </array>
+                       <key>CFBundleTypeIconFile</key>
+                       <string>generic.icns</string>
+                       <key>CFBundleTypeName</key>
+                       <string>WMA File</string>
+                       <key>CFBundleTypeRole</key>
+                       <string>Viewer</string>
+               </dict>
                <dict>
                        <key>CFBundleTypeExtensions</key>
                        <array>
@@ -366,6 +378,24 @@
                                A064F9F203CB9EE000B21232,
                                A064F9F303CB9EE000B21232,
                                8E88833D03DD6E870059A3A7,
+                               8E68B0BF03E2EA230059A3A7,
+                               8ED6C28903E2EB1D0059A3A7,
+                               8ED6C28A03E2EB1D0059A3A7,
+                               8ED6C28B03E2EB1D0059A3A7,
+                               8ED6C28C03E2EB1D0059A3A7,
+                               8ED6C28D03E2EB1D0059A3A7,
+                               8ED6C28E03E2EB1D0059A3A7,
+                               8ED6C28F03E2EB1D0059A3A7,
+                               8ED6C29003E2EB1D0059A3A7,
+                               8ED6C29103E2EB1D0059A3A7,
+                               8ED6C29203E2EB1D0059A3A7,
+                               8ED6C29303E2EB1D0059A3A7,
+                               8ED6C29403E2EB1D0059A3A7,
+                               8ED6C29503E2EB1D0059A3A7,
+                               8ED6C29603E2EB1D0059A3A7,
+                               8ED6C29703E2EB1D0059A3A7,
+                               8ED6C29F03E2F32E0059A3A7,
+                               8ED6C2A003E2F32E0059A3A7,
                        );
                        isa = PBXResourcesBuildPhase;
                        runOnlyForDeploymentPostprocessing = 0;
@@ -407,6 +437,9 @@
                                A064F9E903CB9EE000B21232,
                                8E88833C03DD6E870059A3A7,
                                F69B0CA602E24F6401A80112,
+                               8E68B0BE03E2EA230059A3A7,
+                               8ED6C29D03E2F32E0059A3A7,
+                               8ED6C29E03E2F32E0059A3A7,
                        );
                        isa = PBXGroup;
                        name = Resources;
@@ -420,6 +453,21 @@
                };
                08FB77AFFE84173DC02AAC07 = {
                        children = (
+                               8ED6C27A03E2EB1C0059A3A7,
+                               8ED6C27B03E2EB1C0059A3A7,
+                               8ED6C27C03E2EB1C0059A3A7,
+                               8ED6C27D03E2EB1C0059A3A7,
+                               8ED6C27E03E2EB1C0059A3A7,
+                               8ED6C27F03E2EB1C0059A3A7,
+                               8ED6C28003E2EB1C0059A3A7,
+                               8ED6C28103E2EB1C0059A3A7,
+                               8ED6C28203E2EB1C0059A3A7,
+                               8ED6C28303E2EB1C0059A3A7,
+                               8ED6C28403E2EB1C0059A3A7,
+                               8ED6C28503E2EB1C0059A3A7,
+                               8ED6C28603E2EB1C0059A3A7,
+                               8ED6C28703E2EB1C0059A3A7,
+                               8ED6C28803E2EB1C0059A3A7,
                        );
                        isa = PBXGroup;
                        name = Classes;
@@ -492,6 +540,18 @@
 //8E2
 //8E3
 //8E4
+               8E68B0BE03E2EA230059A3A7 = {
+                       isa = PBXFileReference;
+                       name = README.MacOSX.rtf;
+                       path = ../../README.MacOSX.rtf;
+                       refType = 2;
+               };
+               8E68B0BF03E2EA230059A3A7 = {
+                       fileRef = 8E68B0BE03E2EA230059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
                8E88833C03DD6E870059A3A7 = {
                        isa = PBXFileReference;
                        name = slow.png;
@@ -504,6 +564,227 @@
                        settings = {
                        };
                };
+               8ED6C27A03E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = aout.m;
+                       path = ../../modules/gui/macosx/aout.m;
+                       refType = 2;
+               };
+               8ED6C27B03E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = controls.m;
+                       path = ../../modules/gui/macosx/controls.m;
+                       refType = 2;
+               };
+               8ED6C27C03E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = intf.h;
+                       path = ../../modules/gui/macosx/intf.h;
+                       refType = 2;
+               };
+               8ED6C27D03E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = intf.m;
+                       path = ../../modules/gui/macosx/intf.m;
+                       refType = 2;
+               };
+               8ED6C27E03E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = macosx.m;
+                       path = ../../modules/gui/macosx/macosx.m;
+                       refType = 2;
+               };
+               8ED6C27F03E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = misc.h;
+                       path = ../../modules/gui/macosx/misc.h;
+                       refType = 2;
+               };
+               8ED6C28003E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = misc.m;
+                       path = ../../modules/gui/macosx/misc.m;
+                       refType = 2;
+               };
+               8ED6C28103E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = open.h;
+                       path = ../../modules/gui/macosx/open.h;
+                       refType = 2;
+               };
+               8ED6C28203E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = open.m;
+                       path = ../../modules/gui/macosx/open.m;
+                       refType = 2;
+               };
+               8ED6C28303E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = playlist.h;
+                       path = ../../modules/gui/macosx/playlist.h;
+                       refType = 2;
+               };
+               8ED6C28403E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = playlist.m;
+                       path = ../../modules/gui/macosx/playlist.m;
+                       refType = 2;
+               };
+               8ED6C28503E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = prefs.h;
+                       path = ../../modules/gui/macosx/prefs.h;
+                       refType = 2;
+               };
+               8ED6C28603E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = prefs.m;
+                       path = ../../modules/gui/macosx/prefs.m;
+                       refType = 2;
+               };
+               8ED6C28703E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = vout.h;
+                       path = ../../modules/gui/macosx/vout.h;
+                       refType = 2;
+               };
+               8ED6C28803E2EB1C0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = vout.m;
+                       path = ../../modules/gui/macosx/vout.m;
+                       refType = 2;
+               };
+               8ED6C28903E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C27A03E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C28A03E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C27B03E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C28B03E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C27C03E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C28C03E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C27D03E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C28D03E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C27E03E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C28E03E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C27F03E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C28F03E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C28003E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C29003E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C28103E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C29103E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C28203E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C29203E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C28303E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C29303E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C28403E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C29403E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C28503E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C29503E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C28603E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C29603E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C28703E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C29703E2EB1D0059A3A7 = {
+                       fileRef = 8ED6C28803E2EB1C0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C29D03E2F32E0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = AUTHORS;
+                       path = ../../AUTHORS;
+                       refType = 2;
+               };
+               8ED6C29E03E2F32E0059A3A7 = {
+                       fileEncoding = 30;
+                       isa = PBXFileReference;
+                       name = COPYING;
+                       path = ../../COPYING;
+                       refType = 2;
+               };
+               8ED6C29F03E2F32E0059A3A7 = {
+                       fileRef = 8ED6C29D03E2F32E0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
+               8ED6C2A003E2F32E0059A3A7 = {
+                       fileRef = 8ED6C29E03E2F32E0059A3A7;
+                       isa = PBXBuildFile;
+                       settings = {
+                       };
+               };
 //8E0
 //8E1
 //8E2

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 328f81053710931c2728ca9f78d4d82ecd09a718..03fdd111305db6f63a364507c1a656d753882e07 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -2,7 +2,7 @@
  * intf.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.h,v 1.16 2003/01/23 22:25:32 hartman Exp $
+ * $Id: intf.h,v 1.17 2003/01/25 18:42:17 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -175,6 +175,12 @@ struct intf_sys_t
     IBOutlet id o_mi_playlist;
     IBOutlet id o_mi_messages;
     IBOutlet id o_mi_bring_atf;
+    
+    IBOutlet id o_mu_help;
+    IBOutlet id o_mi_readme;
+    IBOutlet id o_mi_reportabug;
+    IBOutlet id o_mi_website;
+    IBOutlet id o_mi_license;
 
     /* dock menu */
     IBOutlet id o_dmi_play;
@@ -207,6 +213,11 @@ struct intf_sys_t
 
 - (IBAction)closeError:(id)sender;
 
+- (IBAction)openReadMe:(id)sender;
+- (IBAction)reportABug:(id)sender;
+- (IBAction)openWebsite:(id)sender;
+- (IBAction)openLicense:(id)sender;
+
 @end
 
 @interface VLCMain (Internal)

diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index 7d2348e3209a8c408a775f32edffa931b393c5b5..3a991af09b00c1d74555d80c346eda6d2be53d0e 100644 (file)
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -2,7 +2,7 @@
  * intf.m: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.33 2003/01/24 16:19:15 hartman Exp $
+ * $Id: intf.m,v 1.34 2003/01/25 18:42:17 hartman Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -269,6 +269,12 @@ static void Run( intf_thread_t *p_intf )
 
     [o_mi_bring_atf setTitle: _NS("Bring All to Front")];
 
+    [o_mu_help setTitle: _NS("Help")];
+    [o_mi_readme setTitle: _NS("ReadMe...")];
+    [o_mi_reportabug setTitle: _NS("Report A Bug")];
+    [o_mi_website setTitle: _NS("VideoLAN Website")];
+    [o_mi_license setTitle: _NS("License")];
+
     /* dock menu */
     [o_dmi_play setTitle: _NS("Play")];
     [o_dmi_stop setTitle: _NS("Stop")];
@@ -1175,6 +1181,38 @@ static void Run( intf_thread_t *p_intf )
     [o_error performClose: self];
 }
 
+- (IBAction)openReadMe:(id)sender
+{
+    NSString *readmeFile = [[NSBundle mainBundle] pathForResource:@"README.MacOSX"
+       ofType:@"rtf"];
+       
+    [[NSWorkspace sharedWorkspace] openFile: readmeFile 
+        withApplication:@"TextEdit"];
+}
+
+- (IBAction)reportABug:(id)sender
+{
+    NSURL *bugURL = [NSURL URLWithString:@"http://www.videolan.org/vlc/bug-reporting.html"];
+    
+    [[NSWorkspace sharedWorkspace] openURL: bugURL];
+}
+
+- (IBAction)openWebsite:(id)sender
+{
+    NSURL *websiteURL = [NSURL URLWithString:@"http://www.videolan.org/"];
+    
+    [[NSWorkspace sharedWorkspace] openURL: websiteURL];
+}
+
+- (IBAction)openLicense:(id)sender
+{
+    NSString *licenseFile = [[NSBundle mainBundle] pathForResource:@"COPYING"
+       ofType:nil];
+       
+    [[NSWorkspace sharedWorkspace] openFile: licenseFile 
+        withApplication:@"TextEdit"];
+}
+
 @end
 
 @implementation VLCMain (NSMenuValidation)