Change the fullscreen button in the fullscreen controller (since clicking it switches...

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index db6e522e67e81ff281500d574104cecaa567e562..f252c67a41af306a98a15d56ef5814f2e11806e2 100644 (file)
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -244,6 +244,7 @@ EXTRA_DIST += \
        pixmaps/toolbar/dvd_prev.png \
        pixmaps/toolbar/tv.png \
        pixmaps/toolbar/fullscreen.png \
+       pixmaps/toolbar/defullscreen.png \
        pixmaps/toolbar/tvtelx.png \
        pixmaps/toolbar/tvtelx-transparent.png \
        pixmaps/toolbar/volume-high.png \

diff --git a/modules/gui/qt4/components/interface_widgets.cpp b/modules/gui/qt4/components/interface_widgets.cpp
index a26111ef558005aaa654c282118ed401967ea21f..59207cd87b5353f9a5c7ee8cee3b381fb99bf64f 100644 (file)
--- a/modules/gui/qt4/components/interface_widgets.cpp
+++ b/modules/gui/qt4/components/interface_widgets.cpp
@@ -1032,6 +1032,8 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i,
     show();
 #endif
 
+    fullscreenButton->setIcon( QIcon( ":/defullscreen" ) );
+
     vlc_mutex_init_recursive( &lock );
 }
 

diff --git a/modules/gui/qt4/pixmaps/toolbar/defullscreen.png b/modules/gui/qt4/pixmaps/toolbar/defullscreen.png
new file mode 100644 (file)
index 0000000..3070720
Binary files /dev/null and b/modules/gui/qt4/pixmaps/toolbar/defullscreen.png differ

diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc
index e732f9d45bb24e18c4960b447b80a338ae8a5d7f..579336f802d397649891da939fe6fee258aa312f 100644 (file)
--- a/modules/gui/qt4/vlc.qrc
+++ b/modules/gui/qt4/vlc.qrc
@@ -49,6 +49,7 @@
   <file alias="type_playlist">pixmaps/types/type_playlist.png</file>
   <file alias="tv">pixmaps/toolbar/tv.png</file>
   <file alias="fullscreen">pixmaps/toolbar/fullscreen.png</file>
+  <file alias="defullscreen">pixmaps/toolbar/defullscreen.png</file>
   <file alias="tvtelx-trans">pixmaps/toolbar/tvtelx-transparent.png</file>
   <file alias="tvtelx">pixmaps/toolbar/tvtelx.png</file>
   <file alias="extended">pixmaps/toolbar/extended_16px.png</file>