Commit 85606541 authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

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

parent b737bf8b
...@@ -137,7 +137,6 @@ DEPS_res = \ ...@@ -137,7 +137,6 @@ DEPS_res = \
pixmaps/toolbar/skip_for.png \ pixmaps/toolbar/skip_for.png \
pixmaps/toolbar/skip_back.png \ pixmaps/toolbar/skip_back.png \
pixmaps/toolbar/tv.png \ pixmaps/toolbar/tv.png \
pixmaps/toolbar/tvtelx-transparent.png \
pixmaps/toolbar/tvtelx.png \ pixmaps/toolbar/tvtelx.png \
pixmaps/toolbar/visu.png \ pixmaps/toolbar/visu.png \
pixmaps/toolbar/volume-high.png \ pixmaps/toolbar/volume-high.png \
......
...@@ -504,13 +504,14 @@ QFrame *AbstractController::telexFrame() ...@@ -504,13 +504,14 @@ QFrame *AbstractController::telexFrame()
BUTTON_SET_BAR2( telexTransparent, tvtelx, BUTTON_SET_BAR2( telexTransparent, tvtelx,
qtr( "Toggle Transparency " ) ); qtr( "Toggle Transparency " ) );
telexTransparent->setEnabled( false ); telexTransparent->setEnabled( false );
telexTransparent->setCheckable( true );
telexLayout->addWidget( telexTransparent ); telexLayout->addWidget( telexTransparent );
/* Transparency change and set */ /* Transparency change and set */
CONNECT( telexTransparent, clicked( bool ), CONNECT( telexTransparent, clicked( bool ),
THEMIM->getIM(), telexSetTransparency( bool ) ); THEMIM->getIM(), telexSetTransparency( bool ) );
CONNECT( THEMIM->getIM(), teletextTransparencyActivated( bool ), CONNECT( THEMIM->getIM(), teletextTransparencyActivated( bool ),
telexFrame, toggleTeletextTransparency( bool ) ); telexTransparent, setChecked( bool ) );
/* Page setting */ /* Page setting */
......
...@@ -119,12 +119,6 @@ void SoundWidget::updateVolume() ...@@ -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 ) void TeletextController::enableTeletextButtons( bool b_enabled )
{ {
telexOn->setChecked( b_enabled ); telexOn->setChecked( b_enabled );
......
...@@ -72,7 +72,6 @@ private: ...@@ -72,7 +72,6 @@ private:
private slots: private slots:
void enableTeletextButtons( bool ); void enableTeletextButtons( bool );
void toggleTeletextTransparency( bool );
}; };
#define VOLUME_MAX 200 #define VOLUME_MAX 200
......
...@@ -289,7 +289,7 @@ WidgetListing::WidgetListing( intf_thread_t *p_intf, QWidget *_parent ) ...@@ -289,7 +289,7 @@ WidgetListing::WidgetListing( intf_thread_t *p_intf, QWidget *_parent )
telexLayout->addWidget( telexOn ); telexLayout->addWidget( telexOn );
QToolButton *telexTransparent = new QToolButton; QToolButton *telexTransparent = new QToolButton;
telexOn->setIcon( QIcon( ":/tvtelx-trans" ) ); telexOn->setIcon( QIcon( ":/tvtelx" ) );
telexLayout->addWidget( telexTransparent ); telexLayout->addWidget( telexTransparent );
QSpinBox *telexPage = new QSpinBox; QSpinBox *telexPage = new QSpinBox;
......
modules/gui/qt4/pixmaps/toolbar/tv.png

257 Bytes | W: | H:

modules/gui/qt4/pixmaps/toolbar/tv.png

317 Bytes | W: | H:

modules/gui/qt4/pixmaps/toolbar/tv.png
modules/gui/qt4/pixmaps/toolbar/tv.png
modules/gui/qt4/pixmaps/toolbar/tv.png
modules/gui/qt4/pixmaps/toolbar/tv.png
  • 2-up
  • Swipe
  • Onion skin
modules/gui/qt4/pixmaps/toolbar/tvtelx.png

325 Bytes | W: | H:

modules/gui/qt4/pixmaps/toolbar/tvtelx.png

353 Bytes | W: | H:

modules/gui/qt4/pixmaps/toolbar/tvtelx.png
modules/gui/qt4/pixmaps/toolbar/tvtelx.png
modules/gui/qt4/pixmaps/toolbar/tvtelx.png
modules/gui/qt4/pixmaps/toolbar/tvtelx.png
  • 2-up
  • Swipe
  • Onion skin
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
<file alias="tv">pixmaps/toolbar/tv.png</file> <file alias="tv">pixmaps/toolbar/tv.png</file>
<file alias="fullscreen">pixmaps/toolbar/fullscreen.png</file> <file alias="fullscreen">pixmaps/toolbar/fullscreen.png</file>
<file alias="defullscreen">pixmaps/toolbar/defullscreen.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="tvtelx">pixmaps/toolbar/tvtelx.png</file>
<file alias="extended">pixmaps/toolbar/extended_16px.png</file> <file alias="extended">pixmaps/toolbar/extended_16px.png</file>
<file alias="record">pixmaps/toolbar/record_16px.png</file> <file alias="record">pixmaps/toolbar/record_16px.png</file>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment