[vlc-commits] macosx: replaced previous/next buttons for the dark UI
Felix Paul Kühne
git at videolan.org
Fri Aug 31 13:15:54 CEST 2012
vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Fri Aug 31 13:15:27 2012 +0200| [3589fc7ae91e333b28a10c8f21f495513a6bbc05] | committer: Felix Paul Kühne
macosx: replaced previous/next buttons for the dark UI
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=3589fc7ae91e333b28a10c8f21f495513a6bbc05
---
Makefile.am | 16 ++++++++--------
.../mainwindow_dark/back-3btns-dark-pressed.png | Bin 0 -> 530 bytes
.../mainwindow_dark/back-3btns-dark-pressed at 2x.png | Bin 0 -> 963 bytes
.../Resources/mainwindow_dark/back-3btns-dark.png | Bin 0 -> 527 bytes
.../Resources/mainwindow_dark/back-3btns-dark at 2x.png | Bin 0 -> 943 bytes
.../Resources/mainwindow_dark/back-pressed_dark.png | Bin 1449 -> 0 bytes
.../Resources/mainwindow_dark/back-pressed_dark at 2x.png | Bin 1712 -> 0 bytes
.../macosx/Resources/mainwindow_dark/back_dark.png | Bin 1464 -> 0 bytes
.../macosx/Resources/mainwindow_dark/back_dark at 2x.png | Bin 1647 -> 0 bytes
.../mainwindow_dark/forward-3btns-dark-pressed.png | Bin 0 -> 529 bytes
.../mainwindow_dark/forward-3btns-dark-pressed at 2x.png | Bin 0 -> 975 bytes
.../Resources/mainwindow_dark/forward-3btns-dark.png | Bin 0 -> 523 bytes
.../mainwindow_dark/forward-3btns-dark at 2x.png | Bin 0 -> 942 bytes
.../Resources/mainwindow_dark/forward-pressed_dark.png | Bin 1450 -> 0 bytes
.../mainwindow_dark/forward-pressed_dark at 2x.png | Bin 1713 -> 0 bytes
.../macosx/Resources/mainwindow_dark/forward_dark.png | Bin 1450 -> 0 bytes
.../Resources/mainwindow_dark/forward_dark at 2x.png | Bin 1653 -> 0 bytes
modules/gui/macosx/MainWindow.m | 16 ++++++++--------
18 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/Makefile.am b/Makefile.am
index bc088f7..f774a15 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -295,10 +295,10 @@ EXTRA_DIST += \
extras/package/macosx/Resources/mainwindow/volume-slider-knob at 2x.png \
extras/package/macosx/Resources/mainwindow/volume-slider-track.png \
extras/package/macosx/Resources/mainwindow/volume-slider-track at 2x.png \
- extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark.png \
- extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark at 2x.png \
- extras/package/macosx/Resources/mainwindow_dark/back_dark.png \
- extras/package/macosx/Resources/mainwindow_dark/back_dark at 2x.png \
+ extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark-pressed.png \
+ extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark-pressed at 2x.png \
+ extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark.png \
+ extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark at 2x.png \
extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png \
extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark at 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 at 2x.png \
extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark.png \
extras/package/macosx/Resources/mainwindow_dark/effects-one-button_dark at 2x.png \
- extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark.png \
- extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark at 2x.png \
- extras/package/macosx/Resources/mainwindow_dark/forward_dark.png \
- extras/package/macosx/Resources/mainwindow_dark/forward_dark at 2x.png \
+ extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed.png \
+ extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed at 2x.png \
+ extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark.png \
+ extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark at 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 at 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
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 at 2x.png b/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark-pressed at 2x.png
new file mode 100644
index 0000000..a17ea44
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark-pressed at 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
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 at 2x.png b/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark at 2x.png
new file mode 100644
index 0000000..67fd6ae
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/back-3btns-dark at 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
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 at 2x.png b/extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark at 2x.png
deleted file mode 100644
index a6501b6..0000000
Binary files a/extras/package/macosx/Resources/mainwindow_dark/back-pressed_dark at 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
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 at 2x.png b/extras/package/macosx/Resources/mainwindow_dark/back_dark at 2x.png
deleted file mode 100644
index 69ace32..0000000
Binary files a/extras/package/macosx/Resources/mainwindow_dark/back_dark at 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
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 at 2x.png b/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed at 2x.png
new file mode 100644
index 0000000..72437cc
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark-pressed at 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
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 at 2x.png b/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark at 2x.png
new file mode 100644
index 0000000..553dd1d
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/forward-3btns-dark at 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
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 at 2x.png b/extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark at 2x.png
deleted file mode 100644
index b511c2b..0000000
Binary files a/extras/package/macosx/Resources/mainwindow_dark/forward-pressed_dark at 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
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 at 2x.png b/extras/package/macosx/Resources/mainwindow_dark/forward_dark at 2x.png
deleted file mode 100644
index 16cd226..0000000
Binary files a/extras/package/macosx/Resources/mainwindow_dark/forward_dark at 2x.png and /dev/null differ
diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 8e8e8f0..a053cb5 100644
--- 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"]];
More information about the vlc-commits
mailing list