FCL/sf/mw/hb: comparison src/hbwidgets/widgets/hbgroupbox.cpp

equal deleted inserted replaced

-:627c4a0fd0e7
+:c3690ec91ef8
 */
 HbGroupBoxPrivate::HbGroupBoxPrivate()
 :HbWidgetPrivate(),
 mContentWidget( 0 ),
 mHeadingWidget( 0 ),
+collapsed( false),
+collapsable( true ),
 mGroupBoxType( GroupBoxTypeUnknown )
 {
 }
 /*
 mGroupBoxType = type;
 // set the type and makes necesary primitive creation/deletion
 switch(mGroupBoxType) {
 case GroupBoxSimpleLabel:
 {
-if(mHeadingWidget){
+mHeadingWidget->setType(type);
-mHeadingWidget->setType(type);
-mHeadingWidget->setVisible(true);
-}else{
-createHeadingWidget();
-}
-if(mContentWidget){
-mContentWidget->setVisible(false);
-HbStyle::setItemName( mContentWidget , "");
-}
 }
 break;
 case GroupBoxRichLabel:
 {
-if(mHeadingWidget){
-mHeadingWidget->setVisible(false);
-}
-if(mContentWidget){
 mContentWidget->setType(type);
-mContentWidget->setVisible(true);
 HbStyle::setItemName( mContentWidget , "contentwidget");
-}else{
-createContentWidget();
-}
 }
 break;
 case GroupBoxCollapsingContainer:
 {
-if((mHeadingWidget)){
 mHeadingWidget->setType(type);
-mHeadingWidget->setVisible(true);
-}else{
-createHeadingWidget();
-}
-if(mContentWidget){
 mContentWidget->setType(type);
 if(!q->isCollapsed()){
 mContentWidget->setVisible(true);
 HbStyle::setItemName( mContentWidget , "contentwidget");
 }else{
 mContentWidget->setVisible(false);
 HbStyle::setItemName( mContentWidget , "");
 }
-}else{
-createContentWidget();
-}
 }
 break;
 default:
 break;
 }
 @beta
 Sets the groupbox heading
 Note: heading property is valid for simpleLabel & collapsing container type.
+In case of collapsing container,
+if empty heading is set on runtime Groupbox will change to RichLabel.
 For Collapsing container,
 if body content is collapsible ,heading will appear along with Disclosure indicator.
 If heading is set on richLabel type groupBox, it will be ignored
 \sa heading
 */
 void HbGroupBox::setHeading( const QString &text )
 {
 Q_D( HbGroupBox );
-if(!d->mHeadingWidget)
+if( !text.isEmpty() ){
-d->createHeadingWidget();
+if( !d->mHeadingWidget ){
+d->createHeadingWidget( );
-d->mHeadingWidget->setHeading(text);
+}
+d->mHeadingWidget->setHeading( text );
-if(d->mContentWidget){
+if( d->mContentWidget ){
 d->setGroupBoxType(GroupBoxCollapsingContainer);
-}else
+}else {
 d->setGroupBoxType(GroupBoxSimpleLabel);
+}
+}else{
+if( d->mHeadingWidget ){
+delete d->mHeadingWidget;
+d->mHeadingWidget = 0;
+if( d->mContentWidget ) {
+d->setGroupBoxType( GroupBoxRichLabel );
+}else{
+d->setGroupBoxType( GroupBoxTypeUnknown );
+}
+}
+}
+repolish();
 }
 /*!
 @beta
 void HbGroupBox::setCollapsable( bool collapsable )
 {
 Q_D( HbGroupBox );
 if(d->mGroupBoxType == GroupBoxCollapsingContainer){
-if(d->mHeadingWidget->collapsable  == collapsable)
+if(d->collapsable  == collapsable)
 {
 return;
 }
-d->mHeadingWidget->collapsable  = collapsable;
+d->collapsable  = collapsable;
 d->mHeadingWidget->createPrimitives();
-// make it expand otherwise groupBox can't be expanded at all, after this scenario
+// make it expand otherwise groupBox can't be collapsed at all, after this scenario
-if(!collapsable && d->mHeadingWidget->collapsed){
+if(!collapsable && d->collapsed){
 d->mContentWidget->setVisible(true);
 HbStyle::setItemName( d->mContentWidget , "contentwidget");
-d->mHeadingWidget->collapsed  = false;
+d->collapsed  = false;
 }
 d->mHeadingWidget->updatePrimitives();
 repolish();
 }
 }
 */
 bool HbGroupBox::isCollapsable( ) const
 {
 Q_D( const HbGroupBox );
 if(d->mHeadingWidget && d->mGroupBoxType == GroupBoxCollapsingContainer)
-return d->mHeadingWidget->collapsable;
+return d->collapsable;
 return false;
 }
 /*!
 @beta
 */
 void HbGroupBox::setCollapsed( bool collapsed )
 {
 Q_D( HbGroupBox );
 if(d->mGroupBoxType == GroupBoxCollapsingContainer){
-if( d->mContentWidget && d->mHeadingWidget->collapsable) {
+if( d->mContentWidget && d->collapsable) {
-if ( d->mHeadingWidget->collapsed == collapsed )
+if ( d->collapsed == collapsed )
 return;
-d->mHeadingWidget->collapsed = collapsed;
+d->collapsed = collapsed;
 #ifdef HB_EFFECTS
 HbEffectInternal::add(HB_GROUPBOX_TYPE,"groupbox_expand", "expand");
 //HbEffectInternal::add(HB_GROUPBOX_TYPE,"groupbox_collapse", "collapse");
 #endif
-if ( d->mHeadingWidget->collapsed ) {
+if ( d->collapsed ) {
 #ifdef HB_EFFECTS
 HbEffect::start( d->mContentWidget, HB_GROUPBOX_TYPE, "collapse");
 #endif
 HbStyle::setItemName( d->mContentWidget , "");
 d->mContentWidget->setVisible(false);
 #endif
 HbStyle::setItemName( d->mContentWidget , "contentwidget");
 d->mContentWidget->setVisible(true);
 }
 d->mHeadingWidget->updatePrimitives();
-emit toggled( d->mHeadingWidget->collapsed );
+emit toggled( d->collapsed );
 }
 repolish();
 }
 }
 */
 bool HbGroupBox::isCollapsed( ) const
 {
 Q_D ( const HbGroupBox );
 if(d->mGroupBoxType == GroupBoxCollapsingContainer)
-return d->mHeadingWidget->collapsed;
+return d->collapsed;
 return false;
 }
 /*!
 Groupbox can set only one content widget at a time.
 Ownership of the content widget is transferred to groupbox.
 If \a widget to set is NULL then content is removed.
+And Groupbox type is changed to simpleLabel , if heading is present.
 contentWidget is valid only for richLabel & collapsing container type.
 If content Widget is set on simpleLabel type groupBox, it will be ignored
 Note:
 Q_D( HbGroupBox );
 if(!d->mContentWidget)
 d->createContentWidget();
-d->mContentWidget->setContentWidget(widget);
+if(widget){
+d->mContentWidget->setContentWidget(widget);
 if(d->mHeadingWidget){
 d->setGroupBoxType(GroupBoxCollapsingContainer);
 }else
 d->setGroupBoxType(GroupBoxRichLabel);
 // collapsed property is set before setContentWidget
-if ( d->mGroupBoxType == GroupBoxCollapsingContainer && d->mHeadingWidget->collapsed ) {
+if ( d->mGroupBoxType == GroupBoxCollapsingContainer && d->collapsed ) {
 d->mContentWidget->setVisible(false);
 HbStyle::setItemName( d->mContentWidget , "");
+}
+// update content widget primitve
+d->mContentWidget->updatePrimitives();
+}else{
+delete d->mContentWidget;
+d->mContentWidget = 0;
+if(d->mHeadingWidget){
+d->setGroupBoxType(GroupBoxSimpleLabel);
+}else{
+d->setGroupBoxType(GroupBoxTypeUnknown);
+}
 }
-// update content widget primitve
-d->mContentWidget->updatePrimitives();
 repolish();
 }
 /*!
 @beta
 return 0;
 }
 /*!
 \reimp
+*/
+QSizeF HbGroupBox::sizeHint( Qt::SizeHint which, const QSizeF &constraint ) const
+{
+Q_D( const HbGroupBox );
+//group box will have size zero in case contentwidget and heading not their.
+if( !d->mHeadingWidget && !d->mContentWidget )
+return QSizeF( 0.f, 0.f );
+return HbWidget::sizeHint(which, constraint);
+}
+/*!
+\reimp
 */
 void HbGroupBox::updatePrimitives()
 {
 Q_D( const HbGroupBox );

changeset 6	c3690ec91ef8
parent 3	11d3954df52a
child 7	923ff622b8b9