FCL/sf/mw/hb: comparison src/hbwidgets/dataform/hbdataformmodelitem.cpp

equal deleted inserted replaced

-:730c025d4b77
+:f378acbc9cfb
 ** If you have questions regarding the use of this file, please contact
 ** Nokia at developer.feedback@nokia.com.
 **
 ****************************************************************************/
+#include "hbdataformmodelitem_p.h"
+#include "hbdataformmodel_p.h"
+#include <hbdataformmodelitem.h>
+#include <hbdataformmodel.h>
 #include <QAbstractItemModel>
-#include "hbdataformmodelitem_p.h"
-#include "hbdataformmodelitem.h"
-#include "hbdataformmodel.h"
-#include "hbdataformmodel_p.h"
-class QAbstractItemModel;
 HbDataFormModelItemPrivate::HbDataFormModelItemPrivate():
 mParentItem(0),
 mModel(0),
 HbDataFormModelItem* item = mChildItems.at(index);
 HbDataFormModelItemPrivate::d_ptr(item)->setModel(model);
 }
 }
+void HbDataFormModelItemPrivate::setContentWidgetData(
+const QString& propertyName ,const QVariant &value)
+{
+mProperties.remove(propertyName);
+mProperties.insert(propertyName,value);
+}
 QAbstractItemModel* HbDataFormModelItemPrivate::model() const
 {
 return mModel;
 }
 For Example if below is the model hierarchy for profiles application
 - general
 - ringtone_general
 - unknowncaller_ringtone_general,
