macosx: use the updated forward/back buttons in the gray window

diff --git a/Makefile.am b/Makefile.am
index f774a15407e201eaf865b9980d76c7157acb4382..88ee825af84975d95bf4af20df98e4971d0a4f06 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -191,12 +191,16 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/icons/wav.icns \
        extras/package/macosx/Resources/icons/wma.icns \
        extras/package/macosx/Resources/icons/wmv.icns \
+       extras/package/macosx/Resources/mainwindow/back-3btns-pressed.png \
+       extras/package/macosx/Resources/mainwindow/back-3btns-pressed@2x.png \
+       extras/package/macosx/Resources/mainwindow/back-3btns.png \
+       extras/package/macosx/Resources/mainwindow/back-3btns@2x.png \
+       extras/package/macosx/Resources/mainwindow/back-6btns-pressed.png \
+       extras/package/macosx/Resources/mainwindow/back-6btns-pressed@2x.png \
+       extras/package/macosx/Resources/mainwindow/back-6btns.png \
+       extras/package/macosx/Resources/mainwindow/back-6btns@2x.png \
        extras/package/macosx/Resources/mainwindow/back-pressed-single.png \
-       extras/package/macosx/Resources/mainwindow/back-pressed.png \
-       extras/package/macosx/Resources/mainwindow/back-pressed@2x.png \
        extras/package/macosx/Resources/mainwindow/back-single.png \
-       extras/package/macosx/Resources/mainwindow/back.png \
-       extras/package/macosx/Resources/mainwindow/back@2x.png \
        extras/package/macosx/Resources/mainwindow/bottom-background.png \
        extras/package/macosx/Resources/mainwindow/bottom-background@2x.png \
        extras/package/macosx/Resources/mainwindow/bottombar-mini.png \
@@ -213,12 +217,16 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/effects-one-button-blue@2x.png \
        extras/package/macosx/Resources/mainwindow/effects-one-button.png \
        extras/package/macosx/Resources/mainwindow/effects-one-button@2x.png \
+       extras/package/macosx/Resources/mainwindow/forward-3btns-pressed.png \
+       extras/package/macosx/Resources/mainwindow/forward-3btns-pressed@2x.png \
+       extras/package/macosx/Resources/mainwindow/forward-3btns.png \
+       extras/package/macosx/Resources/mainwindow/forward-3btns@2x.png \
+       extras/package/macosx/Resources/mainwindow/forward-6btns-pressed.png \
+       extras/package/macosx/Resources/mainwindow/forward-6btns-pressed@2x.png \
+       extras/package/macosx/Resources/mainwindow/forward-6btns.png \
+       extras/package/macosx/Resources/mainwindow/forward-6btns@2x.png \
        extras/package/macosx/Resources/mainwindow/forward-pressed-single.png \
-       extras/package/macosx/Resources/mainwindow/forward-pressed.png \
-       extras/package/macosx/Resources/mainwindow/forward-pressed@2x.png \
        extras/package/macosx/Resources/mainwindow/forward-single.png \
-       extras/package/macosx/Resources/mainwindow/forward.png \
-       extras/package/macosx/Resources/mainwindow/forward@2x.png \
        extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons-pressed.png \
        extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons-pressed@2x.png \
        extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons.png \

diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 8755f50aa0b158bb081c1c396c97df0d8bca773f..8608f9f9c64e87e01bc96f16be1a51b1a9139219 100644 (file)
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -295,6 +295,14 @@
                CC973BA615F0D03900D5F650 /* back-3btns-dark-pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC973BA215F0D03900D5F650 /* back-3btns-dark-pressed@2x.png */; };
                CC973BA715F0D03900D5F650 /* back-3btns-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC973BA315F0D03900D5F650 /* back-3btns-dark.png */; };
                CC973BA815F0D03900D5F650 /* back-3btns-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC973BA415F0D03900D5F650 /* back-3btns-dark@2x.png */; };
+               CC973BAD15F0E13D00D5F650 /* back-3btns-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CC973BA915F0E13D00D5F650 /* back-3btns-pressed.png */; };
+               CC973BAE15F0E13D00D5F650 /* back-3btns-pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC973BAA15F0E13D00D5F650 /* back-3btns-pressed@2x.png */; };
+               CC973BAF15F0E13D00D5F650 /* back-3btns.png in Resources */ = {isa = PBXBuildFile; fileRef = CC973BAB15F0E13D00D5F650 /* back-3btns.png */; };
+               CC973BB015F0E13D00D5F650 /* back-3btns@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC973BAC15F0E13D00D5F650 /* back-3btns@2x.png */; };
+               CC973BB515F0E14400D5F650 /* forward-3btns-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CC973BB115F0E14400D5F650 /* forward-3btns-pressed.png */; };
+               CC973BB615F0E14400D5F650 /* forward-3btns-pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC973BB215F0E14400D5F650 /* forward-3btns-pressed@2x.png */; };
+               CC973BB715F0E14400D5F650 /* forward-3btns.png in Resources */ = {isa = PBXBuildFile; fileRef = CC973BB315F0E14400D5F650 /* forward-3btns.png */; };
+               CC973BB815F0E14400D5F650 /* forward-3btns@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC973BB415F0E14400D5F650 /* forward-3btns@2x.png */; };
                CC9B43AF13B29C79000205AE /* bottom-background.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9B43AE13B29C79000205AE /* bottom-background.png */; };
                CC9B43B113B29FCF000205AE /* bottom-background_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9B43B013B29FCF000205AE /* bottom-background_dark.png */; };
                CC9E5D7015975E2600D14E83 /* sidebar-local@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC9E5D6A15975E2600D14E83 /* sidebar-local@2x.png */; };
