macosx: added additional artwork for the single fullscreen button in the detached...

derived from previous artwork for other single buttons

diff --git a/Makefile.am b/Makefile.am
index 178c901923869e8a1e14254c95ac11cd46fa4b7b..7f7902391c9aa3b0891b20f62749397755039f9a 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -187,8 +187,6 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/back.png \
        extras/package/macosx/Resources/mainwindow/bottom-background.png \
        extras/package/macosx/Resources/mainwindow/bottombar-mini.png \
-       extras/package/macosx/Resources/mainwindow_dark/bottomdark-left.png \
-       extras/package/macosx/Resources/mainwindow_dark/bottomdark-right.png \
        extras/package/macosx/Resources/mainwindow/dropzone-background.png \
        extras/package/macosx/Resources/mainwindow/dropzone.png \
        extras/package/macosx/Resources/mainwindow/effects-double-buttons-blue.png \
@@ -200,6 +198,8 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/forward.png \
        extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons-pressed.png \
        extras/package/macosx/Resources/mainwindow/fullscreen-double-buttons.png \
+       extras/package/macosx/Resources/mainwindow/fullscreen-one-button-pressed.png \
+       extras/package/macosx/Resources/mainwindow/fullscreen-one-button.png \
        extras/package/macosx/Resources/mainwindow/mini-progressbar-fill-left.png \
        extras/package/macosx/Resources/mainwindow/mini-progressbar-fill-middle.png \
        extras/package/macosx/Resources/mainwindow/mini-progressbar-fill-right.png \
@@ -233,6 +233,7 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/shuffle.png \
        extras/package/macosx/Resources/mainwindow/stop-pressed.png \
        extras/package/macosx/Resources/mainwindow/stop.png \
+       extras/package/macosx/Resources/mainwindow/topbar_background.png \
        extras/package/macosx/Resources/mainwindow/volume-high.png \
        extras/package/macosx/Resources/mainwindow/volume-low.png \
        extras/package/macosx/Resources/mainwindow/volume-slider-knob.png \
@@ -241,6 +242,8 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow_dark/back_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/bottom-background_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/bottombar-mini.png \
+       extras/package/macosx/Resources/mainwindow_dark/bottomdark-left.png \
+       extras/package/macosx/Resources/mainwindow_dark/bottomdark-right.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-blue_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/effects-double-buttons_dark.png \
@@ -250,6 +253,8 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow_dark/forward_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/fullscreen-double-buttons_dark.png \
+       extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button-pressed_dark.png \
+       extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/pause-pressed_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/pause_dark.png \
        extras/package/macosx/Resources/mainwindow_dark/play-pressed_dark.png \
@@ -286,8 +291,8 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-graphite.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-on-graphite.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-on.png \
-       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-over.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-over-graphite.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize-over.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-minimize.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-graphite.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/lion/lion-window-zoom-on-graphite.png \
@@ -301,11 +306,11 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close-over-graphite.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close-over.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-close.png \
+       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-graphite.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-on-graphite.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-on.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-over-graphite.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-over.png \
-       extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize-graphite.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-minimize.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-zoom-graphite.png \
        extras/package/macosx/Resources/mainwindow_dark/titlebar/snowleo/snowleo-window-zoom-on-graphite.png \

diff --git a/extras/package/macosx/Resources/mainwindow/fullscreen-one-button-pressed.png b/extras/package/macosx/Resources/mainwindow/fullscreen-one-button-pressed.png
new file mode 100644 (file)
index 0000000..6486ebb
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow/fullscreen-one-button-pressed.png differ

diff --git a/extras/package/macosx/Resources/mainwindow/fullscreen-one-button.png b/extras/package/macosx/Resources/mainwindow/fullscreen-one-button.png
new file mode 100644 (file)
index 0000000..ce8a839
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow/fullscreen-one-button.png differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button-pressed_dark.png b/extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button-pressed_dark.png
new file mode 100644 (file)
index 0000000..128d63d
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button-pressed_dark.png differ

diff --git a/extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button_dark.png b/extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button_dark.png
new file mode 100644 (file)
index 0000000..71dadf9
Binary files /dev/null and b/extras/package/macosx/Resources/mainwindow_dark/fullscreen-one-button_dark.png differ

diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 1118b0f5b874c7b7dced67357d5311d7dac49a94..6c72d98ecb026d2f52b2e4fdb433fdb5944f6f6e 100644 (file)
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -156,6 +156,10 @@
                CC0586BD14ACF7C000659A99 /* sidebar-pictures.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0586B714ACF7C000659A99 /* sidebar-pictures.png */; };
                CC0586BE14ACF7C000659A99 /* sidebar-playlist.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0586B814ACF7C000659A99 /* sidebar-playlist.png */; };
                CC0586BF14ACF7C000659A99 /* sidebar-podcast.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0586B914ACF7C000659A99 /* sidebar-podcast.png */; };
+               CC0F725215063C820086B6A0 /* fullscreen-one-button-pressed.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0F725015063C820086B6A0 /* fullscreen-one-button-pressed.png */; };
+               CC0F725315063C820086B6A0 /* fullscreen-one-button.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0F725115063C820086B6A0 /* fullscreen-one-button.png */; };
+               CC0F725715063C980086B6A0 /* fullscreen-one-button_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0F725515063C980086B6A0 /* fullscreen-one-button_dark.png */; };
+               CC0F725815063C980086B6A0 /* fullscreen-one-button-pressed_dark.png in Resources */ = {isa = PBXBuildFile; fileRef = CC0F725615063C980086B6A0 /* fullscreen-one-button-pressed_dark.png */; };
                CC1655D314EEA1DE00FAA66F /* bottomdark-left.png in Resources */ = {isa = PBXBuildFile; fileRef = CC1655D114EEA1DE00FAA66F /* bottomdark-left.png */; };
                CC1655D414EEA1DE00FAA66F /* bottomdark-right.png in Resources */ = {isa = PBXBuildFile; fileRef = CC1655D214EEA1DE00FAA66F /* bottomdark-right.png */; };
                CC206B3814ACFEAC007935C6 /* lion-window-close-graphite.png in Resources */ = {isa = PBXBuildFile; fileRef = CC206B1314ACFEAC007935C6 /* lion-window-close-graphite.png */; };
@@ -475,6 +479,10 @@
                CC0CD0E013DE0EAE00B0D90D /* PXSourceList.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; name = PXSourceList.m; path = ../../../modules/gui/macosx/PXSourceList.m; sourceTree = "<group>"; };
                CC0CD0E113DE0EAE00B0D90D /* PXSourceListDataSource.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PXSourceListDataSource.h; path = ../../../modules/gui/macosx/PXSourceListDataSource.h; sourceTree = "<group>"; };
                CC0CD0E213DE0EAE00B0D90D /* PXSourceListDelegate.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = PXSourceListDelegate.h; path = ../../../modules/gui/macosx/PXSourceListDelegate.h; sourceTree = "<group>"; };
+               CC0F725015063C820086B6A0 /* fullscreen-one-button-pressed.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fullscreen-one-button-pressed.png"; path = "Resources/mainwindow/fullscreen-one-button-pressed.png"; sourceTree = "<group>"; };
+               CC0F725115063C820086B6A0 /* fullscreen-one-button.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fullscreen-one-button.png"; path = "Resources/mainwindow/fullscreen-one-button.png"; sourceTree = "<group>"; };
+               CC0F725515063C980086B6A0 /* fullscreen-one-button_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fullscreen-one-button_dark.png"; path = "Resources/mainwindow_dark/fullscreen-one-button_dark.png"; sourceTree = "<group>"; };
+               CC0F725615063C980086B6A0 /* fullscreen-one-button-pressed_dark.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "fullscreen-one-button-pressed_dark.png"; path = "Resources/mainwindow_dark/fullscreen-one-button-pressed_dark.png"; sourceTree = "<group>"; };
                CC1655D114EEA1DE00FAA66F /* bottomdark-left.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottomdark-left.png"; path = "Resources/mainwindow_dark/bottomdark-left.png"; sourceTree = "<group>"; };
                CC1655D214EEA1DE00FAA66F /* bottomdark-right.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "bottomdark-right.png"; path = "Resources/mainwindow_dark/bottomdark-right.png"; sourceTree = "<group>"; };
                CC1941240B9C1F8400635F6B /* QTKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = QTKit.framework; path = /System/Library/Frameworks/QTKit.framework; sourceTree = "<absolute>"; };
@@ -867,6 +875,8 @@
                                CC04321913B246DF00D7D52E /* forward-pressed_dark.png */,
                                CC04321A13B246DF00D7D52E /* fullscreen-double-buttons_dark.png */,
                                CC04321B13B246DF00D7D52E /* fullscreen-double-buttons-pressed_dark.png */,
