From 59d20ec984e37fa609615673fb2c8b05abc88f92 Mon Sep 17 00:00:00 2001 From: Tobias Doerffel Date: Mon, 16 Mar 2009 18:23:35 +0100 Subject: [PATCH] Vibed: cleanups in NineButtonSelector Cleaned up, fixed some coding issues and added a TODO comment. --- plugins/vibed/nine_button_selector.cpp | 30 +++++++++++--------------- 1 file changed, 13 insertions(+), 17 deletions(-) diff --git a/plugins/vibed/nine_button_selector.cpp b/plugins/vibed/nine_button_selector.cpp index 864a06a16..fba451077 100644 --- a/plugins/vibed/nine_button_selector.cpp +++ b/plugins/vibed/nine_button_selector.cpp @@ -60,6 +60,8 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, setFixedSize( 50, 50 ); move( _x, _y ); + // TODO: use a generic approach using QSignalMapper + m_button = new pixmapButton( this, NULL ); m_button->move( 1, 1 ); m_button->setActiveGraphic( _button0_on ); @@ -146,7 +148,7 @@ nineButtonSelector::nineButtonSelector( QPixmap _button0_on, } -nineButtonSelector::~ nineButtonSelector() +nineButtonSelector::~nineButtonSelector() { for( Uint8 i = 0; i < 9; i++ ) { @@ -163,80 +165,71 @@ void nineButtonSelector::button0Clicked( void ) } - - void nineButtonSelector::button1Clicked( void ) { setSelected( 1 ); } - - void nineButtonSelector::button2Clicked( void ) { setSelected( 2 ); } - - void nineButtonSelector::button3Clicked( void ) { setSelected( 3 ); } - - void nineButtonSelector::button4Clicked( void ) { setSelected( 4 ); } - - void nineButtonSelector::button5Clicked( void ) { setSelected( 5 ); } - - void nineButtonSelector::button6Clicked( void ) { setSelected( 6 ); } - - void nineButtonSelector::button7Clicked( void ) { setSelected( 7 ); } - - void nineButtonSelector::button8Clicked( void ) { setSelected( 8 ); } + void nineButtonSelector::modelChanged( void ) { updateButton( model()->value() ); } + + + void nineButtonSelector::setSelected( Uint8 _new_button ) { model()->setValue(_new_button); updateButton( _new_button ); } + + + void nineButtonSelector::updateButton( Uint8 _new_button ) { m_lastBtn->setChecked( FALSE ); @@ -249,6 +242,9 @@ void nineButtonSelector::updateButton( Uint8 _new_button ) emit nineButtonSelection( _new_button ); } + + + void nineButtonSelector::contextMenuEvent( QContextMenuEvent * ) { captionMenu contextMenu( accessibleName() );