equal
deleted
inserted
replaced
757 fields += myField; |
757 fields += myField; |
758 if (myField.mandatory && !myField.changedSignal.isEmpty()) |
758 if (myField.mandatory && !myField.changedSignal.isEmpty()) |
759 QObject::connect(myField.object, myField.changedSignal, |
759 QObject::connect(myField.object, myField.changedSignal, |
760 myField.page, SLOT(_q_maybeEmitCompleteChanged())); |
760 myField.page, SLOT(_q_maybeEmitCompleteChanged())); |
761 QObject::connect( |
761 QObject::connect( |
762 myField.object, SIGNAL(destroyed(QObject *)), q, |
762 myField.object, SIGNAL(destroyed(QObject*)), q, |
763 SLOT(_q_handleFieldObjectDestroyed(QObject *))); |
763 SLOT(_q_handleFieldObjectDestroyed(QObject*))); |
764 } |
764 } |
765 |
765 |
766 void QWizardPrivate::removeFieldAt(int index) |
766 void QWizardPrivate::removeFieldAt(int index) |
767 { |
767 { |
768 Q_Q(QWizard); |
768 Q_Q(QWizard); |
771 fieldIndexMap.remove(field.name); |
771 fieldIndexMap.remove(field.name); |
772 if (field.mandatory && !field.changedSignal.isEmpty()) |
772 if (field.mandatory && !field.changedSignal.isEmpty()) |
773 QObject::disconnect(field.object, field.changedSignal, |
773 QObject::disconnect(field.object, field.changedSignal, |
774 field.page, SLOT(_q_maybeEmitCompleteChanged())); |
774 field.page, SLOT(_q_maybeEmitCompleteChanged())); |
775 QObject::disconnect( |
775 QObject::disconnect( |
776 field.object, SIGNAL(destroyed(QObject *)), q, |
776 field.object, SIGNAL(destroyed(QObject*)), q, |
777 SLOT(_q_handleFieldObjectDestroyed(QObject *))); |
777 SLOT(_q_handleFieldObjectDestroyed(QObject*))); |
778 fields.remove(index); |
778 fields.remove(index); |
779 } |
779 } |
780 |
780 |
781 void QWizardPrivate::switchToPage(int newId, Direction direction) |
781 void QWizardPrivate::switchToPage(int newId, Direction direction) |
782 { |
782 { |
1535 QObject::connect( |
1535 QObject::connect( |
1536 vistaHelper->backButton(), SIGNAL(clicked()), q, buttonSlots[QWizard::BackButton]); |
1536 vistaHelper->backButton(), SIGNAL(clicked()), q, buttonSlots[QWizard::BackButton]); |
1537 vistaHelper->backButton()->show(); |
1537 vistaHelper->backButton()->show(); |
1538 } else { |
1538 } else { |
1539 q->setMouseTracking(true); // ### original value possibly different |
1539 q->setMouseTracking(true); // ### original value possibly different |
|
1540 #ifndef QT_NO_CURSOR |
1540 q->unsetCursor(); // ### ditto |
1541 q->unsetCursor(); // ### ditto |
|
1542 #endif |
1541 antiFlickerWidget->move(0, 0); |
1543 antiFlickerWidget->move(0, 0); |
1542 vistaHelper->hideBackButton(); |
1544 vistaHelper->hideBackButton(); |
1543 vistaHelper->setTitleBarIconAndCaptionVisible(true); |
1545 vistaHelper->setTitleBarIconAndCaptionVisible(true); |
1544 } |
1546 } |
1545 |
1547 |