diff -r e6ad4ef83b23 -r b7da29130b0e src/hbwidgets/popups/hbinputdialog.cpp --- a/src/hbwidgets/popups/hbinputdialog.cpp Thu Sep 02 20:44:51 2010 +0300 +++ b/src/hbwidgets/popups/hbinputdialog.cpp Fri Sep 17 08:32:10 2010 +0300 @@ -30,7 +30,7 @@ #include "hbinputdialogcontent_p.h" #include #include - +#include #include #ifdef HBINPUTDIALOG_DEBUG @@ -361,6 +361,23 @@ option->additionalText = d->mPromptAdditionalText; } +void HbInputDialog::initPrimitiveData(HbStylePrimitiveData *primitiveData, const QGraphicsObject *primitive) +{ + HbWidgetBase::initPrimitiveData(primitiveData, primitive); + QString itemName = HbStyle::itemName(primitive); + if (itemName == QLatin1String("label-1")) { + HbStyleTextPrimitiveData *data = hbstyleprimitivedata_cast(primitiveData); + data->text = promptText(); + data->textWrapping = Hb::TextWordWrap; + } + + if (itemName == QLatin1String("label-2")) { + HbStyleTextPrimitiveData *data = hbstyleprimitivedata_cast(primitiveData); + data->text = promptText(1); + data->textWrapping = Hb::TextWordWrap; + } +} + /*! \reimp */ @@ -368,17 +385,37 @@ { Q_D(HbInputDialog); HbDialog::updatePrimitives(); - HbStyleOptionInputDialog option; - initStyleOption(&option); if (d->mContentWidget->mLabel1) { - HbStylePrivate::updatePrimitive(d->mContentWidget->mLabel1, HbStylePrivate::P_InputDialog_text, &option); - } + HbStyleTextPrimitiveData data; + initPrimitiveData(&data, d->mContentWidget->mLabel1); + style()->updatePrimitive(d->mContentWidget->mLabel1, &data, this); + } + + if (d->mContentWidget->mLabel2) { + HbStyleTextPrimitiveData data; + initPrimitiveData(&data, d->mContentWidget->mLabel2); + style()->updatePrimitive(d->mContentWidget->mLabel2, &data, this); + } +} + - if (d->mContentWidget->mLabel2 && d->mContentWidget->mAdditionalRowVisible) { - HbStylePrivate::updatePrimitive(d->mContentWidget->mLabel2, HbStylePrivate::P_InputDialog_additionaltext, &option); +/*! + Recreaction of all the primitives. + */ +void HbInputDialog::recreatePrimitives() +{ + Q_D(HbInputDialog); + if (d->mContentWidget->mLabel1) { + delete d->mContentWidget->mLabel1; + d->mContentWidget->mLabel1 = 0; + d->mContentWidget->mLabel1 = style()->createPrimitive(HbStyle::PT_IconItem, "label-1",d->mContentWidget); + } + if (d->mContentWidget->mLabel2) { + delete d->mContentWidget->mLabel2; + d->mContentWidget->mLabel2 = 0; + d->mContentWidget->mLabel2 = style()->createPrimitive(HbStyle::PT_IconItem, "label-2",d->mContentWidget); } } - void HbInputDialog::done(int code) { Q_D(HbInputDialog);