--- a/src/hbinput/inputwidgets/hbinputbuttongroup.h	Fri Jun 11 13:58:22 2010 +0300
+++ b/src/hbinput/inputwidgets/hbinputbuttongroup.h	Wed Jun 23 18:33:25 2010 +0300
@@ -40,6 +40,14 @@
     Q_PROPERTY(bool enabled READ isEnabled WRITE setEnabled)
 
 public:
+    enum HbInputButtonTextType {
+        ButtonTextTypeSingle,
+        ButtonTextTypePrimary,
+        ButtonTextTypeSecondaryFirstRow,
+        ButtonTextTypeSecondarySecondRow,
+        ButtonTextTypeLabel
+    };
+
     explicit HbInputButtonGroup(QGraphicsItem *parent = 0);
     explicit HbInputButtonGroup(const QSize &size, QGraphicsItem *parent = 0);
     ~HbInputButtonGroup();
@@ -47,17 +55,17 @@
     void setGridSize(const QSize &size);
     QSize gridSize() const;
 
-    void setButtons(const QList<HbInputButton*> &data);
+    void setButtons(const QList<HbInputButton *> &data);
     void setButton(HbInputButton *data, int index);
     void setButton(HbInputButton *data, int column, int row);
     void setButton(HbInputButton *data, HbInputButton::HbInputButtonKeyCode keyCode);
-    QList<HbInputButton*> buttons() const;
+    QList<HbInputButton *> buttons() const;
     HbInputButton *button(int index) const;
     HbInputButton *button(int column, int row) const;
     HbInputButton *button(HbInputButton::HbInputButtonKeyCode keyCode) const;
 
-    void setCustomButtonActions(const QList<HbAction*> &actions);
-    QList<HbAction*> customButtonActions() const;
+    void setCustomButtonActions(const QList<HbAction *> &actions);
+    QList<HbAction *> customButtonActions() const;
 
     void setButtonBorderSize(qreal borderSize);
     qreal buttonBorderSize() const;
@@ -72,22 +80,26 @@
 
     void setBackground(HbFrameDrawer *background);
 
+    qreal fontSize(HbInputButtonTextType textType);
+
     QList<HbKeyPressProbability> buttonProbabilities() const;
-    
+
 public: // From QGraphicsItem
     void setEnabled(bool enabled);
     bool isEnabled() const;
-    
+
 public: // From QGraphicsLayoutItem
     void setGeometry(const QRectF &rect);
 
 protected: // From QGraphicsItem
-    void paint(QPainter* painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
+    void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget);
     bool sceneEvent(QEvent *event);
     void changeEvent(QEvent *event);
     void showEvent(QShowEvent *event);
     void hideEvent(QHideEvent *event);
-    int type() const { return Hb::ItemType_InputButtonGroup; }
+    int type() const {
+        return Hb::ItemType_InputButtonGroup;
+    }
 
 protected:
     HbInputButtonGroup(HbInputButtonGroupPrivate &dd, QGraphicsItem *parent = 0);