summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJason Barron <jbarron@trolltech.com>2009-11-24 14:52:38 (GMT)
committerJason McDonald <jason.mcdonald@nokia.com>2009-11-25 00:49:36 (GMT)
commit0e429e4d26ede05a894039ce445a6bb57e124fd2 (patch)
tree1701b26bdb3ef6d92b9852dc4ac2441d4f08310d /src
parentc41db06f3365d6c9cd2285eb19feb185f493a98d (diff)
downloadQt-0e429e4d26ede05a894039ce445a6bb57e124fd2.zip
Qt-0e429e4d26ede05a894039ce445a6bb57e124fd2.tar.gz
Qt-0e429e4d26ede05a894039ce445a6bb57e124fd2.tar.bz2
Fix softkeys for QDialogButtonBoxes created without a parent.
Inthe case where a QDialogButtonBox was created without a parent, for example in the FTP example, the softkeys that are automatically created inside the button box were not being added to the right widget when the button box was given a parent (or added to a layout) later. This patch resolves that issue by handling the ParentChange event and then adding the softkeys at this point. Task-number: QTBUG-6086 Reviewed-by: axis (cherry picked from commit a0c8e134a284d45520dd3a229e68dbcd155299e6)
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qdialogbuttonbox.cpp24
1 files changed, 24 insertions, 0 deletions
diff --git a/src/gui/widgets/qdialogbuttonbox.cpp b/src/gui/widgets/qdialogbuttonbox.cpp
index cd0f710..eb8c801 100644
--- a/src/gui/widgets/qdialogbuttonbox.cpp
+++ b/src/gui/widgets/qdialogbuttonbox.cpp
@@ -1215,6 +1215,30 @@ bool QDialogButtonBox::event(QEvent *event)
}else if (event->type() == QEvent::LanguageChange) {
d->retranslateStrings();
}
+#ifdef QT_SOFTKEYS_ENABLED
+ else if (event->type() == QEvent::ParentChange) {
+ QWidget *dialog = 0;
+ QWidget *p = this;
+ while (p && !p->isWindow()) {
+ p = p->parentWidget();
+ if ((dialog = qobject_cast<QDialog *>(p)))
+ break;
+ }
+
+ // If the parent changes, then move the softkeys
+ for (QHash<QAbstractButton *, QAction *>::const_iterator it = d->softKeyActions.constBegin();
+ it != d->softKeyActions.constEnd(); ++it) {
+ QAction *current = it.value();
+ QList<QWidget *> widgets = current->associatedWidgets();
+ foreach (QWidget *w, widgets)
+ w->removeAction(current);
+ if (dialog)
+ dialog->addAction(current);
+ else
+ addAction(current);
+ }
+ }
+#endif
return QWidget::event(event);
}