From: Jean-Baptiste Kempf <jb@videolan.org>
Date: Thu, 22 Jan 2009 11:47:12 +0000 (+0100)
Subject: Qt: Teletext handling simplifications and change of the icons to more clear ones.
X-Git-Tag: 1.0.0-pre1~1133
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;ds=sidebyside;h=856065411b00cdf989ab9c6753e7fa80507e84a6;p=vlc

Qt: Teletext handling simplifications and change of the icons to more clear ones.
---

diff --git a/modules/gui/qt4/Modules.am b/modules/gui/qt4/Modules.am
index d39cdb136d..a663ebe8db 100644
--- a/modules/gui/qt4/Modules.am
+++ b/modules/gui/qt4/Modules.am
@@ -137,7 +137,6 @@ DEPS_res = \
 	pixmaps/toolbar/skip_for.png \
 	pixmaps/toolbar/skip_back.png \
 	pixmaps/toolbar/tv.png \
-	pixmaps/toolbar/tvtelx-transparent.png \
 	pixmaps/toolbar/tvtelx.png \
 	pixmaps/toolbar/visu.png \
 	pixmaps/toolbar/volume-high.png \
diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
index 16639c4bdc..67d7d24d6e 100644
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
@@ -504,13 +504,14 @@ QFrame *AbstractController::telexFrame()
     BUTTON_SET_BAR2( telexTransparent, tvtelx,
                      qtr( "Toggle Transparency " ) );
     telexTransparent->setEnabled( false );
+    telexTransparent->setCheckable( true );
     telexLayout->addWidget( telexTransparent );
 
     /* Transparency change and set */
     CONNECT( telexTransparent, clicked( bool ),
             THEMIM->getIM(), telexSetTransparency( bool ) );
     CONNECT( THEMIM->getIM(), teletextTransparencyActivated( bool ),
-            telexFrame, toggleTeletextTransparency( bool ) );
+             telexTransparent, setChecked( bool ) );
 
 
     /* Page setting */
diff --git a/modules/gui/qt4/components/controller_widget.cpp b/modules/gui/qt4/components/controller_widget.cpp
index 5f424d2dd5..0b81f33055 100644
--- a/modules/gui/qt4/components/controller_widget.cpp
+++ b/modules/gui/qt4/components/controller_widget.cpp
@@ -119,12 +119,6 @@ void SoundWidget::updateVolume()
     }
 }
 
-void TeletextController::toggleTeletextTransparency( bool b_transparent )
-{
-    telexTransparent->setIcon( b_transparent ? QIcon( ":/tvtelx" )
-                                             : QIcon( ":/tvtelx-trans" ) );
-}
-
 void TeletextController::enableTeletextButtons( bool b_enabled )
 {
     telexOn->setChecked( b_enabled );
diff --git a/modules/gui/qt4/components/controller_widget.hpp b/modules/gui/qt4/components/controller_widget.hpp
index d6c622c0c2..8ce7579e26 100644
--- a/modules/gui/qt4/components/controller_widget.hpp
+++ b/modules/gui/qt4/components/controller_widget.hpp
@@ -72,7 +72,6 @@ private:
 
 private slots:
     void enableTeletextButtons( bool );
-    void toggleTeletextTransparency( bool );
 };
 
 #define VOLUME_MAX 200
diff --git a/modules/gui/qt4/dialogs/toolbar.cpp b/modules/gui/qt4/dialogs/toolbar.cpp
index 2a582f3f95..7812de4e32 100644
--- a/modules/gui/qt4/dialogs/toolbar.cpp
+++ b/modules/gui/qt4/dialogs/toolbar.cpp
@@ -289,7 +289,7 @@ WidgetListing::WidgetListing( intf_thread_t *p_intf, QWidget *_parent )
                 telexLayout->addWidget( telexOn );
 
                 QToolButton *telexTransparent = new QToolButton;
-                telexOn->setIcon( QIcon( ":/tvtelx-trans" ) );
+                telexOn->setIcon( QIcon( ":/tvtelx" ) );
                 telexLayout->addWidget( telexTransparent );
 
                 QSpinBox *telexPage = new QSpinBox;
diff --git a/modules/gui/qt4/pixmaps/toolbar/tv.png b/modules/gui/qt4/pixmaps/toolbar/tv.png
index 93350f93ab..1622fdaf99 100644
Binary files a/modules/gui/qt4/pixmaps/toolbar/tv.png and b/modules/gui/qt4/pixmaps/toolbar/tv.png differ
diff --git a/modules/gui/qt4/pixmaps/toolbar/tvtelx-transparent.png b/modules/gui/qt4/pixmaps/toolbar/tvtelx-transparent.png
deleted file mode 100644
index 4b3c164ba2..0000000000
Binary files a/modules/gui/qt4/pixmaps/toolbar/tvtelx-transparent.png and /dev/null differ
diff --git a/modules/gui/qt4/pixmaps/toolbar/tvtelx.png b/modules/gui/qt4/pixmaps/toolbar/tvtelx.png
index 34a6a23f50..dc358d2150 100644
Binary files a/modules/gui/qt4/pixmaps/toolbar/tvtelx.png and b/modules/gui/qt4/pixmaps/toolbar/tvtelx.png differ
diff --git a/modules/gui/qt4/vlc.qrc b/modules/gui/qt4/vlc.qrc
index 1cbff3b67b..39389db7c6 100644
--- a/modules/gui/qt4/vlc.qrc
+++ b/modules/gui/qt4/vlc.qrc
@@ -50,7 +50,6 @@
   <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>
   <file alias="record">pixmaps/toolbar/record_16px.png</file>