-Then sample code to create above model and data it to dataForm  would be,
+Then sample code to create above model and data it to data form would be,
 \code
 HbDataForm* form = new HbDataForm();
 form->setHeading(QString("Profiles"));
 form->setDescription(QString("With profiles you can define themes used in different profiles"));
 */
 /*!
 \enum HbDataFormModelItem::Roles
-This enum defines the Roles supported by dataForm.Any data from application
+This enum defines the Roles supported by dataForm. Any data from application
 can be added through these Roles.
 */
 /*!
 \var HbDataFormModelItem::LabelRole
-LabelRole: This Role is used for data label of the DataFormViewItem
+LabelRole: This Role is used for data item label/heading of HbDataFormViewItem.
 */
 /*!
 \var HbDataFormModelItem::ItemTypeRole
-ItemTypeRole: This Role is used for data itemType of the HbDataFormModelItem
+ItemTypeRole: This Role is used for data item type of the HbDataFormModelItem
 */
 /*!
 \var HbDataFormModelItem::PropertyRole
 is valid only for GroupItem and data items ( > GroupPageItem ).
 */
 /*!
-\var HbDataFormModelItem::DescriptionRole
-DescriptionRole: This Role will add a description text in model item visualization. This role
-is valid only for GroupItem and data items ( > GroupPageItem ).
-*/
-/*!
 \enum HbDataFormModelItem::DataItemType
 This enum defines itemtypes supported in dataform.
 Enum also defines itemtype for custom types.
 */
 HbDataForm.
 */
 /*!
 \var HbDataFormModelItem::GroupItem
-GroupItem is used for grouping diffrent group pages or grouping data items under one group
+GroupItem is used for grouping different group pages or grouping data items under one group
 heading.
 */
 /*!
 \var HbDataFormModelItem::GroupPageItem
 SliderItem:  This itemType is for slider type of data item
 */
 /*!
-\var HbDataFormModelItem::VolumeSliderItem
-VolumeSliderItem:  This itemType is for volume slider type of data item
-*/
-/*!
 \var HbDataFormModelItem::CheckBoxItem
 CheckBoxItem:  This itemType is for check box type of data item
 */
 /*!
 \var HbDataFormModelItem::TextItem
 TextItem:  This itemType is for text type of data item
 The TextItem by default has maximum 4 rows.
-Application can configure thisvalue using HbLineEdit Property maxRows.
+Application can configure this value using HbLineEdit Property maxRows.
-This Property Value has to be set using SetContentWidgetData API.
+This Property Value has to be set using setContentWidgetData() API.
 */
 /*!
 \var HbDataFormModelItem::ToggleValueItem
 \var HbDataFormModelItem::RadioButtonListItem
 RadioButtonListItem:  This itemType is for radio button list type of data item
 RadioButtonListItem will appear in three display modes
-automatic : radioButtonList item appear as embedded( inline) if it contains less than four items and
+- Automatic : radioButtonList item appear as embedded( inline) if it contains less than four items and
 if more than three items then selected items are displayed as text on a PushButton and when pushbutton
 clicked it lunches popup. Automatic mode is set as the default mode.
-embedded : Application can set these items as always embedded(inline) by setting the property "displayMode"
+- Embedded : Application can set these items as always embedded(inline) by setting the property "displayMode"
 with value of property as "embedded"
-popup : Application can set these items as always popup by setting the property "displayMode"
+- Popup : Application can set these items as always popup by setting the property "displayMode"
 with value of property as "popup"
 HbDataFormModelItem *radioItem = model->appendDataItem(HbDataFormModelItem::RadioButtonListItem,
 QString("Caller Tone"));
 radioItem->setContentWidgetData(QString("displayMode"),QString("embedded"));
 radioItem->setContentWidgetData(QString("displayMode"),QString("automatic"));
 \var HbDataFormModelItem::MultiselectionItem
 MultiselectionItem:  This itemType is for multi selection type of data item.
 MultiSelectionListItem will appear in three display modes
-automatic : radioButtonList item appear as embedded( inline) if it contains less than four items and
+- Automatic : radioButtonList item appear as embedded( inline) if it contains less than four items and
 if more than three items then selected items are displayed as text on a PushButton and when pushbutton
 clicked it lunches popup. Automatic mode is set as the default mode.
-embedded : Application can set these items as always embedded(inline) by setting the property "displayMode"
+- Embedded : Application can set these items as always embedded(inline) by setting the property "displayMode"
 with value of property as "embedded"
-popup : Application can set these items as always popup by setting the property "displayMode"
+- Popup : Application can set these items as always popup by setting the property "displayMode"
 with value of property as "popup"
 HbDataFormModelItem *radioItem = model->appendDataItem(HbDataFormModelItem::MultiSelectionListItem,
 QString("Caller Tone"));
 radioItem->setContentWidgetData(QString("displayMode"),QString("embedded"));
 radioItem->setContentWidgetData(QString("displayMode"),QString("automatic"));
 HbDataFormModelItem::DataItemType type,const QString &label,
 const HbDataFormModelItem* parent):
 d_ptr(new HbDataFormModelItemPrivate())
 {
 Q_D(HbDataFormModelItem);
 d->q_ptr = this ;
-d->mParentItem = const_cast<HbDataFormModelItem*>(parent);
+if( parent ) {
+d->mParentItem = const_cast<HbDataFormModelItem*>(parent);
+d->mParentItem->appendChild(this);
+}
 setData(ItemTypeRole, type);
 setData(LabelRole, label);
 }
 /*!
 HbDataFormModelItem::HbDataFormModelItem(const HbDataFormModelItem* parent):
 d_ptr(new HbDataFormModelItemPrivate())
 {
 Q_D(HbDataFormModelItem);
 d->q_ptr = this ;
-d->mParentItem = const_cast<HbDataFormModelItem*>(parent);
+if( parent ){
+d->mParentItem = const_cast<HbDataFormModelItem*>(parent);
+d->mParentItem->appendChild(this);
+}
 }
 /*!
 Destructor
 */
 delete d_ptr;
 }
 /*!
 @beta
 Adds the given \a child to the children list of current item.
 \sa insertChild, insertChildren
 */
 void HbDataFormModelItem::appendChild(HbDataFormModelItem *child)
 d->mChildItems.append(child);
 model->d_func()->rowsInserted();
 }
 else {
 d->mChildItems.append(child);
 }
 }
 }
 /*!
 @beta
 }
 }
 /*!
 @beta
 Inserts the given list of \a items starting from the given \a row.
 \sa insertChild, appendChild
 */
 void HbDataFormModelItem::insertChildren(int row , int count ,
 }
 /*!
 @beta
 Removes the child item at the given \a index. The item at \a index is
 deleted.
 \sa removeChildren
 */
 void HbDataFormModelItem::removeChild(int index)
 {
-Q_D(HbDataFormModelItem);
+if( ( index < 0 ) || ( index >= childCount() ) ) {
+return;
+}
+Q_D(HbDataFormModelItem);
 HbDataFormModel* model = static_cast<HbDataFormModel*>(d->mModel);
-if(model) {
-model->d_func()->rowsAboutToBeRemoved(this, index, index);
+HbDataFormModelItem *item = d->mChildItems.at(index);
+if( item ) {
+int childCount = item->childCount();
+for ( int childIndex = 0; childIndex < childCount ;childIndex++) {
+item->removeChild(0);
+}
+if( model ) {
+model->d_func()->rowsAboutToBeRemoved(this, index, index);
+}
 HbDataFormModelItem *item = d->mChildItems.takeAt(index);
-if ( item ) {
+delete item;
-delete item;
+item = 0;
-item = 0;
+if( model ) {
-}
+model->d_func()->rowsRemoved();
-model->d_func()->rowsRemoved();
+}
 }
-else {
+}
-HbDataFormModelItem *item = d->mChildItems.takeAt(index);
-if ( item ) {
+/*!
-delete item;
+@beta
-item = 0;
-}
-}
-}
-/*!
-@beta
 Removes the given no of \a count of childitems from the given \a startindex. The
 items are deleted.
 \sa removeChild
 */
 void HbDataFormModelItem::removeChildren(int startIndex, int count)
 {
-Q_D(HbDataFormModelItem);
+if( ( startIndex < 0 ) || ( startIndex > childCount() ) || ( count <= 0 )) {
+return;
-HbDataFormModel* model = static_cast<HbDataFormModel*>(d->mModel);
+}
-model->d_func()->rowsAboutToBeRemoved(this, startIndex, startIndex + count -1);
-for(int index = 0; index < count ;index++) {
+if( startIndex + count > childCount() ) {
-HbDataFormModelItem *item = d->mChildItems.takeAt(0);
+return;
-if ( item ) {
+}
-delete item;
-item = 0;
+for(int index = 0; index < count ;index++) {
-}
+removeChild(startIndex);
 }
-model->d_func()->rowsRemoved();
+}
-}
+/*!
-/*!
+@beta
-@beta
 Returns the child item at the given \a index.
 Returns 0 if \a index passed in greater than count or less than 0.
 \sa indexOf
 */
 return 0;
 }
 /*!
 @beta
 Returns index of the given \a child.
 \sa childAt
 */
 int HbDataFormModelItem::indexOf(const HbDataFormModelItem* child) const
 return d->mChildItems.count();
 }
 /*!
 @beta
 Returns the data for the given \a role. Returns empty string if DescriptionRole is queried for
 items other then GroupItem and data item.
 */
 QVariant HbDataFormModelItem::data(int role ) const
 {
 }
 }
 /*!
 @beta
 Sets the given \a value of variant to the given \a role.
 */
 void HbDataFormModelItem::setData(int role ,const QVariant &value)
 {
 Q_D(HbDataFormModelItem);
 - VolumeSliderItem: HbVolumeSlider property should be used
 - CheckBoxItem: HbCheckBox property should be used
 - TextItem: HbLineEdit property should be used
 - ToggleValueItem: HbPushButton(text and additionalText) property should be used
 - RadioButtonListItem: HbRadioButtonList property should be used
-- MultiselectionItem: HbListDialog property should be used
+- MultiselectionItem: HbListWidget property should be used
 - ComboBoxItem: HbComboBox property should be used
 */
 void HbDataFormModelItem::setContentWidgetData(
 const QString& propertyName ,const QVariant &value)
 {
 Q_D(HbDataFormModelItem);
-d->mProperties.remove(propertyName);
+d->setContentWidgetData(propertyName, value);
-d->mProperties.insert(propertyName,value);
 d->mDirtyProperty = propertyName;
 HbDataFormModel *data_model = static_cast<HbDataFormModel*>(d->mModel);
 if(data_model) {
 QModelIndex index = data_model->indexFromItem(this);
 emit data_model->dataChanged(index, index);
 }
 }
 /*!
 @beta
 Returns the property  \a value for the given \a propertyName.
 */
 QVariant HbDataFormModelItem::contentWidgetData(const QString& propertyName ) const
 {
 Q_D(const HbDataFormModelItem);
 return d->mProperties.value(propertyName);
 }
 /*!
 @beta
 Returns all properties with values which was set in HbDataFormModelItem.
 */
 QHash<QString, QVariant> HbDataFormModelItem::contentWidgetData() const
 {
 Q_D(const HbDataFormModelItem);
 return d->mProperties;
 }
 /*!
 @beta
 Sets \a parent as a parent to this item.
-It only sets the parent pointer. It doesnt put the item in the
+It only sets the parent pointer. It does not put the item in the
 hierarchy.
 */
 void HbDataFormModelItem::setParent(HbDataFormModelItem* parent)
 {
 Q_D(HbDataFormModelItem);
 d->mParentItem=parent;
 }
 /*!
 @beta
 Returns the parent of the this data item.
 */
 HbDataFormModelItem* HbDataFormModelItem::parent() const
 {
 Q_D(const HbDataFormModelItem);
 return d->mParentItem;
 }
 /*!
 @beta
 Sets \a type as a DataItemType for this data item.
 */
 void HbDataFormModelItem::setType(HbDataFormModelItem::DataItemType type)
 {
 setData(ItemTypeRole,type);
 }
 /*!
 @beta
 Returns the DataItemType of the this item.
 */
 HbDataFormModelItem::DataItemType HbDataFormModelItem::type() const
 {
 return static_cast<HbDataFormModelItem::DataItemType>(data(ItemTypeRole).toInt());
 }
 /*!
 @beta
 Sets the \a label to the item. This is valid only if the type is other than FormPageItem,
 GroupItem and GroupPageItem.
 */
 void HbDataFormModelItem::setLabel(const QString& label)
 {
 setData(LabelRole,label);
 }
 /*!
 @beta
 Returns the label of the item.
 */
 QString HbDataFormModelItem::label() const
 {
 return data(LabelRole).toString();
 }
 /*!
 @beta
 Sets the \a icon to the item. This is valid only if the type is other than FormPageItem,
 GroupItem and GroupPageItem.
 */
 void HbDataFormModelItem::setIcon(const QString& icon)
 {
 setData(Qt::DecorationRole,icon);
 }
 /*!
 @beta
 Returns the icon of the item.
 */
 QString HbDataFormModelItem::icon() const
 {
 return data(Qt::DecorationRole).toString();
 }
-/*
+/*!
-QHash<QString, QVariant> HbDataFormModelItem::getContentWidgetValues()
+@beta
-{
-Q_D(const HbDataFormModelItem);
-return d->mProperties;
-}*/
-/*!
 Sets whether the item is enabled.
 If enabled is true, the item is \a enabled, meaning that the user can interact with the item
 if \a enabled is false, the user cannot interact with the item.
 */
 }
 }
 }
 /*!
-Returns true if the item is enabled; otherwise returns false.
+@beta
+Returns true if the item is enabled otherwise returns false.
 */
 bool HbDataFormModelItem::isEnabled() const
 {
 Q_D(const HbDataFormModelItem);
 return d->mFlags & Qt::ItemIsEnabled;
 }
 /*!
+@beta
 Returns item flags for this item.
 */
 Qt::ItemFlags HbDataFormModelItem::flags() const
 {
 Q_D(const HbDataFormModelItem);
 return d->mFlags;
 }
 /*!
-@proto
+@beta
 Sets the \a description to the item. This is valid only if the type is GroupItem or
 DataItem. Its not valid for GroupPageItem and FormPageItem.
 */
 void HbDataFormModelItem::setDescription(const QString& description)
 {
 setData(DescriptionRole , description);
 }
 /*!
-@proto
+@beta
 Returns the description of the item.
 */
 QString HbDataFormModelItem::description() const
 {
 return data(DescriptionRole).toString();

branch	GCC_SURGE
changeset 15	f378acbc9cfb
parent 6	c3690ec91ef8
child 28	b7da29130b0e