GTK+ dialogs: do not emit duplicate selected signals
As mentioned in the bug report, these are already emitted in:
- QColorDialog::done(Accepted)
- QFileDialog::done()
- QFontDialog::accepted()
The same signal emissions were reverted from the Cocoa dialogs
in 916a8c44c4.
For QtQuick Dialogs, these don't matter because they handle this
in accepted().
Task-number: QTBUG-55298
Change-Id: I7990836745b160ec8de948697e2924322a583b6c
Reviewed-by: Dmitry Shachnev <mitya57@gmail.com>
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
bb10
parent
e416cc553d
commit
b2799062f3
|
|
@ -218,7 +218,6 @@ QColor QGtk3ColorDialogHelper::currentColor() const
|
|||
void QGtk3ColorDialogHelper::onAccepted()
|
||||
{
|
||||
emit accept();
|
||||
emit colorSelected(currentColor());
|
||||
}
|
||||
|
||||
void QGtk3ColorDialogHelper::onColorChanged(QGtk3ColorDialogHelper *dialog)
|
||||
|
|
@ -357,11 +356,6 @@ QString QGtk3FileDialogHelper::selectedNameFilter() const
|
|||
void QGtk3FileDialogHelper::onAccepted()
|
||||
{
|
||||
emit accept();
|
||||
|
||||
QList<QUrl> files = selectedFiles();
|
||||
emit filesSelected(files);
|
||||
if (files.count() == 1)
|
||||
emit fileSelected(files.first());
|
||||
}
|
||||
|
||||
void QGtk3FileDialogHelper::onSelectionChanged(GtkDialog *gtkDialog, QGtk3FileDialogHelper *helper)
|
||||
|
|
@ -593,7 +587,6 @@ QFont QGtk3FontDialogHelper::currentFont() const
|
|||
void QGtk3FontDialogHelper::onAccepted()
|
||||
{
|
||||
emit accept();
|
||||
emit fontSelected(currentFont());
|
||||
}
|
||||
|
||||
void QGtk3FontDialogHelper::onFontChanged(QGtk3FontDialogHelper *dialog)
|
||||
|
|
|
|||
Loading…
Reference in New Issue