From 856065411b00cdf989ab9c6753e7fa80507e84a6 Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Kempf Date: Thu, 22 Jan 2009 12:47:12 +0100 Subject: [PATCH] Qt: Teletext handling simplifications and change of the icons to more clear ones. --- modules/gui/qt4/Modules.am | 1 - modules/gui/qt4/components/controller.cpp | 3 ++- .../gui/qt4/components/controller_widget.cpp | 6 ------ .../gui/qt4/components/controller_widget.hpp | 1 - modules/gui/qt4/dialogs/toolbar.cpp | 2 +- modules/gui/qt4/pixmaps/toolbar/tv.png | Bin 257 -> 317 bytes .../qt4/pixmaps/toolbar/tvtelx-transparent.png | Bin 336 -> 0 bytes modules/gui/qt4/pixmaps/toolbar/tvtelx.png | Bin 325 -> 353 bytes modules/gui/qt4/vlc.qrc | 1 - 9 files changed, 3 insertions(+), 11 deletions(-) delete mode 100644 modules/gui/qt4/pixmaps/toolbar/tvtelx-transparent.png 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 93350f93ab33644930b54157685767fcdcbe3b0f..1622fdaf995ead681474bdbd73e05267ee901b38 100644 GIT binary patch delta 290 zcmV+-0p0$A0=)u|B!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy zVP|DhWnpA_ami&o0002bNklPHsxF`~3_yt@DkhSobO23949wzE(&De)yf+mVKCiK>z>%07*qoM6N<$f}#w6KL7v# delta 229 zcmdnX)W|eJrJk`k$lZxy-8q?;3=9lxN#5=*4F5rJ!QSPQfg+p*9+AZi419+{nDKc2 ziWHzAdx@v7EBg&L5iUiZS2lO20EHSoT^vI!POrUeDAb_9!*by8#uMUBr~l7);f~+o zr!6YLdL+bP^4?cWK7E@1Zm%#_{dO5TCP3~P=ztAvO$>?*umeCe@suF bHBUCZGlTorclEVE*D!dx`njxgN@xNAtcq55 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 4b3c164ba2dba9c925c12f03c1129c64d94da8a5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 336 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|*pj^6T^Rm@ z;DWu&Cj&(|3p^r=85sBugD~Uq{1qucLG}_)Usv`UY$80|77Oxb?gk27@N{tuu{gbV zvLn|a0|D3gHBmX@nj+##>$ujvxp%ulz5lW7t{{Py$nQMUE)^!O4ooTyoFgzp;NKbL zpUlkdbvMEvyqF`Oc<)GuM}E7`>6%;Bse*y6P74JDm&PhBTEKPdng679U1f92e}CqT zxV>TCvB_;IX)|scnsG%e6TDsXbdrrmh>I1|)jqetuL2e#aZC(35sw8z%((PUo80;{ z^?`u@ESs4#kKVt(Acs>dzHTAYp|~c0y9~}geU|+@E<8UrG28q3BLA3OQjaB<#UJ7^ b+h^`+|3P^7$<8Z4zcF~a`njxgN@xNAP-KA~ diff --git a/modules/gui/qt4/pixmaps/toolbar/tvtelx.png b/modules/gui/qt4/pixmaps/toolbar/tvtelx.png index 34a6a23f50048e560047681991ebb9cfab32ac9a..dc358d2150248da71494198ac09f6bae254602de 100644 GIT binary patch delta 326 zcmV-M0lEIg0^tIXB!2{FK}|sb0I$e51&Zka000?uMObuGZ)S9NVRB^vL1b@YWgtmy zVP|DhWnpA_ami&o0002t=$!=Ify-wJx3EzDhRGc z@DjCq>B>bCXNK6;Vl{E#(R4a*`rahz9gaH&u?1|HUnGEd@P8uDCJQh2<$9(c_K`dt z&zUjC3&=q(Dqz}ZmSsaP1!4H0Cp9oy6IP=WCHG~(7?<5_$*I0-px{M=EM=3pW{9q6 z)K(S@U|%k61$-3I7Xz9&bpx#^!L4j5e@%cBr?#M=0Z2;I$Z>?4I1L3jMB}NTWdUa( zgu8+_3+Uf_20!M*Hl||jsGzltcqoG4?sXEa0J;lFp68VfS0D$us368waV!41&QAdb Y03g5L9D}$nUjP6A07*qoM6N<$g58RTpa1{> delta 298 zcmV+_0oDHD0>uK5B!2;OQb$4nuFf3k00006VoOIv0RI600RN!9r;`8x010qNS#tmY z4#NNd4#NS*Z>VGd000McNliru*aj2~3n|Lpxk&&30L4i}K~y-)V_={VFrxAQld6vq zU2}bXJzkxSjg43>|Ifg{@V~yk{{MdlhX4PeYz8Q-udjy*Lx0%}Fbp^4Kg{O6A50k- z7#JA%+5a$bv;Jcc;ACVFyk;H51tKgAU30fXU4W{7)CB}w wu&O19VHN=wFe8$Z3bCa|ijy+MnTcWm06tK8m?3JKz5oCK07*qoM6N<$g1~osK>z>% 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 @@ pixmaps/toolbar/tv.png pixmaps/toolbar/fullscreen.png pixmaps/toolbar/defullscreen.png - pixmaps/toolbar/tvtelx-transparent.png pixmaps/toolbar/tvtelx.png pixmaps/toolbar/extended_16px.png pixmaps/toolbar/record_16px.png -- 2.39.2