Skip to content

GitLab

Commit 1e96bee0 authored by hartman's avatar hartman
Browse files
Options

* New OSX controller (iTunes style) 

  - Drag and drop implemented
  - still need new sliders and remove the titlebar.
* revert the mozilla plugin changes. i will build a seperate module for that
* simplified previous/next (only playlist, people with chapters and titles
   will have to use the menu
* Moved the disable screensaver from interface to vout.
parent 02619e2b
Hide whitespace changes
Inline Side-by-side
Showing with 777 additions and 528 deletions
extras/MacOSX/Resources/English.lproj/MainMenu.nib/classes.nib
View file @ 1e96bee0
{
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{CLASS = MPSlider; LANGUAGE = ObjC; SUPERCLASS = NSSlider; },
{
ACTIONS = {showPanel = id; };
CLASS = VLAboutBox;
......@@ -16,6 +17,8 @@
},
{CLASS = VLBrushedMetalImageView; LANGUAGE = ObjC; SUPERCLASS = NSImageView; },
{CLASS = VLCApplication; LANGUAGE = ObjC; SUPERCLASS = NSApplication; },
{CLASS = VLCControllerView; LANGUAGE = ObjC; SUPERCLASS = NSView; },
{CLASS = VLCControllerWindow; LANGUAGE = ObjC; SUPERCLASS = NSWindow; },
{
ACTIONS = {
backward = id;
......@@ -66,13 +69,13 @@
CLASS = VLCMain;
LANGUAGE = ObjC;
OUTLETS = {
"o_btn_faster" = id;
"o_btn_ff" = id;
"o_btn_fullscreen" = id;
"o_btn_next" = id;
"o_btn_play" = id;
"o_btn_playlist" = id;
"o_btn_prefs" = id;
"o_btn_prev" = id;
"o_btn_slower" = id;
"o_btn_rewind" = id;
"o_btn_stop" = id;
"o_controls" = id;
"o_dmi_mute" = id;
......@@ -171,6 +174,7 @@
"o_mu_window" = id;
"o_playlist" = id;
"o_prefs" = id;
"o_scrollfield" = id;
"o_timefield" = id;
"o_timeslider" = id;
"o_volumeslider" = id;
......
extras/MacOSX/Resources/English.lproj/MainMenu.nib/info.nib
View file @ 1e96bee0
......@@ -3,7 +3,7 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
<string>53 61 772 722 0 0 1280 1002 </string>
<string>27 143 356 496 0 0 1280 1002 </string>
<key>IBEditorPositions</key>
<dict>
<key>1617</key>
......@@ -16,13 +16,11 @@
<key>IBFramework Version</key>
<string>349.0</string>
<key>IBLockedObjects</key>
<array>
<integer>977</integer>
</array>
<array/>
<key>IBOpenObjects</key>
<array>
<integer>29</integer>
<integer>21</integer>
<integer>1647</integer>
</array>
<key>IBSystem Version</key>
<string>7C107</string>
......
extras/MacOSX/Resources/pause.png
View replaced file @ 02619e2b View file @ 1e96bee0
extras/MacOSX/Resources/pause.png

1.61 KB | W: | H:

extras/MacOSX/Resources/pause.png

2.77 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/Resources/play.png
View replaced file @ 02619e2b View file @ 1e96bee0
extras/MacOSX/Resources/play.png

1000 Bytes | W: | H:

extras/MacOSX/Resources/play.png

2.95 KB | W: | H:

extras/MacOSX/Resources/play.png
extras/MacOSX/Resources/play.png
extras/MacOSX/Resources/play.png
extras/MacOSX/Resources/play.png
  • 2-up
  • Swipe
  • Onion skin
extras/MacOSX/Resources/stop.png
View replaced file @ 02619e2b View file @ 1e96bee0
extras/MacOSX/Resources/stop.png

547 Bytes | W: | H:

extras/MacOSX/Resources/stop.png

1.13 KB | W: | H:

extras/MacOSX/Resources/stop.png
extras/MacOSX/Resources/stop.png
extras/MacOSX/Resources/stop.png
extras/MacOSX/Resources/stop.png
  • 2-up
  • Swipe
  • Onion skin
extras/MacOSX/vlc.pbproj/project.pbxproj
View file @ 1e96bee0
......@@ -6,7 +6,7 @@
objectVersion = 39;
objects = {
014CEA410018CDE011CA2923 = {
expectedFileType = wrapper.cfbundle;
expectedFileType = "wrapper.plug-in";
fallbackIsa = PBXFileReference;
isa = PBXBundleReference;
path = VLC.bundle;
......@@ -607,17 +607,6 @@
F6E4F91402D2648B01A80112,
F6E4F91502D2648B01A80112,
F69B0CA802E24F6401A80112,
A064F9EA03CB9EE000B21232,
A064F9EB03CB9EE000B21232,
A064F9EC03CB9EE000B21232,
A064F9ED03CB9EE000B21232,
A064F9EE03CB9EE000B21232,
A064F9EF03CB9EE000B21232,
A064F9F003CB9EE000B21232,
A064F9F103CB9EE000B21232,
A064F9F203CB9EE000B21232,
A064F9F303CB9EE000B21232,
8E88833D03DD6E870059A3A7,
8ED6C29F03E2F32E0059A3A7,
8ED6C2A003E2F32E0059A3A7,
8EBF3FA403F13FFB0059A3A7,
......@@ -648,6 +637,32 @@
8E445FB004728A700059A3A7,
8E445FB104728A700059A3A7,
8E445FB204728A700059A3A7,
8E9390B40565D6D300C7661C,
8E9390B50565D6D300C7661C,
8E9390B60565D6D300C7661C,
8E9390B70565D6D300C7661C,
8E9390B80565D6D300C7661C,
8E9390B90565D6D300C7661C,
8E9390BA0565D6D300C7661C,
8E9390BB0565D6D300C7661C,
8E9390BC0565D6D300C7661C,
8E9390BD0565D6D300C7661C,
8E9390BE0565D6D300C7661C,
8E9390BF0565D6D300C7661C,
8E9390C00565D6D300C7661C,
8E9390C10565D6D300C7661C,
8E9390C20565D6D300C7661C,
8E9390C30565D6D300C7661C,
8E9390C40565D6D300C7661C,
8E9390C50565D6D300C7661C,
8E9390C60565D6D300C7661C,
8E9390C70565D6D300C7661C,
8E9390C80565D6D300C7661C,
8E9390C90565D6D300C7661C,
8E9390CA0565D6D300C7661C,
8E9390CB0565D6D300C7661C,
8E9390CC0565D6D300C7661C,
8E9390CD0565D6D300C7661C,
);
isa = PBXResourcesBuildPhase;
runOnlyForDeploymentPostprocessing = 0;
......@@ -671,17 +686,7 @@
children = (
F74F13EA02C2A79C01EE194C,
8E445F86047289E50059A3A7,
A064F9E003CB9EE000B21232,
A064F9E103CB9EE000B21232,
A064F9E203CB9EE000B21232,
A064F9E303CB9EE000B21232,
A064F9E403CB9EE000B21232,
A064F9E503CB9EE000B21232,
A064F9E603CB9EE000B21232,
A064F9E703CB9EE000B21232,
A064F9E803CB9EE000B21232,
A064F9E903CB9EE000B21232,
8E88833C03DD6E870059A3A7,
8ECA7E520563CD9500DFC000,
8EE1AFA30444660F0059A3A7,
F69B0CA602E24F6401A80112,
8ED6C29D03E2F32E0059A3A7,
......@@ -1203,16 +1208,366 @@
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E88833C03DD6E870059A3A7 = {
8E93909A0565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = slow.png;
path = Resources/slow.png;
refType = 4;
sourceTree = "<group>";
name = display_slider.png;
path = Resources/display_slider.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E93909B0565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = display_track.png;
path = Resources/display_track.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E93909C0565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = display.png;
path = Resources/display.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E88833D03DD6E870059A3A7 = {
fileRef = 8E88833C03DD6E870059A3A7;
8E93909D0565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = fullscreen_active.png;
path = Resources/fullscreen_active.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E93909E0565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = fullscreen_blue.png;
path = Resources/fullscreen_blue.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E93909F0565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = next_active.png;
path = Resources/next_active.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390A00565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = next_blue.png;
path = Resources/next_blue.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390A10565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = pause_blue.png;
path = Resources/pause_blue.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390A20565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = pause.png;
path = Resources/pause.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390A30565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = play_blue.png;
path = Resources/play_blue.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390A40565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = play.png;
path = Resources/play.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390A50565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = playlistdrawer_active.png;
path = Resources/playlistdrawer_active.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390A60565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = playlistdrawer_blue.png;
path = Resources/playlistdrawer_blue.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390A70565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = previous_active.png;
path = Resources/previous_active.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390A80565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = previous_blue.png;
path = Resources/previous_blue.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390A90565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = skip_forward_active.png;
path = Resources/skip_forward_active.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390AA0565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = skip_forward_blue.png;
path = Resources/skip_forward_blue.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390AB0565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = skip_previous_active.png;
path = Resources/skip_previous_active.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390AC0565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = skip_previous_blue.png;
path = Resources/skip_previous_blue.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390AD0565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = stop_blue.png;
path = Resources/stop_blue.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390AE0565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = stop.png;
path = Resources/stop.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390AF0565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = volume_high.png;
path = Resources/volume_high.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390B00565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = volume_low.png;
path = Resources/volume_low.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390B10565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = volumeslider_blue.png;
path = Resources/volumeslider_blue.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390B20565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = volumeslider_normal.png;
path = Resources/volumeslider_normal.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390B30565D6D300C7661C = {
expectedFileType = image.png;
isa = PBXFileReference;
name = volumetrack.png;
path = Resources/volumetrack.png;
refType = 2;
sourceTree = SOURCE_ROOT;
};
8E9390B40565D6D300C7661C = {
fileRef = 8E93909A0565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390B50565D6D300C7661C = {
fileRef = 8E93909B0565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390B60565D6D300C7661C = {
fileRef = 8E93909C0565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390B70565D6D300C7661C = {
fileRef = 8E93909D0565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390B80565D6D300C7661C = {
fileRef = 8E93909E0565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390B90565D6D300C7661C = {
fileRef = 8E93909F0565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390BA0565D6D300C7661C = {
fileRef = 8E9390A00565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390BB0565D6D300C7661C = {
fileRef = 8E9390A10565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390BC0565D6D300C7661C = {
fileRef = 8E9390A20565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390BD0565D6D300C7661C = {
fileRef = 8E9390A30565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390BE0565D6D300C7661C = {
fileRef = 8E9390A40565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390BF0565D6D300C7661C = {
fileRef = 8E9390A50565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390C00565D6D300C7661C = {
fileRef = 8E9390A60565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390C10565D6D300C7661C = {
fileRef = 8E9390A70565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390C20565D6D300C7661C = {
fileRef = 8E9390A80565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390C30565D6D300C7661C = {
fileRef = 8E9390A90565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390C40565D6D300C7661C = {
fileRef = 8E9390AA0565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390C50565D6D300C7661C = {
fileRef = 8E9390AB0565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390C60565D6D300C7661C = {
fileRef = 8E9390AC0565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390C70565D6D300C7661C = {
fileRef = 8E9390AD0565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390C80565D6D300C7661C = {
fileRef = 8E9390AE0565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390C90565D6D300C7661C = {
fileRef = 8E9390AF0565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390CA0565D6D300C7661C = {
fileRef = 8E9390B00565D6D300C7661C;
isa = PBXBuildFile;
settings = {
};
};
8E9390CB0565D6D300C7661C = {