+                               CC0F725515063C980086B6A0 /* fullscreen-one-button_dark.png */,
+                               CC0F725615063C980086B6A0 /* fullscreen-one-button-pressed_dark.png */,
                                CC04321C13B246DF00D7D52E /* pause_dark.png */,
                                CC04321D13B246DF00D7D52E /* pause-pressed_dark.png */,
                                CC04321E13B246DF00D7D52E /* play_dark.png */,
@@ -922,6 +932,8 @@
                                CC04333613B28B8200D7D52E /* forward.png */,
                                CC04333713B28B8200D7D52E /* fullscreen-double-buttons-pressed.png */,
                                CC04333813B28B8200D7D52E /* fullscreen-double-buttons.png */,
+                               CC0F725015063C820086B6A0 /* fullscreen-one-button-pressed.png */,
+                               CC0F725115063C820086B6A0 /* fullscreen-one-button.png */,
                                CC04333913B28B8200D7D52E /* mini-progressbar-fill-left.png */,
                                CC04333A13B28B8200D7D52E /* mini-progressbar-fill-middle.png */,
                                CC04333B13B28B8200D7D52E /* mini-progressbar-fill-right.png */,
@@ -1521,6 +1533,10 @@
                                CC206B7014AD0A5D007935C6 /* window-fullscreen.png in Resources */,
                                CC1655D314EEA1DE00FAA66F /* bottomdark-left.png in Resources */,
                                CC1655D414EEA1DE00FAA66F /* bottomdark-right.png in Resources */,
+                               CC0F725215063C820086B6A0 /* fullscreen-one-button-pressed.png in Resources */,
+                               CC0F725315063C820086B6A0 /* fullscreen-one-button.png in Resources */,
+                               CC0F725715063C980086B6A0 /* fullscreen-one-button_dark.png in Resources */,
+                               CC0F725815063C980086B6A0 /* fullscreen-one-button-pressed_dark.png in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/modules/gui/macosx/MainWindow.m b/modules/gui/macosx/MainWindow.m
index 9b735ad6e9d5806b58b6c307ca5d314619ee6c15..c9b6e7971f9f1bb9a3dd0df9e4143e63d3b93230 100644 (file)
--- a/modules/gui/macosx/MainWindow.m
+++ b/modules/gui/macosx/MainWindow.m
@@ -200,8 +200,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
         }
         [o_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-double-buttons"]];
         [o_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-double-buttons-pressed"]];
-        [o_detached_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-double-buttons"]];
-        [o_detached_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-double-buttons-pressed"]];
+        [o_detached_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-one-button"]];
+        [o_detached_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-one-button-pressed"]];
         [o_time_sld_fancygradient_view setImagesLeft:[NSImage imageNamed:@"progression-fill-left"] middle:[NSImage imageNamed:@"progression-fill-middle"] right:[NSImage imageNamed:@"progression-fill-right"]];
         [o_detached_time_sld_fancygradient_view setImagesLeft:[NSImage imageNamed:@"progression-fill-left"] middle:[NSImage imageNamed:@"progression-fill-middle"] right:[NSImage imageNamed:@"progression-fill-right"]];
     }
@@ -252,8 +252,8 @@ static VLCMainWindow *_o_sharedInstance = nil;
         }
         [o_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-double-buttons_dark"]];
         [o_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-double-buttons-pressed_dark"]];
-        [o_detached_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-double-buttons_dark"]];
-        [o_detached_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-double-buttons-pressed_dark"]];
+        [o_detached_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-one-button_dark"]];
+        [o_detached_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-one-button-pressed_dark"]];
         [o_time_sld_fancygradient_view setImagesLeft:[NSImage imageNamed:@"progressbar-fill-left_dark"] middle:[NSImage imageNamed:@"progressbar-fill-middle_dark"] right:[NSImage imageNamed:@"progressbar-fill-right_dark"]];
         [o_detached_time_sld_fancygradient_view setImagesLeft:[NSImage imageNamed:@"progressbar-fill-left_dark"] middle:[NSImage imageNamed:@"progressbar-fill-middle_dark"] right:[NSImage imageNamed:@"progressbar-fill-right_dark"]];
     }