equal
deleted
inserted
replaced
175 HbDialog::HbDialog(QGraphicsItem *parent) : |
175 HbDialog::HbDialog(QGraphicsItem *parent) : |
176 HbPopup(*new HbDialogPrivate, parent) |
176 HbPopup(*new HbDialogPrivate, parent) |
177 { |
177 { |
178 Q_D(HbDialog); |
178 Q_D(HbDialog); |
179 d->q_ptr = this; |
179 d->q_ptr = this; |
180 d->init(); |
|
181 d->timeout = HbPopupPrivate::timeoutValue(HbPopup::NoTimeout); |
180 d->timeout = HbPopupPrivate::timeoutValue(HbPopup::NoTimeout); |
182 } |
181 } |
183 |
182 |
184 /*! |
183 /*! |
185 \internal |
184 \internal |
187 HbDialog::HbDialog(HbDialogPrivate &dd, QGraphicsItem *parent) : |
186 HbDialog::HbDialog(HbDialogPrivate &dd, QGraphicsItem *parent) : |
188 HbPopup(dd, parent) |
187 HbPopup(dd, parent) |
189 { |
188 { |
190 Q_D(HbDialog); |
189 Q_D(HbDialog); |
191 d->q_ptr = this; |
190 d->q_ptr = this; |
192 d->init(); |
|
193 d->timeout = HbPopupPrivate::timeoutValue(HbPopup::NoTimeout); |
191 d->timeout = HbPopupPrivate::timeoutValue(HbPopup::NoTimeout); |
194 } |
192 } |
195 |
193 |
196 /*! |
194 /*! |
197 Destroys the popup. |
195 Destroys the popup. |
257 |
255 |
258 if (d->contentWidget == contentWidget) |
256 if (d->contentWidget == contentWidget) |
259 return; |
257 return; |
260 if (d->contentWidget) |
258 if (d->contentWidget) |
261 delete d->contentWidget; |
259 delete d->contentWidget; |
|
260 prepareGeometryChange(); // needed to paint screen properly |
262 d->contentWidget = contentWidget; |
261 d->contentWidget = contentWidget; |
263 if (contentWidget) { |
262 if (contentWidget) { |
264 contentWidget->setParentItem(this); |
263 contentWidget->setParentItem(this); |
265 HbStyle::setItemName(contentWidget,"content"); |
264 HbStyle::setItemName(contentWidget,"content"); |
266 } |
265 } |
267 repolish(); |
266 repolish(); |
268 } |
267 } |
269 |
268 |
270 /*! |
269 /*! |
271 \deprecated HbDialog::primaryAction() const |
270 \deprecated HbDialog::primaryAction() const |
272 is deprecated. |
271 is deprecated. |