Skip to content

V
vlc-2-2
Commit 9ad04be7 authored by Derk-Jan Hartman's avatar Derk-Jan Hartman
Browse files
Options

* ALL: 

- integrated play/pause toggled button
- global shortcut for play/pause by use of spacebar
- new pause.png
- removed pause button
- close button in intf window. register window in Window menuitem.
- rearranged the menu
- changed some key-combo's to be more OSX compliant/consistent
- The time text-field is no longer selectable
- The faster/slower/ff/stop etc button are only available during playback
- added .bin filetype to Project Target (allows drag and drop of .bin files on program icon.
- Added Add/Remove buttons to the llaylist.
- Made the drawer 10 pixels smaller. Looks much better.
- added a volume slider.
parent 6484d33c
Hide whitespace changes
Inline Side-by-side
Showing with 31 additions and 30 deletions
extras/MacOSX/Resources/English.lproj/InfoPlist.strings
View file @ 9ad04be7
B/* Localized versions of Info.plist keys */
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
View file @ 9ad04be7
......@@ -5,6 +5,7 @@
{
ACTIONS = {
deinterlace = id;
fastForward = id;
faster = id;
fullscreen = id;
loop = id;
......@@ -22,11 +23,12 @@
toggleTitle = id;
toggleVar = id;
volumeDown = id;
volumeSliderUpdate = id;
volumeUp = id;
};
CLASS = VLCControls;
LANGUAGE = ObjC;
OUTLETS = {"o_open" = id; };
OUTLETS = {"o_mi_mute" = id; "o_open" = id; "o_volumeslider" = id; };
SUPERCLASS = NSObject;
},
{
......@@ -40,9 +42,8 @@
CLASS = VLCMain;
LANGUAGE = ObjC;
OUTLETS = {
"o_btn_faster" = id;
"o_btn_fastforward" = id;
"o_btn_next" = id;
"o_btn_pause" = id;
"o_btn_play" = id;
"o_btn_playlist" = id;
"o_btn_prefs" = id;
......@@ -50,7 +51,6 @@
"o_btn_slower" = id;
"o_btn_stop" = id;
"o_controls" = id;
"o_dmi_pause" = id;
"o_dmi_play" = id;
"o_dmi_stop" = id;
"o_err_btn_dismiss" = id;
......@@ -66,6 +66,7 @@
"o_mi_chapter" = id;
"o_mi_clear" = id;
"o_mi_close_window" = id;
"o_mi_controller" = id;
"o_mi_copy" = id;
"o_mi_cut" = id;
"o_mi_deinterlace" = id;
......@@ -87,7 +88,6 @@
"o_mi_open_recent" = id;
"o_mi_open_recent_cm" = id;
"o_mi_paste" = id;
"o_mi_pause" = id;
"o_mi_play" = id;
"o_mi_playlist" = id;
"o_mi_prefs" = id;
......@@ -105,14 +105,16 @@
"o_mi_vol_up" = 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_view" = id;
"o_mu_video" = id;
"o_mu_window" = id;
"o_playlist" = id;
"o_timefield" = id;
"o_timeslider" = id;
"o_volumeslider" = id;
"o_window" = id;
};
SUPERCLASS = NSObject;
......@@ -199,6 +201,8 @@
CLASS = VLCPlaylist;
LANGUAGE = ObjC;
OUTLETS = {
"o_btn_add" = id;
"o_btn_remove" = id;
"o_ctx_menu" = id;
"o_mi_delete" = id;
"o_mi_play" = id;
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ 9ad04be7
......@@ -3,17 +3,17 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>392 25 365 441 0 0 1152 746 </string>
<string>451 372 365 441 0 0 1280 1002 </string>
<key>IBEditorPositions</key>
<dict>
<key>29</key>
<string>81 252 315 44 0 0 1152 746 </string>
<string>16 821 374 44 0 0 1280 1002 </string>
<key>303</key>
<string>54 367 72 84 0 0 1152 746 </string>
<string>60 509 104 66 0 0 1280 1002 </string>
<key>909</key>
<string>338 411 440 172 0 0 1152 746 </string>
<string>425 600 430 172 0 0 1280 1002 </string>
<key>915</key>
<string>392 471 93 96 0 0 1152 746 </string>
<string>439 657 93 96 0 0 1280 1002 </string>
</dict>
<key>IBFramework Version</key>
<string>291.0</string>
......@@ -23,9 +23,10 @@
</array>
<key>IBOpenObjects</key>
<array>
<integer>21</integer>
<integer>909</integer>
<integer>915</integer>
<integer>29</integer>
<integer>303</integer>
<integer>984</integer>
</array>
<key>IBSystem Version</key>
<string>6G30</string>
......
extras/MacOSX/Resources/pause.png
View replaced file @ 6484d33c View file @ 9ad04be7
extras/MacOSX/Resources/pause.png

464 Bytes | W: | H:

extras/MacOSX/Resources/pause.png

1.61 KB | W: | H:

extras/MacOSX/Resources/pause.png
extras/MacOSX/Resources/pause.png
extras/MacOSX/Resources/pause.png
extras/MacOSX/Resources/pause.png
  • 2-up
  • Swipe
  • Onion skin
extras/MacOSX/vlc.pbproj/project.pbxproj
View file @ 9ad04be7
......@@ -80,9 +80,7 @@
};
089C1673FE841209C02AAC07 = {
buildPhases = (
089C1674FE841209C02AAC07,
089C1675FE841209C02AAC07,
089C1676FE841209C02AAC07,
089C1677FE841209C02AAC07,
089C1679FE841209C02AAC07,
);
......@@ -90,7 +88,7 @@
FRAMEWORK_SEARCH_PATHS = "";
HEADER_SEARCH_PATHS = "";
INSTALL_PATH = "$(HOME)/Library/Bundles";
LIBRARY_SEARCH_PATHS = "";
LIBRARY_SEARCH_PATHS = "/Volumes/Users/pjotr/Development/vlc-old/vlc/lib /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/access/dvd /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/access /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/access/mms /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/access/vcd /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/access_output /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/audio_filter/channel_mixer /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/audio_filter/converter /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/audio_filter/resampler /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/audio_mixer /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/audio_output /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec/cinepak /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec/mpeg_audio /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec/mpeg_video/idct /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec/mpeg_video /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec/mpeg_video/motion /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/codec/spudec /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/control/rc /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/aac /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/asf /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/avi /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/mp4 /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/mpeg /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/util /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/demux/wav /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/gui/macosx /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/misc/dummy /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/misc /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/misc/logger /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/misc/memcpy /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/misc/network /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/mux /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/mux/mpeg /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/packetizer /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/video_chroma /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/video_filter/deinterlace /Volumes/Users/pjotr/Development/vlc-old/vlc/modules/video_filter";
OTHER_CFLAGS = "";
OTHER_LDFLAGS = "";
OTHER_REZFLAGS = "";
......@@ -126,6 +124,18 @@
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
<string>dat</string>
</array>
<key>CFBundleTypeIconFile</key>
<string>mpeg.icns</string>
<key>CFBundleTypeName</key>
<string>DAT file</string>
<key>CFBundleTypeRole</key>
<string>Viewer</string>
</dict>
<dict>
<key>CFBundleTypeExtensions</key>
<array>
......@@ -212,13 +222,6 @@
</plist>
";
};
089C1674FE841209C02AAC07 = {
buildActionMask = 2147483647;
files = (
);
isa = PBXHeadersBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
};
089C1675FE841209C02AAC07 = {
buildActionMask = 2147483647;
files = (
......@@ -245,13 +248,6 @@
isa = PBXResourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
};
089C1676FE841209C02AAC07 = {
buildActionMask = 2147483647;
files = (
);
isa = PBXSourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
};
089C1677FE841209C02AAC07 = {
buildActionMask = 2147483647;
files = (
......
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