Skip to content

V
vlc
Commit cc624f13 authored by Felix Paul Kühne's avatar Felix Paul Kühne
Browse files
Options

macosx: implemented graphics for the single playlist button state

parent 034d3bab
Show whitespace changes
Inline Side-by-side
Showing with 68 additions and 10 deletions
Makefile.am
View file @ cc624f13
...@@ -250,6 +250,10 @@ EXTRA_DIST += \ ...@@ -250,6 +250,10 @@ EXTRA_DIST += \
extras/package/macosx/Resources/mainwindow/play-pressed@2x.png \ extras/package/macosx/Resources/mainwindow/play-pressed@2x.png \
extras/package/macosx/Resources/mainwindow/play.png \ extras/package/macosx/Resources/mainwindow/play.png \
extras/package/macosx/Resources/mainwindow/play@2x.png \ extras/package/macosx/Resources/mainwindow/play@2x.png \
extras/package/macosx/Resources/mainwindow/playlist-1btn-pressed.png \
extras/package/macosx/Resources/mainwindow/playlist-1btn-pressed@2x.png \
extras/package/macosx/Resources/mainwindow/playlist-1btn.png \
extras/package/macosx/Resources/mainwindow/playlist-1btn@2x.png \
extras/package/macosx/Resources/mainwindow/playlist-btn-blue.png \ extras/package/macosx/Resources/mainwindow/playlist-btn-blue.png \
extras/package/macosx/Resources/mainwindow/playlist-btn-blue@2x.png \ extras/package/macosx/Resources/mainwindow/playlist-btn-blue@2x.png \
extras/package/macosx/Resources/mainwindow/playlist-btn-pressed.png \ extras/package/macosx/Resources/mainwindow/playlist-btn-pressed.png \
...@@ -344,6 +348,10 @@ EXTRA_DIST += \ ...@@ -344,6 +348,10 @@ EXTRA_DIST += \
extras/package/macosx/Resources/mainwindow_dark/play-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/play-pressed_dark@2x.png \
extras/package/macosx/Resources/mainwindow_dark/play_dark.png \ extras/package/macosx/Resources/mainwindow_dark/play_dark.png \
extras/package/macosx/Resources/mainwindow_dark/play_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/play_dark@2x.png \
extras/package/macosx/Resources/mainwindow_dark/playlist-1btn-dark-pressed.png \
extras/package/macosx/Resources/mainwindow_dark/playlist-1btn-dark-pressed@2x.png \
extras/package/macosx/Resources/mainwindow_dark/playlist-1btn-dark.png \
extras/package/macosx/Resources/mainwindow_dark/playlist-1btn-dark@2x.png \
extras/package/macosx/Resources/mainwindow_dark/playlist-blue-pressed_dark.png \ extras/package/macosx/Resources/mainwindow_dark/playlist-blue-pressed_dark.png \
extras/package/macosx/Resources/mainwindow_dark/playlist-blue-pressed_dark@2x.png \ extras/package/macosx/Resources/mainwindow_dark/playlist-blue-pressed_dark@2x.png \
extras/package/macosx/Resources/mainwindow_dark/playlist-blue_dark.png \ extras/package/macosx/Resources/mainwindow_dark/playlist-blue_dark.png \
......
extras/package/macosx/vlc.xcodeproj/project.pbxproj
View file @ cc624f13
...@@ -198,6 +198,14 @@ ...@@ -198,6 +198,14 @@
CC206B6E14AD0A5D007935C6 /* window-fullscreen-on.png in Resources */ = {isa = PBXBuildFile; fileRef = CC206B6B14AD0A5D007935C6 /* window-fullscreen-on.png */; }; CC206B6E14AD0A5D007935C6 /* window-fullscreen-on.png in Resources */ = {isa = PBXBuildFile; fileRef = CC206B6B14AD0A5D007935C6 /* window-fullscreen-on.png */; };
CC206B6F14AD0A5D007935C6 /* window-fullscreen-over.png in Resources */ = {isa = PBXBuildFile; fileRef = CC206B6C14AD0A5D007935C6 /* window-fullscreen-over.png */; }; CC206B6F14AD0A5D007935C6 /* window-fullscreen-over.png in Resources */ = {isa = PBXBuildFile; fileRef = CC206B6C14AD0A5D007935C6 /* window-fullscreen-over.png */; };
CC206B7014AD0A5D007935C6 /* window-fullscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = CC206B6D14AD0A5D007935C6 /* window-fullscreen.png */; }; CC206B7014AD0A5D007935C6 /* window-fullscreen.png in Resources */ = {isa = PBXBuildFile; fileRef = CC206B6D14AD0A5D007935C6 /* window-fullscreen.png */; };
CC3F2E8C15F5038F009D7F39 /* playlist-1btn-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CC3F2E8815F5038F009D7F39 /* playlist-1btn-pressed.png */; };
CC3F2E8D15F5038F009D7F39 /* playlist-1btn-pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC3F2E8915F5038F009D7F39 /* playlist-1btn-pressed@2x.png */; };
CC3F2E8E15F5038F009D7F39 /* playlist-1btn.png in Resources */ = {isa = PBXBuildFile; fileRef = CC3F2E8A15F5038F009D7F39 /* playlist-1btn.png */; };
CC3F2E8F15F5038F009D7F39 /* playlist-1btn@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC3F2E8B15F5038F009D7F39 /* playlist-1btn@2x.png */; };
CC3F2E9515F5039F009D7F39 /* playlist-1btn-dark-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CC3F2E9115F5039F009D7F39 /* playlist-1btn-dark-pressed.png */; };
CC3F2E9615F5039F009D7F39 /* playlist-1btn-dark-pressed@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC3F2E9215F5039F009D7F39 /* playlist-1btn-dark-pressed@2x.png */; };
CC3F2E9715F5039F009D7F39 /* playlist-1btn-dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC3F2E9315F5039F009D7F39 /* playlist-1btn-dark.png */; };
CC3F2E9815F5039F009D7F39 /* playlist-1btn-dark@2x.png in Resources */ = {isa = PBXBuildFile; fileRef = CC3F2E9415F5039F009D7F39 /* playlist-1btn-dark@2x.png */; };
CC3F9F861350B2A000B0E885 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC3F9F851350B2A000B0E885 /* Growl.framework */; }; CC3F9F861350B2A000B0E885 /* Growl.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CC3F9F851350B2A000B0E885 /* Growl.framework */; };
CC402EB80E00ABBB006A4BA4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F69B0CA602E24F6401A80112 /* InfoPlist.strings */; }; CC402EB80E00ABBB006A4BA4 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = F69B0CA602E24F6401A80112 /* InfoPlist.strings */; };
CC402EB90E00ABBB006A4BA4 /* vlc.scriptSuite in Resources */ = {isa = PBXBuildFile; fileRef = 8EBF3FA303F13FFB0059A3A7 /* vlc.scriptSuite */; }; CC402EB90E00ABBB006A4BA4 /* vlc.scriptSuite in Resources */ = {isa = PBXBuildFile; fileRef = 8EBF3FA303F13FFB0059A3A7 /* vlc.scriptSuite */; };
...@@ -652,6 +660,14 @@ ...@@ -652,6 +660,14 @@
CC269A4615E7947F00F2FDC9 /* StringUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = StringUtility.h; path = ../../../modules/gui/macosx/StringUtility.h; sourceTree = "<group>"; }; CC269A4615E7947F00F2FDC9 /* StringUtility.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = StringUtility.h; path = ../../../modules/gui/macosx/StringUtility.h; sourceTree = "<group>"; };
CC269A4715E7947F00F2FDC9 /* StringUtility.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = StringUtility.m; path = ../../../modules/gui/macosx/StringUtility.m; sourceTree = "<group>"; }; CC269A4715E7947F00F2FDC9 /* StringUtility.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = StringUtility.m; path = ../../../modules/gui/macosx/StringUtility.m; sourceTree = "<group>"; };
CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; }; CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
CC3F2E8815F5038F009D7F39 /* playlist-1btn-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-1btn-pressed.png"; path = "Resources/mainwindow/playlist-1btn-pressed.png"; sourceTree = "<group>"; };
CC3F2E8915F5038F009D7F39 /* playlist-1btn-pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-1btn-pressed@2x.png"; path = "Resources/mainwindow/playlist-1btn-pressed@2x.png"; sourceTree = "<group>"; };
CC3F2E8A15F5038F009D7F39 /* playlist-1btn.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-1btn.png"; path = "Resources/mainwindow/playlist-1btn.png"; sourceTree = "<group>"; };
CC3F2E8B15F5038F009D7F39 /* playlist-1btn@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-1btn@2x.png"; path = "Resources/mainwindow/playlist-1btn@2x.png"; sourceTree = "<group>"; };
CC3F2E9115F5039F009D7F39 /* playlist-1btn-dark-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-1btn-dark-pressed.png"; path = "Resources/mainwindow_dark/playlist-1btn-dark-pressed.png"; sourceTree = "<group>"; };
CC3F2E9215F5039F009D7F39 /* playlist-1btn-dark-pressed@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-1btn-dark-pressed@2x.png"; path = "Resources/mainwindow_dark/playlist-1btn-dark-pressed@2x.png"; sourceTree = "<group>"; };
CC3F2E9315F5039F009D7F39 /* playlist-1btn-dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-1btn-dark.png"; path = "Resources/mainwindow_dark/playlist-1btn-dark.png"; sourceTree = "<group>"; };
CC3F2E9415F5039F009D7F39 /* playlist-1btn-dark@2x.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "playlist-1btn-dark@2x.png"; path = "Resources/mainwindow_dark/playlist-1btn-dark@2x.png"; sourceTree = "<group>"; };
CC3F9F851350B2A000B0E885 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = ../../../contrib/Growl.framework; sourceTree = "<absolute>"; }; CC3F9F851350B2A000B0E885 /* Growl.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Growl.framework; path = ../../../contrib/Growl.framework; sourceTree = "<absolute>"; };
CC402F4B0E00ABBB006A4BA4 /* VLC.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VLC.bundle; sourceTree = BUILT_PRODUCTS_DIR; }; CC402F4B0E00ABBB006A4BA4 /* VLC.bundle */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = VLC.bundle; sourceTree = BUILT_PRODUCTS_DIR; };
CC426FD01020D44F00A32659 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ../../../contrib/Sparkle.framework; sourceTree = "<absolute>"; }; CC426FD01020D44F00A32659 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = ../../../contrib/Sparkle.framework; sourceTree = "<absolute>"; };
...@@ -1117,6 +1133,10 @@ ...@@ -1117,6 +1133,10 @@
CC04326513B246E600D7D52E /* dark variant */ = { CC04326513B246E600D7D52E /* dark variant */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
CC3F2E9115F5039F009D7F39 /* playlist-1btn-dark-pressed.png */,
CC3F2E9215F5039F009D7F39 /* playlist-1btn-dark-pressed@2x.png */,
CC3F2E9315F5039F009D7F39 /* playlist-1btn-dark.png */,
CC3F2E9415F5039F009D7F39 /* playlist-1btn-dark@2x.png */,
CC973BA115F0D03900D5F650 /* back-3btns-dark-pressed.png */, CC973BA115F0D03900D5F650 /* back-3btns-dark-pressed.png */,
CC973BA215F0D03900D5F650 /* back-3btns-dark-pressed@2x.png */, CC973BA215F0D03900D5F650 /* back-3btns-dark-pressed@2x.png */,
CC973BA315F0D03900D5F650 /* back-3btns-dark.png */, CC973BA315F0D03900D5F650 /* back-3btns-dark.png */,
...@@ -1224,6 +1244,10 @@ ...@@ -1224,6 +1244,10 @@
CC0432C213B2479E00D7D52E /* bright variant */ = { CC0432C213B2479E00D7D52E /* bright variant */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
CC3F2E8815F5038F009D7F39 /* playlist-1btn-pressed.png */,
CC3F2E8915F5038F009D7F39 /* playlist-1btn-pressed@2x.png */,
CC3F2E8A15F5038F009D7F39 /* playlist-1btn.png */,
CC3F2E8B15F5038F009D7F39 /* playlist-1btn@2x.png */,
CC973BA915F0E13D00D5F650 /* back-3btns-pressed.png */, CC973BA915F0E13D00D5F650 /* back-3btns-pressed.png */,
CC973BAA15F0E13D00D5F650 /* back-3btns-pressed@2x.png */, CC973BAA15F0E13D00D5F650 /* back-3btns-pressed@2x.png */,
CC973BAB15F0E13D00D5F650 /* back-3btns.png */, CC973BAB15F0E13D00D5F650 /* back-3btns.png */,
...@@ -2043,6 +2067,14 @@ ...@@ -2043,6 +2067,14 @@
CC973BB615F0E14400D5F650 /* forward-3btns-pressed@2x.png in Resources */, CC973BB615F0E14400D5F650 /* forward-3btns-pressed@2x.png in Resources */,
CC973BB715F0E14400D5F650 /* forward-3btns.png in Resources */, CC973BB715F0E14400D5F650 /* forward-3btns.png in Resources */,
CC973BB815F0E14400D5F650 /* forward-3btns@2x.png in Resources */, CC973BB815F0E14400D5F650 /* forward-3btns@2x.png in Resources */,
CC3F2E8C15F5038F009D7F39 /* playlist-1btn-pressed.png in Resources */,
CC3F2E8D15F5038F009D7F39 /* playlist-1btn-pressed@2x.png in Resources */,
CC3F2E8E15F5038F009D7F39 /* playlist-1btn.png in Resources */,
CC3F2E8F15F5038F009D7F39 /* playlist-1btn@2x.png in Resources */,
CC3F2E9515F5039F009D7F39 /* playlist-1btn-dark-pressed.png in Resources */,
CC3F2E9615F5039F009D7F39 /* playlist-1btn-dark-pressed@2x.png in Resources */,
CC3F2E9715F5039F009D7F39 /* playlist-1btn-dark.png in Resources */,
CC3F2E9815F5039F009D7F39 /* playlist-1btn-dark@2x.png in Resources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };
......
modules/gui/macosx/MainWindow.m
View file @ cc624f13
...@@ -878,7 +878,24 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -878,7 +878,24 @@ static VLCMainWindow *_o_sharedInstance = nil;
NSRect frame; NSRect frame;
float f_space = [o_repeat_btn frame].size.width + [o_shuffle_btn frame].size.width - 6.; float f_space = [o_repeat_btn frame].size.width + [o_shuffle_btn frame].size.width - 6.;
// FIXME: switch o_playlist_btn artwork if (b_dark_interface) {
[[o_playlist_btn animator] setImage:[NSImage imageNamed:@"playlist_dark"]];
[[o_playlist_btn animator] setAlternateImage:[NSImage imageNamed:@"playlist-pressed_dark"]];
} else {
[[o_playlist_btn animator] setImage:[NSImage imageNamed:@"playlist-btn"]];
[[o_playlist_btn animator] setAlternateImage:[NSImage imageNamed:@"playlist-btn-pressed"]];
}
frame = [o_playlist_btn frame];
frame.size.width--;
[o_playlist_btn setFrame:frame];
if (b_fast) {
[o_repeat_btn setHidden: NO];
[o_shuffle_btn setHidden: NO];
} else {
[[o_repeat_btn animator] setHidden: NO];
[[o_shuffle_btn animator] setHidden: NO];
}
#define resizeItem( item ) \ #define resizeItem( item ) \
frame = [item frame]; \ frame = [item frame]; \
...@@ -894,14 +911,6 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -894,14 +911,6 @@ static VLCMainWindow *_o_sharedInstance = nil;
resizeItem( o_time_sld_background ); resizeItem( o_time_sld_background );
resizeItem( o_time_sld_fancygradient_view ); resizeItem( o_time_sld_fancygradient_view );
#undef resizeItem #undef resizeItem
if (b_fast) {
[o_repeat_btn setHidden: NO];
[o_shuffle_btn setHidden: NO];
} else {
[[o_repeat_btn animator] setHidden: NO];
[[o_shuffle_btn animator] setHidden: NO];
}
} }
- (void)removePlaymodeButtons:(BOOL)b_fast - (void)removePlaymodeButtons:(BOOL)b_fast
...@@ -911,7 +920,16 @@ static VLCMainWindow *_o_sharedInstance = nil; ...@@ -911,7 +920,16 @@ static VLCMainWindow *_o_sharedInstance = nil;
[o_repeat_btn setHidden: YES]; [o_repeat_btn setHidden: YES];
[o_shuffle_btn setHidden: YES]; [o_shuffle_btn setHidden: YES];
// FIXME: switch o_playlist_btn artwork if (b_dark_interface) {
[[o_playlist_btn animator] setImage:[NSImage imageNamed:@"playlist-1btn-dark"]];
[[o_playlist_btn animator] setAlternateImage:[NSImage imageNamed:@"playlist-1btn-dark-pressed"]];
} else {
[[o_playlist_btn animator] setImage:[NSImage imageNamed:@"playlist-1btn"]];
[[o_playlist_btn animator] setAlternateImage:[NSImage imageNamed:@"playlist-1btn-pressed"]];
}
frame = [o_playlist_btn frame];
frame.size.width++;
[o_playlist_btn setFrame:frame];
#define resizeItem( item ) \ #define resizeItem( item ) \
frame = [item frame]; \ frame = [item frame]; \
......
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