diff -r 608f976aa7bb -r 6a0342b3c519 flagobj.cpp --- a/flagobj.cpp Tue Jun 06 14:58:11 2006 +0000 +++ b/flagobj.cpp Tue Jun 13 08:49:12 2006 +0000 @@ -36,8 +36,8 @@ icon=new ImageObj (canvas); icon->move (absPos.x(), absPos.y() ); - button=NULL; state=false; + action=NULL; } void FlagObj::copy (FlagObj* other) @@ -48,10 +48,8 @@ tooltip=other->tooltip; state=other->state; icon->copy(other->icon); + action=other->action; setVisibility (other->isVisibleObj() ); - // button is not copied, because - // we won't copy to a parentRow and - // all others don't need a button } void FlagObj::move(double x, double y) @@ -119,24 +117,21 @@ return tooltip; } -void FlagObj::setButton(QAction* b) -{ - button=b; -} - -void FlagObj::updateButton() -{ - if (button) - button->setOn(state); - else - qWarning ("FlagObj::updateButton no button defined"); -} - QPixmap FlagObj::getPixmap() { return icon->getPixmap(); } +void FlagObj::setAction (QAction* a) +{ + action=a; +} + +void FlagObj::updateAction () +{ + if (action) action->setChecked(state); +} + bool FlagObj::isActive() { return state; @@ -172,12 +167,6 @@ } } -void FlagObj::setEnabled(bool b) -{ - button->setEnabled (b); -} - - void FlagObj::setUsed (bool b) { used=b;