Skip to content

V
vlc-1.1
Commit 160a693d authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* ./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.
parent 28e3d5e9
Show whitespace changes
Inline Side-by-side
Showing with 344 additions and 3 deletions
README.MacOSX.rtf
View file @ 160a693d
...@@ -75,14 +75,16 @@ Simply drag VLC from the place where you have installed it, to the Trash.\ ...@@ -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 \ \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.\ \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.\ - 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.\ - 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.\ - 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.\ - 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 .\ 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\ Christophe Massiot <massiot@via.ecp.fr> and\
Derk-Jan Hartman <thedj@users.sourceforge.net> for the VideoLAN team.\ 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 $} $Id: README.MacOSX.rtf,v 1.9 2003/01/25 18:42:17 hartman Exp $}
\ No newline at end of file \ No newline at end of file
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
View file @ 160a693d
...@@ -36,7 +36,11 @@ ...@@ -36,7 +36,11 @@
ACTIONS = { ACTIONS = {
clearRecentItems = id; clearRecentItems = id;
closeError = id; closeError = id;
openLicense = id;
openReadMe = id;
openRecentItem = id; openRecentItem = id;
openWebsite = id;
reportABug = id;
timesliderUpdate = id; timesliderUpdate = id;
viewPreferences = id; viewPreferences = id;
}; };
...@@ -77,6 +81,7 @@ ...@@ -77,6 +81,7 @@
"o_mi_hide" = id; "o_mi_hide" = id;
"o_mi_hide_others" = id; "o_mi_hide_others" = id;
"o_mi_language" = id; "o_mi_language" = id;
"o_mi_license" = id;
"o_mi_loop" = id; "o_mi_loop" = id;
"o_mi_messages" = id; "o_mi_messages" = id;
"o_mi_minimize" = id; "o_mi_minimize" = id;
...@@ -95,6 +100,8 @@ ...@@ -95,6 +100,8 @@
"o_mi_previous" = id; "o_mi_previous" = id;
"o_mi_program" = id; "o_mi_program" = id;
"o_mi_quit" = id; "o_mi_quit" = id;
"o_mi_readme" = id;
"o_mi_reportabug" = id;
"o_mi_screen" = id; "o_mi_screen" = id;
"o_mi_select_all" = id; "o_mi_select_all" = id;
"o_mi_show_all" = id; "o_mi_show_all" = id;
...@@ -104,12 +111,14 @@ ...@@ -104,12 +111,14 @@
"o_mi_title" = id; "o_mi_title" = id;
"o_mi_vol_down" = id; "o_mi_vol_down" = id;
"o_mi_vol_up" = id; "o_mi_vol_up" = id;
"o_mi_website" = id;
"o_msgs_btn_ok" = id; "o_msgs_btn_ok" = id;
"o_msgs_panel" = id; "o_msgs_panel" = id;
"o_mu_audio" = id; "o_mu_audio" = id;
"o_mu_controls" = id; "o_mu_controls" = id;
"o_mu_edit" = id; "o_mu_edit" = id;
"o_mu_file" = id; "o_mu_file" = id;
"o_mu_help" = id;
"o_mu_video" = id; "o_mu_video" = id;
"o_mu_window" = id; "o_mu_window" = id;
"o_playlist" = id; "o_playlist" = id;
......
extras/MacOSX/vlc.pbproj/project.pbxproj
View file @ 160a693d
...@@ -124,6 +124,18 @@ ...@@ -124,6 +124,18 @@
<key>CFBundleTypeRole</key> <key>CFBundleTypeRole</key>
<string>Viewer</string> <string>Viewer</string>
</dict> </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> <dict>
<key>CFBundleTypeExtensions</key> <key>CFBundleTypeExtensions</key>
<array> <array>
...@@ -366,6 +378,24 @@ ...@@ -366,6 +378,24 @@
A064F9F203CB9EE000B21232, A064F9F203CB9EE000B21232,
A064F9F303CB9EE000B21232, A064F9F303CB9EE000B21232,
8E88833D03DD6E870059A3A7, 8E88833D03DD6E870059A3A7,
8E68B0BF03E2EA230059A3A7,
8ED6C28903E2EB1D0059A3A7,
8ED6C28A03E2EB1D0059A3A7,
8ED6C28B03E2EB1D0059A3A7,
8ED6C28C03E2EB1D0059A3A7,
8ED6C28D03E2EB1D0059A3A7,
8ED6C28E03E2EB1D0059A3A7,
8ED6C28F03E2EB1D0059A3A7,
8ED6C29003E2EB1D0059A3A7,
8ED6C29103E2EB1D0059A3A7,
8ED6C29203E2EB1D0059A3A7,
8ED6C29303E2EB1D0059A3A7,
8ED6C29403E2EB1D0059A3A7,
8ED6C29503E2EB1D0059A3A7,
8ED6C29603E2EB1D0059A3A7,
8ED6C29703E2EB1D0059A3A7,
8ED6C29F03E2F32E0059A3A7,
8ED6C2A003E2F32E0059A3A7,
); );
isa = PBXResourcesBuildPhase; isa = PBXResourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
...@@ -407,6 +437,9 @@ ...@@ -407,6 +437,9 @@
A064F9E903CB9EE000B21232, A064F9E903CB9EE000B21232,
8E88833C03DD6E870059A3A7, 8E88833C03DD6E870059A3A7,
F69B0CA602E24F6401A80112, F69B0CA602E24F6401A80112,
8E68B0BE03E2EA230059A3A7,
8ED6C29D03E2F32E0059A3A7,
8ED6C29E03E2F32E0059A3A7,
); );
isa = PBXGroup; isa = PBXGroup;
name = Resources; name = Resources;
...@@ -420,6 +453,21 @@ ...@@ -420,6 +453,21 @@
}; };
08FB77AFFE84173DC02AAC07 = { 08FB77AFFE84173DC02AAC07 = {
children = ( children = (
8ED6C27A03E2EB1C0059A3A7,
8ED6C27B03E2EB1C0059A3A7,
8ED6C27C03E2EB1C0059A3A7,
8ED6C27D03E2EB1C0059A3A7,
8ED6C27E03E2EB1C0059A3A7,
8ED6C27F03E2EB1C0059A3A7,
8ED6C28003E2EB1C0059A3A7,
8ED6C28103E2EB1C0059A3A7,
8ED6C28203E2EB1C0059A3A7,
8ED6C28303E2EB1C0059A3A7,
8ED6C28403E2EB1C0059A3A7,
8ED6C28503E2EB1C0059A3A7,
8ED6C28603E2EB1C0059A3A7,
8ED6C28703E2EB1C0059A3A7,
8ED6C28803E2EB1C0059A3A7,
); );
isa = PBXGroup; isa = PBXGroup;
name = Classes; name = Classes;
...@@ -492,6 +540,18 @@ ...@@ -492,6 +540,18 @@
//8E2 //8E2
//8E3 //8E3
//8E4 //8E4
8E68B0BE03E2EA230059A3A7 = {
isa = PBXFileReference;
name = README.MacOSX.rtf;
path = ../../README.MacOSX.rtf;
refType = 2;
};
8E68B0BF03E2EA230059A3A7 = {
fileRef = 8E68B0BE03E2EA230059A3A7;
isa = PBXBuildFile;
settings = {
};
};
8E88833C03DD6E870059A3A7 = { 8E88833C03DD6E870059A3A7 = {
isa = PBXFileReference; isa = PBXFileReference;
name = slow.png; name = slow.png;
...@@ -504,6 +564,227 @@ ...@@ -504,6 +564,227 @@
settings = { 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 //8E0
//8E1 //8E1
//8E2 //8E2
......
modules/gui/macosx/intf.h
View file @ 160a693d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.h: MacOS X interface plugin * intf.h: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002 VideoLAN * 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> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -176,6 +176,12 @@ struct intf_sys_t ...@@ -176,6 +176,12 @@ struct intf_sys_t
IBOutlet id o_mi_messages; IBOutlet id o_mi_messages;
IBOutlet id o_mi_bring_atf; 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 */ /* dock menu */
IBOutlet id o_dmi_play; IBOutlet id o_dmi_play;
IBOutlet id o_dmi_stop; IBOutlet id o_dmi_stop;
...@@ -207,6 +213,11 @@ struct intf_sys_t ...@@ -207,6 +213,11 @@ struct intf_sys_t
- (IBAction)closeError:(id)sender; - (IBAction)closeError:(id)sender;
- (IBAction)openReadMe:(id)sender;
- (IBAction)reportABug:(id)sender;
- (IBAction)openWebsite:(id)sender;
- (IBAction)openLicense:(id)sender;
@end @end
@interface VLCMain (Internal) @interface VLCMain (Internal)
......
modules/gui/macosx/intf.m
View file @ 160a693d
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
* intf.m: MacOS X interface plugin * intf.m: MacOS X interface plugin
***************************************************************************** *****************************************************************************
* Copyright (C) 2002-2003 VideoLAN * 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> * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr> * Christophe Massiot <massiot@via.ecp.fr>
...@@ -269,6 +269,12 @@ static void Run( intf_thread_t *p_intf ) ...@@ -269,6 +269,12 @@ static void Run( intf_thread_t *p_intf )
[o_mi_bring_atf setTitle: _NS("Bring All to Front")]; [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 */ /* dock menu */
[o_dmi_play setTitle: _NS("Play")]; [o_dmi_play setTitle: _NS("Play")];
[o_dmi_stop setTitle: _NS("Stop")]; [o_dmi_stop setTitle: _NS("Stop")];
...@@ -1175,6 +1181,38 @@ static void Run( intf_thread_t *p_intf ) ...@@ -1175,6 +1181,38 @@ static void Run( intf_thread_t *p_intf )
[o_error performClose: self]; [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 @end
@implementation VLCMain (NSMenuValidation) @implementation VLCMain (NSMenuValidation)
......
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