diff -r bf4420e9fa4d -r 2e16851ffecd ginebra2/ActionButton.h
--- a/ginebra2/ActionButton.h	Fri Jun 11 16:23:26 2010 +0100
+++ b/ginebra2/ActionButton.h	Thu Jul 22 16:30:16 2010 +0100
@@ -1,21 +1,24 @@
 /*
 * Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* This program is free software: you can redistribute it and/or modify
+* it under the terms of the GNU Lesser General Public License as published by
+* the Free Software Foundation, version 2.1 of the License.
 *
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU Lesser General Public License for more details.
 *
-* Contributors:
+* You should have received a copy of the GNU Lesser General Public License
+* along with this program.  If not,
+* see "http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html/".
 *
-* Description: 
+* Description:
 *
 */
 
-
 #ifndef __gva_actionbutton_h__
 #define __gva_actionbutton_h__
 
@@ -35,30 +38,34 @@
         virtual ~ActionButton() {};
         void paint( QPainter * painter, const QStyleOptionGraphicsItem * opt, QWidget * widget );
         void addIcon( const QString & icon, QIcon::Mode mode = QIcon::Normal );
-        void setAction ( QAction * action, QEvent::Type triggerOn = QEvent::GraphicsSceneMousePress );
-	void disconnectAction();
-	void setEnabled(bool);
-	void setChecked(bool);
-	void setInputEvent(QEvent::Type event);
-    public slots:
-	void onActionChanged();
-	  //For testing only
-	void onTriggered( bool checked );
-    signals:
-	void activated();
-        void contextMenuEvent();
+        QIcon icon() {return m_icon;}
+        void setAction ( QAction * action, bool triggerOnDown = false,  bool triggerOnUp = true);
+        void setEnabled(bool);
+        void setActive(bool);
+        void setActiveOnPress(bool);
+        QAction * defaultAction();
+        bool isChecked() {return m_internalAction->isChecked();}
+
+    public Q_SLOTS:
+        void onActionChanged();
+        void onHidden();
+        void onShown();
+
+   Q_SIGNALS:
+        void activated();
+
     protected:
-	void mousePressEvent( QGraphicsSceneMouseEvent * ev );
-	void mouseReleaseEvent( QGraphicsSceneMouseEvent * ev );
-	void contextMenuEvent( QGraphicsSceneContextMenuEvent * ev );
+        void mousePressEvent( QGraphicsSceneMouseEvent * ev );
+        void mouseReleaseEvent( QGraphicsSceneMouseEvent * ev );
     private:
-        QAction * defaultAction();
         QAction * m_internalAction;
         QIcon m_icon;
-	QEvent::Type m_triggerOn;
+        bool m_triggerOnUp;
+        bool m_triggerOnDown;
+        QIcon::Mode m_state;
         bool m_active;
-	QIcon::Mode m_state;
+        bool m_activeOnPress;
     };
 } // end of namespace GVA
 
-#endif // ICONWIDGET_H
+#endif // ACTIONBUTTON_H