macosx: replaced previous/next buttons for the dark UI

diff --git a/Makefile.am b/Makefile.am
index bc088f78b40fb6bad61526d7b51eda19b07e74e8..f774a15407e201eaf865b9980d76c7157acb4382 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -295,10 +295,10 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/volume-slider-knob@2x.png \
        extras/package/macosx/Resources/mainwindow/volume-slider-track.png \
        extras/package/macosx/Resources/mainwindow/volume-slider-track@2x.png \
-       extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark.png \
-       extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark@2x.png \
-       extras/package/macosx/Resources/mainwindow_dark/back_dark.png \
-       extras/package/macosx/Resources/mainwindow_dark/back_dark@2x.png \
+       extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark-pressed.png \
+       extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark-pressed@2x.png \
+       extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark.png \
+       extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark@2x.png \
        extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark@2x.png \
        extras/package/macosx/Resources/mainwindow_dark/bottombar-mini.png \
@@ -316,10 +316,10 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow_dark/effects-one-button-blue_dark@2x.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark@2x.png \
-       extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark.png \
-       extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark@2x.png \
-       extras/package/macosx/Resources/mainwindow_dark/forward_dark.png \
-       extras/package/macosx/Resources/mainwindow_dark/forward_dark@2x.png \
+       extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed.png \
+       extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed@2x.png \
+       extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark.png \
+       extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark@2x.png \
        extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons-pressed_dark@2x.png \
        extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons_dark.png \

diff --git a/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark-pressed.png b/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark-pressed.png
new file mode 100644 (file)
index 0000000..3216a31
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark-pressed.png differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark-pressed@2x.png b/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark-pressed@2x.png
new file mode 100644 (file)
index 0000000..a17ea44
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark-pressed@2x.png differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark.png b/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark.png
new file mode 100644 (file)
index 0000000..5c4aeeb
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark.png differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark@2x.png b/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark@2x.png
new file mode 100644 (file)
index 0000000..67fd6ae
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark@2x.png differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark.png b/extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark.png
deleted file mode 100644 (file)
index 49cf2b6..0000000
Binary files a/extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark.png and /dev/null differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark@2x.png b/extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark@2x.png
deleted file mode 100644 (file)
index a6501b6..0000000
Binary files a/extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark@2x.png and /dev/null differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/back_dark.png b/extras/package/macosx/Resources/mainwindow_dark/back_dark.png
deleted file mode 100644 (file)
index 0f499eb..0000000
Binary files a/extras/package/macosx/Resources/mainwindow_dark/back_dark.png and /dev/null differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/back_dark@2x.png b/extras/package/macosx/Resources/mainwindow_dark/back_dark@2x.png
deleted file mode 100644 (file)
index 69ace32..0000000
Binary files a/extras/package/macosx/Resources/mainwindow_dark/back_dark@2x.png and /dev/null differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed.png b/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed.png
new file mode 100644 (file)
index 0000000..aa41784
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed.png differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed@2x.png b/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed@2x.png
new file mode 100644 (file)
index 0000000..72437cc
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed@2x.png differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark.png b/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark.png
new file mode 100644 (file)
index 0000000..f1f063f
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark.png differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark@2x.png b/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark@2x.png
new file mode 100644 (file)
index 0000000..553dd1d
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark@2x.png differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark.png b/extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark.png
deleted file mode 100644 (file)
index 68f0f08..0000000
Binary files a/extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark.png and /dev/null differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark@2x.png b/extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark@2x.png
deleted file mode 100644 (file)
index b511c2b..0000000
Binary files a/extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark@2x.png and /dev/null differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/forward_dark.png b/extras/package/macosx/Resources/mainwindow_dark/forward_dark.png
deleted file mode 100644 (file)
index b46dbff..0000000
Binary files a/extras/package/macosx/Resources/mainwindow_dark/forward_dark.png and /dev/null differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/forward_dark@2x.png b/extras/package/macosx/Resources/mainwindow_dark/forward_dark@2x.png
deleted file mode 100644 (file)
index 16cd226..0000000
Binary files a/extras/package/macosx/Resources/mainwindow_dark/forward_dark@2x.png and /dev/null differ

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 8e8e8f0769a69305805fb7a6736b357cf8d280a7..a053cb5408271f8dc1c0794711de87647947ced5 100644 (file)
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -320,18 +320,18 @@ static VLCMainWindow *_o_sharedInstance = nil;
     {
         [o_bottombar_view setImagesLeft: [NSImage imageNamed:@"bottomdark-left"] middle: [NSImage imageNamed:@"bottom-background_dark"] right: [NSImage imageNamed:@"bottomdark-right"]];
         [o_detached_bottombar_view setImagesLeft: [NSImage imageNamed:@"bottomdark-left"] middle: [NSImage imageNamed:@"bottom-background_dark"] right: [NSImage imageNamed:@"bottomdark-right"]];
-        [o_bwd_btn setImage: [NSImage imageNamed:@"back_dark"]];
-        [o_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-pressed_dark"]];
-        [o_detached_bwd_btn setImage: [NSImage imageNamed:@"back_dark"]];
-        [o_detached_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-pressed_dark"]];
+        [o_bwd_btn setImage: [NSImage imageNamed:@"back-3btns-dark"]];
+        [o_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-3btns-dark-pressed"]];
+        [o_detached_bwd_btn setImage: [NSImage imageNamed:@"back-3btns-dark"]];
+        [o_detached_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-3btns-dark-pressed"]];
         o_play_img = [[NSImage imageNamed:@"play_dark"] retain];
         o_play_pressed_img = [[NSImage imageNamed:@"play-pressed_dark"] retain];
         o_pause_img = [[NSImage imageNamed:@"pause_dark"] retain];
         o_pause_pressed_img = [[NSImage imageNamed:@"pause-pressed_dark"] retain];
-        [o_fwd_btn setImage: [NSImage imageNamed:@"forward_dark"]];
-        [o_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-pressed_dark"]];
-        [o_detached_fwd_btn setImage: [NSImage imageNamed:@"forward_dark"]];
-        [o_detached_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-pressed_dark"]];
+        [o_fwd_btn setImage: [NSImage imageNamed:@"forward-3btns-dark"]];
+        [o_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-3btns-dark-pressed"]];
+        [o_detached_fwd_btn setImage: [NSImage imageNamed:@"forward-3btns-dark"]];
+        [o_detached_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-3btns-dark-pressed"]];
         [o_stop_btn setImage: [NSImage imageNamed:@"stop_dark"]];
         [o_stop_btn setAlternateImage: [NSImage imageNamed:@"stop-pressed_dark"]];
         [o_playlist_btn setImage: [NSImage imageNamed:@"playlist_dark"]];