--- a/src/hbwidgets/widgets/hbpushbutton.cpp Tue Jul 06 14:36:53 2010 +0300
+++ b/src/hbwidgets/widgets/hbpushbutton.cpp Wed Aug 18 10:05:37 2010 +0300
@@ -166,11 +166,11 @@
Q_Q(HbPushButton);
if ( !frameItem ) {
- frameItem = q->style()->createPrimitive( HbStyle::P_PushButton_background, q );
+ frameItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_PushButton_background, q );
}
if ( !text.isNull() ) {
if ( !textItem ) {
- textItem = q->style()->createPrimitive( HbStyle::P_PushButton_text, q );
+ textItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_PushButton_text, q );
}
} else {
if( textItem ){
@@ -180,7 +180,7 @@
}
if ( !additionalText.isNull() ) {
if ( !additionalTextItem ) {
- additionalTextItem = q->style()->createPrimitive( HbStyle::P_PushButton_additionaltext, q );
+ additionalTextItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_PushButton_additionaltext, q );
}
} else {
if( additionalTextItem ){
@@ -191,7 +191,7 @@
if ( !icon.isNull() ) {
if ( !iconItem ) {
- iconItem = q->style()->createPrimitive( HbStyle::P_PushButton_icon, q);
+ iconItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_PushButton_icon, q);
}
} else {
if( iconItem ) {
@@ -201,7 +201,7 @@
}
if( !touchArea ) {
- touchArea = q->style()->createPrimitive( HbStyle::P_PushButton_toucharea, q );
+ touchArea = HbStylePrivate::createPrimitive( HbStylePrivate::P_PushButton_toucharea, q );
if(QGraphicsObject *ta = qgraphicsitem_cast<QGraphicsObject*>(touchArea)) {
ta->grabGesture(Qt::TapGesture);
q->ungrabGesture(Qt::TapGesture);
@@ -211,7 +211,7 @@
}
if( !focusItem ) {
- focusItem = q->style()->createPrimitive(HbStyle::P_PushButton_focus, q);
+ focusItem = HbStylePrivate::createPrimitive(HbStylePrivate::P_PushButton_focus, q);
//focus primitive is will not be visible by default,
//only in case of keyboard focus events it will be Visible.
focusItem->setVisible( false );
@@ -304,7 +304,7 @@
d->backgroundFrameDrawer = 0;
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
+ HbStylePrivate::updatePrimitive( d->frameItem, HbStylePrivate::P_PushButton_background, &buttonOption );
}
}
@@ -337,7 +337,7 @@
d->background = HbIcon( );
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- style( )->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
+ HbStylePrivate::updatePrimitive( d->frameItem, HbStylePrivate::P_PushButton_background, &buttonOption );
}
}
@@ -371,7 +371,7 @@
if( d->textItem ) {
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- style( )->updatePrimitive( d->textItem, HbStyle::P_PushButton_text, &buttonOption);
+ HbStylePrivate::updatePrimitive( d->textItem, HbStylePrivate::P_PushButton_text, &buttonOption);
if ( isEnabled() ) {
setProperty("state", "normal");
}
@@ -401,7 +401,8 @@
Sets the \a additional text shown on the button.
Additional text is only shown in case
1. with icon and text in Qt::Horizontal alignment.
- 2. with additionalText and text in Qt::Vertical alignment.
+ 2. with icon and text where both the texts are aligned vertically and icon placed horizontally in relation to texts.
+ 3. with additionalText and text in Qt::Vertical alignment.
\sa additionalText()
*/
@@ -416,7 +417,7 @@
if( d->additionalTextItem ) {
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- style( )->updatePrimitive( d->additionalTextItem, HbStyle::P_PushButton_additionaltext, &buttonOption);
+ HbStylePrivate::updatePrimitive( d->additionalTextItem, HbStylePrivate::P_PushButton_additionaltext, &buttonOption);
if ( isEnabled() ) {
setProperty("state", "normal");
}
@@ -460,7 +461,7 @@
if( d->iconItem ) {
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- style()->updatePrimitive( d->iconItem, HbStyle::P_PushButton_icon, &buttonOption );
+ HbStylePrivate::updatePrimitive( d->iconItem, HbStylePrivate::P_PushButton_icon, &buttonOption );
if ( isEnabled() ) {
setProperty("state", "normal");
}
@@ -486,7 +487,7 @@
/*!
@beta
- Set the text alignment for primarytext and additional text.
+ Set the text alignment for primarytext.
The default alignment is Qt::AlignHCenter | Qt::AlignVCenter.
\sa textAlignment()
*/
@@ -497,7 +498,7 @@
//HbWidgetBase* textItem = static_cast<HbWidgetBase*>(d->textItem);
if( !d->textItem ) {
//need to create text item if user call alignment api before setText.
- d->textItem = style( )->createPrimitive( HbStyle::P_PushButton_text, this);
+ d->textItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_PushButton_text, this);
}
//HbWidgetBasePrivate *textItem_p = HbWidgetBasePrivate::d_ptr(textItem);
// check for textitem and api protection flag
@@ -509,15 +510,15 @@
d->hasTextAlignment = true;
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- style()->updatePrimitive(
- d->textItem, HbStyle::P_PushButton_text, &buttonOption );
+ HbStylePrivate::updatePrimitive(
+ d->textItem, HbStylePrivate::P_PushButton_text, &buttonOption );
}
d->hasTextAlignment = true;
}
/*!
@beta
- Returns the text alignment for primary text and additional text
+ Returns the text alignment for primary text.
\sa setTextAlignment()
*/
Qt::Alignment HbPushButton::textAlignment( ) const
@@ -540,7 +541,7 @@
//HbWidgetBase* additionalTextItem = static_cast<HbWidgetBase*>(d->additionalTextItem);
if(!d->additionalTextItem) {
//need to create text item if user call alignment api before setAdditionalText.
- d->additionalTextItem = style( )->createPrimitive( HbStyle::P_PushButton_additionaltext, this);
+ d->additionalTextItem = HbStylePrivate::createPrimitive( HbStylePrivate::P_PushButton_additionaltext, this);
}
// check for textitem and api protection flag
if( alignment != d->additionalTextAlignment ) {
@@ -551,8 +552,8 @@
d->hasAdditionalTextAlignment = true;
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- style( )->updatePrimitive(
- d->additionalTextItem, HbStyle::P_PushButton_additionaltext, &buttonOption );
+ HbStylePrivate::updatePrimitive(
+ d->additionalTextItem, HbStylePrivate::P_PushButton_additionaltext, &buttonOption );
}
}
@@ -612,17 +613,17 @@
Q_D( const HbPushButton );
switch ( primitive ) {
- case HbStyle::P_PushButton_background:
+ case HbStylePrivate::P_PushButton_background:
return d->frameItem;
- case HbStyle::P_PushButton_icon:
+ case HbStylePrivate::P_PushButton_icon:
return d->iconItem;
- case HbStyle::P_PushButton_text:
+ case HbStylePrivate::P_PushButton_text:
return d->textItem;
- case HbStyle::P_PushButton_toucharea:
+ case HbStylePrivate::P_PushButton_toucharea:
return d->touchArea;
- case HbStyle::P_PushButton_additionaltext:
+ case HbStylePrivate::P_PushButton_additionaltext:
return d->additionalTextItem;
- case HbStyle::P_PushButton_focus:
+ case HbStylePrivate::P_PushButton_focus:
return d->focusItem;
default:
return 0;
@@ -664,24 +665,24 @@
HbStyleOptionPushButton buttonOption;
initStyleOption(&buttonOption);
if ( d->textItem ) {
- style()->updatePrimitive( d->textItem, HbStyle::P_PushButton_text, &buttonOption );
+ HbStylePrivate::updatePrimitive( d->textItem, HbStylePrivate::P_PushButton_text, &buttonOption );
}
if ( d->touchArea ) {
- style()->updatePrimitive( d->touchArea, HbStyle::P_PushButton_toucharea, &buttonOption );
+ HbStylePrivate::updatePrimitive( d->touchArea, HbStylePrivate::P_PushButton_toucharea, &buttonOption );
}
if( d->additionalTextItem ) {
- style()->updatePrimitive(
- d->additionalTextItem,HbStyle::P_PushButton_additionaltext,&buttonOption );
+ HbStylePrivate::updatePrimitive(
+ d->additionalTextItem,HbStylePrivate::P_PushButton_additionaltext,&buttonOption );
}
if ( d->iconItem) {
- style()->updatePrimitive( d->iconItem, HbStyle::P_PushButton_icon, &buttonOption );
+ HbStylePrivate::updatePrimitive( d->iconItem, HbStylePrivate::P_PushButton_icon, &buttonOption );
}
if ( d->frameItem ) {
- style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
+ HbStylePrivate::updatePrimitive( d->frameItem, HbStylePrivate::P_PushButton_background, &buttonOption );
}
// update will happen only for keyevents when focusItem will be visible.
if( d->focusItem && hasFocus() && d->focusItem->isVisible() ) {
- style()->updatePrimitive( d->focusItem,HbStyle::P_PushButton_focus, &buttonOption );
+ HbStylePrivate::updatePrimitive( d->focusItem,HbStylePrivate::P_PushButton_focus, &buttonOption );
}
}
@@ -801,7 +802,7 @@
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
if( d->frameItem ) {
- style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
+ HbStylePrivate::updatePrimitive( d->frameItem, HbStylePrivate::P_PushButton_background, &buttonOption );
}
#ifdef HB_EFFECTS
if ( hitButton(event->pos()) ) {
@@ -825,7 +826,7 @@
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
if( d->frameItem ) {
- style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
+ HbStylePrivate::updatePrimitive( d->frameItem, HbStylePrivate::P_PushButton_background, &buttonOption );
}
#ifdef HB_EFFECTS
if ( hitButton(event->pos()) ) {
@@ -845,7 +846,7 @@
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
if( d->frameItem ) {
- style()->updatePrimitive( d->frameItem, HbStyle::P_PushButton_background, &buttonOption );
+ HbStylePrivate::updatePrimitive( d->frameItem, HbStylePrivate::P_PushButton_background, &buttonOption );
}
if (d->down) {
setProperty( "state", "pressed" );
@@ -940,10 +941,10 @@
if( hasFocus() ) {
HbStyleOptionPushButton buttonOption;
initStyleOption( &buttonOption );
- style()->updatePrimitive( d->focusItem,HbStyle::P_PushButton_focus, &buttonOption );
+ HbStylePrivate::updatePrimitive( d->focusItem,HbStylePrivate::P_PushButton_focus, &buttonOption );
}
} else {
- d->focusItem = style()->createPrimitive(HbStyle::P_PushButton_focus, this);
+ d->focusItem = HbStylePrivate::createPrimitive(HbStylePrivate::P_PushButton_focus, this);
}
}
HbAbstractButton::focusInEvent( event );