[vlc-devel] commit: Change the fullscreen button in the fullscreen controller ( since clicking it switches from fullscreen and not to fullscreen). ( Antoine Cellerier )

[git version control]

vlc | branch: master | Antoine Cellerier <dionoea at videolan.org> | Sat Aug 23 17:13:25 2008 +0200| [b12cf41e38e26b8f982c3fdb6c5c2f5eda0fd681] | committer: Antoine Cellerier 

Change the fullscreen button in the fullscreen controller (since clicking it switches from fullscreen and not to fullscreen).

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=b12cf41e38e26b8f982c3fdb6c5c2f5eda0fd681
---

 modules/gui/qt4/Modules.am                       |    1 +
 modules/gui/qt4/components/interface_widgets.cpp |    2 ++
 modules/gui/qt4/pixmaps/toolbar/defullscreen.png |  Bin 0 -> 479 bytes
 modules/gui/qt4/vlc.qrc                          |    1 +
 4 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index db6e522..f252c67 100644
--- 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 a26111e..59207cd 100644
--- 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
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 e732f9d..579336f 100644
--- 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>