Skip to content

Commit

Permalink
Qt: implement teletext buttons (fix #11132)
Browse files Browse the repository at this point in the history
  • Loading branch information
fcartegnie committed Apr 3, 2014
1 parent 39ba1df commit 06ee1e1
Show file tree
Hide file tree
Showing 2 changed files with 35 additions and 0 deletions.
1 change: 1 addition & 0 deletions NEWS
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,7 @@ Interfaces:
Misc:
* New module for TLS on OS X and iOS
* Windows installer will kill running instance before installing
* Teletext navigation buttons support in Qt4 gui

Removed modules:
* ios video output: use ios2
Expand Down
34 changes: 34 additions & 0 deletions modules/gui/qt4/components/controller.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -616,6 +616,40 @@ QFrame *AbstractController::telexFrame()
telexPage->setEnabled( false );
telexLayout->addWidget( telexPage );

/* Contextual & Index Buttons */
QSignalMapper *contextButtonMapper = new QSignalMapper( this );
QToolButton *contextButton = NULL;
QPixmap iconPixmap( telexOn->minimumHeight(), telexOn->minimumHeight() );
iconPixmap.fill( Qt::transparent );
QPainter iconPixmapPainter( &iconPixmap );
QRadialGradient iconPixmapPainterGradient( iconPixmap.rect().center(),
iconPixmap.rect().width() / 2,
iconPixmap.rect().center() / 2 );

#define CREATE_CONTEXT_BUTTON(color, key) \
iconPixmapPainterGradient.setColorAt( 0, QColor( color ).lighter(150) );\
iconPixmapPainterGradient.setColorAt( 1.0, QColor( color ) );\
iconPixmapPainter.setBrush( iconPixmapPainterGradient );\
iconPixmapPainter.drawEllipse( iconPixmap.rect().adjusted( 0, 0, -1, -1 ) );\
contextButton = new QToolButton();\
setupButton( contextButton );\
contextButton->setIcon( iconPixmap );\
contextButton->setEnabled( false );\
contextButtonMapper->setMapping( contextButton, key << 16 );\
CONNECT( contextButton, clicked(), contextButtonMapper, map() );\
CONNECT( contextButtonMapper, mapped( int ),\
THEMIM->getIM(), telexSetPage( int ) );\
CONNECT( THEMIM->getIM(), teletextActivated( bool ), contextButton, setEnabled( bool ) );\
telexLayout->addWidget( contextButton )

CREATE_CONTEXT_BUTTON("grey", 'i'); /* index */
CREATE_CONTEXT_BUTTON("red", 'r');
CREATE_CONTEXT_BUTTON("green", 'g');
CREATE_CONTEXT_BUTTON("yellow", 'y');
CREATE_CONTEXT_BUTTON("blue", 'b');

#undef CREATE_CONTEXT_BUTTON

/* Page change and set */
CONNECT( telexPage, valueChanged( int ),
THEMIM->getIM(), telexSetPage( int ) );
Expand Down

0 comments on commit 06ee1e1

Please sign in to comment.