@@ -774,6 +782,14 @@
                CC973BA215F0D03900D5F650 /* back-3btns-dark-pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "back-3btns-dark-pressed@2x.png"; path = "Resources/mainwindow_dark/back-3btns-dark-pressed@2x.png"; sourceTree = "<group>"; };
                CC973BA315F0D03900D5F650 /* back-3btns-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "back-3btns-dark.png"; path = "Resources/mainwindow_dark/back-3btns-dark.png"; sourceTree = "<group>"; };
                CC973BA415F0D03900D5F650 /* back-3btns-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "back-3btns-dark@2x.png"; path = "Resources/mainwindow_dark/back-3btns-dark@2x.png"; sourceTree = "<group>"; };
+               CC973BA915F0E13D00D5F650 /* back-3btns-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "back-3btns-pressed.png"; path = "Resources/mainwindow/back-3btns-pressed.png"; sourceTree = "<group>"; };
+               CC973BAA15F0E13D00D5F650 /* back-3btns-pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "back-3btns-pressed@2x.png"; path = "Resources/mainwindow/back-3btns-pressed@2x.png"; sourceTree = "<group>"; };
+               CC973BAB15F0E13D00D5F650 /* back-3btns.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "back-3btns.png"; path = "Resources/mainwindow/back-3btns.png"; sourceTree = "<group>"; };
+               CC973BAC15F0E13D00D5F650 /* back-3btns@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "back-3btns@2x.png"; path = "Resources/mainwindow/back-3btns@2x.png"; sourceTree = "<group>"; };
+               CC973BB115F0E14400D5F650 /* forward-3btns-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "forward-3btns-pressed.png"; path = "Resources/mainwindow/forward-3btns-pressed.png"; sourceTree = "<group>"; };
+               CC973BB215F0E14400D5F650 /* forward-3btns-pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "forward-3btns-pressed@2x.png"; path = "Resources/mainwindow/forward-3btns-pressed@2x.png"; sourceTree = "<group>"; };
+               CC973BB315F0E14400D5F650 /* forward-3btns.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "forward-3btns.png"; path = "Resources/mainwindow/forward-3btns.png"; sourceTree = "<group>"; };
+               CC973BB415F0E14400D5F650 /* forward-3btns@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "forward-3btns@2x.png"; path = "Resources/mainwindow/forward-3btns@2x.png"; sourceTree = "<group>"; };
                CC9B43AE13B29C79000205AE /* bottom-background.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background.png"; path = "Resources/mainwindow/bottom-background.png"; sourceTree = "<group>"; };
                CC9B43B013B29FCF000205AE /* bottom-background_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottom-background_dark.png"; path = "Resources/mainwindow_dark/bottom-background_dark.png"; sourceTree = "<group>"; };
                CC9E3E7913D1CFCF00429A71 /* qtcapture.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = qtcapture.m; path = ../../../modules/access/qtcapture.m; sourceTree = "<group>"; };
@@ -1224,6 +1240,14 @@
                CC0432C213B2479E00D7D52E /* bright variant */ = {
                        isa = PBXGroup;
                        children = (
+                               CC973BA915F0E13D00D5F650 /* back-3btns-pressed.png */,
+                               CC973BAA15F0E13D00D5F650 /* back-3btns-pressed@2x.png */,
+                               CC973BAB15F0E13D00D5F650 /* back-3btns.png */,
+                               CC973BAC15F0E13D00D5F650 /* back-3btns@2x.png */,
+                               CC973BB115F0E14400D5F650 /* forward-3btns-pressed.png */,
+                               CC973BB215F0E14400D5F650 /* forward-3btns-pressed@2x.png */,
+                               CC973BB315F0E14400D5F650 /* forward-3btns.png */,
+                               CC973BB415F0E14400D5F650 /* forward-3btns@2x.png */,
                                CC04332B13B28B8200D7D52E /* back-pressed.png */,
                                CC04332C13B28B8200D7D52E /* back.png */,
                                CCE4057D15655B2100FA5CCA /* back-pressed-single.png */,
@@ -2043,6 +2067,14 @@
                                CC973BA615F0D03900D5F650 /* back-3btns-dark-pressed@2x.png in Resources */,
                                CC973BA715F0D03900D5F650 /* back-3btns-dark.png in Resources */,
                                CC973BA815F0D03900D5F650 /* back-3btns-dark@2x.png in Resources */,
+                               CC973BAD15F0E13D00D5F650 /* back-3btns-pressed.png in Resources */,
+                               CC973BAE15F0E13D00D5F650 /* back-3btns-pressed@2x.png in Resources */,
+                               CC973BAF15F0E13D00D5F650 /* back-3btns.png in Resources */,
+                               CC973BB015F0E13D00D5F650 /* back-3btns@2x.png in Resources */,
+                               CC973BB515F0E14400D5F650 /* forward-3btns-pressed.png in Resources */,
+                               CC973BB615F0E14400D5F650 /* forward-3btns-pressed@2x.png in Resources */,
+                               CC973BB715F0E14400D5F650 /* forward-3btns.png in Resources */,
+                               CC973BB815F0E14400D5F650 /* forward-3btns@2x.png in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index a053cb5408271f8dc1c0794711de87647947ced5..b5f9020fa791101eb0a05871c2863b13f0160eb2 100644 (file)
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -268,18 +268,18 @@ static VLCMainWindow *_o_sharedInstance = nil;
     if (!b_dark_interface) {
         [o_bottombar_view setImagesLeft: [NSImage imageNamed:@"bottom-background"] middle: [NSImage imageNamed:@"bottom-background"] right: [NSImage imageNamed:@"bottom-background"]];
         [o_detached_bottombar_view setImagesLeft: [NSImage imageNamed:@"bottom-background"] middle: [NSImage imageNamed:@"bottom-background"] right: [NSImage imageNamed:@"bottom-background"]];
-        [o_bwd_btn setImage: [NSImage imageNamed:@"back"]];
-        [o_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-pressed"]];
-        [o_detached_bwd_btn setImage: [NSImage imageNamed:@"back"]];
-        [o_detached_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-pressed"]];
+        [o_bwd_btn setImage: [NSImage imageNamed:@"back-3btns"]];
+        [o_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-3btns-pressed"]];
+        [o_detached_bwd_btn setImage: [NSImage imageNamed:@"back-3btns"]];
+        [o_detached_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-3btns-pressed"]];
         o_play_img = [[NSImage imageNamed:@"play"] retain];
         o_play_pressed_img = [[NSImage imageNamed:@"play-pressed"] retain];
         o_pause_img = [[NSImage imageNamed:@"pause"] retain];
         o_pause_pressed_img = [[NSImage imageNamed:@"pause-pressed"] retain];
-        [o_fwd_btn setImage: [NSImage imageNamed:@"forward"]];
-        [o_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-pressed"]];
-        [o_detached_fwd_btn setImage: [NSImage imageNamed:@"forward"]];
-        [o_detached_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-pressed"]];
+        [o_fwd_btn setImage: [NSImage imageNamed:@"forward-3btns"]];
+        [o_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-3btns-pressed"]];
+        [o_detached_fwd_btn setImage: [NSImage imageNamed:@"forward-3btns"]];
+        [o_detached_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-3btns-pressed"]];
         [o_stop_btn setImage: [NSImage imageNamed:@"stop"]];
         [o_stop_btn setAlternateImage: [NSImage imageNamed:@"stop-pressed"]];
         [o_playlist_btn setImage: [NSImage imageNamed:@"playlist-btn"]];