aboutsummaryrefslogtreecommitdiff
path: root/src/corelib/widgets/mcontentitemmodel.h
diff options
context:
space:
mode:
authorMarcin Miklas <marcin.miklas@teleca.com>2010-04-02 15:40:44 +0200
committerDaniel d'Andrada <daniel.dandrada@nokia.com>2010-04-14 09:36:36 +0300
commit2672d9880a586abb2007faa3a0691375e06a9fc1 (patch)
tree1977c84a985874653bd8fe684e76abf580e40009 /src/corelib/widgets/mcontentitemmodel.h
parentb31ba6ba7d2b875818a19ba95a82af54763f90f8 (diff)
New: Progress bar added to MComboBox.
RevBy: Daniel d'Andrada Details: Now, for long taking selections, MComboBox can display progress indicator. I've added ProgressIndicatorVisible property to MComboBox and helper functions: showProgressIndicator, hideProgressIndicator My changes also required to update MContentItem, so I moved additionalItem to MContentItemModel class, and changed MContentItemView to update layout when additionalItem property is changed. WidgetsGallery comboboxpage updated to show new feature of MComboBox.
Diffstat (limited to 'src/corelib/widgets/mcontentitemmodel.h')
-rw-r--r--src/corelib/widgets/mcontentitemmodel.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/corelib/widgets/mcontentitemmodel.h b/src/corelib/widgets/mcontentitemmodel.h
index 9ac49782..b65392d0 100644
--- a/src/corelib/widgets/mcontentitemmodel.h
+++ b/src/corelib/widgets/mcontentitemmodel.h
@@ -94,6 +94,13 @@ public:
\brief Contains optional icon on the right-hand side
*/
M_MODEL_PROPERTY(QImage, optionalImage, OptionalImage, false, QImage())
+
+ /*!
+ \property MContentItemModel::additionalItem
+ \brief MWidget as e.g. progress bar, visible below the title.
+ In case there is already a subtitle it will be replaced.
+ */
+ M_MODEL_PTR_PROPERTY(MWidget*, additionalItem, AdditionalItem, true, NULL)
};
#endif