Changeset 23031 in vbox for trunk/src

Timestamp:

Sep 15, 2009 1:01:57 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: enable sheets in Qt >= 4.5 again

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/QIDialog.h (modified) (1 diff)
• src/QIDialog.cpp (modified) (2 diffs)
• src/QIFileDialog.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/include/QIDialog.h

@@ -35 +35 @@
     QIDialog (QWidget *aParent = 0, Qt::WindowFlags aFlags = 0);
 
+public slots:
+    int exec();
+
 protected:
 

trunk/src/VBox/Frontends/VirtualBox/src/QIDialog.cpp

@@ -42 +42 @@
     if ((policy.horizontalPolicy() == QSizePolicy::Fixed &&
          policy.verticalPolicy() == QSizePolicy::Fixed) ||
-        windowFlags() == Qt::Sheet)
+        (windowFlags() & Qt::Sheet) == Qt::Sheet)
     {
         adjustSize();
@@ -61 +61 @@
 }
 
+int QIDialog::exec()
+{
+#if QT_VERSION >= 0x040500
+    /* After 4.5 exec ignores the Qt::Sheet flag. See "New Ways of Using
+     * Dialogs" in http://doc.trolltech.com/qq/QtQuarterly30.pdf why. Because
+     * we are lazy, we recreate the old behavior. */
+    if ((windowFlags() & Qt::Sheet) == Qt::Sheet)
+    {
+        QEventLoop eventLoop;
+        connect(this, SIGNAL(finished(int)),
+                &eventLoop, SLOT(quit()));
+        /* Use the new open call. */
+        open();
+        eventLoop.exec();
+
+        return result();
+    }
+    else
+#endif /* QT_VERSION >= 0x040500 */
+        return QDialog::exec();
+}

trunk/src/VBox/Frontends/VirtualBox/src/QIFileDialog.cpp

@@ -344 +344 @@
     }
     return dlg.exec() ? dlg.selectedFiles() [0] : QString::null;
+#elif defined (Q_WS_MAC) && (QT_VERSION >= 0x040600)
+
+    /* After 4.5 exec ignores the Qt::Sheet flag. See "New Ways of Using
+     * Dialogs" in http://doc.trolltech.com/qq/QtQuarterly30.pdf why. Because
+     * we are lazy, we recreate the old behavior. Unfortunately there is a bug
+     * in Qt 4.5.x which result in showing the native & the Qt dialog at the
+     * same time. */
+    QFileDialog dlg (aParent, Qt::Sheet);
+    dlg.setWindowTitle (aCaption);
+    dlg.setDirectory (aDir);
+    dlg.setResolveSymlinks (aResolveSymlinks);
+    dlg.setFileMode (aDirOnly ? QFileDialog::DirectoryOnly : QFileDialog::Directory);
+
+    QEventLoop eventLoop;
+    QObject::connect(&dlg, SIGNAL(finished(int)),
+                     &eventLoop, SLOT(quit()));
+    /* Use the new open call. */
+    dlg.open();
+    eventLoop.exec();
+
+    return dlg.result() == QDialog::Accepted ? dlg.selectedFiles() [0] : QString::null;
 
 #else
@@ -525 +546 @@
     }
     return dlg.exec() == QDialog::Accepted ? dlg.selectedFiles().value (0, "") : QString::null;
+
+#elif defined (Q_WS_MAC) && (QT_VERSION >= 0x040600)
+
+    /* After 4.5 exec ignores the Qt::Sheet flag. See "New Ways of Using
+     * Dialogs" in http://doc.trolltech.com/qq/QtQuarterly30.pdf why. Because
+     * we are lazy, we recreate the old behavior. Unfortunately there is a bug
+     * in Qt 4.5.x which result in showing the native & the Qt dialog at the
+     * same time. */
+    QFileDialog dlg (aParent);
+    dlg.setWindowTitle (aCaption);
+    dlg.setDirectory (aStartWith);
+    dlg.setFilter (aFilters);
+    dlg.setFileMode (QFileDialog::QFileDialog::AnyFile);
+    dlg.setAcceptMode (QFileDialog::AcceptSave);
+    if (aSelectedFilter)
+        dlg.selectFilter (*aSelectedFilter);
+    dlg.setResolveSymlinks (aResolveSymlinks);
+    dlg.setConfirmOverwrite (false);
+
+    QEventLoop eventLoop;
+    QObject::connect(&dlg, SIGNAL(finished(int)),
+                     &eventLoop, SLOT(quit()));
+    /* Use the new open call. */
+    dlg.open();
+    eventLoop.exec();
+
+    return dlg.result() == QDialog::Accepted ? dlg.selectedFiles().value (0, "") : QString::null;
 
 #else
@@ -739 +787 @@
     return dlg.exec() == QDialog::Accepted ? dlg.selectedFiles() : QStringList() << QString::null;
 
+#elif defined (Q_WS_MAC) && (QT_VERSION >= 0x040600)
+
+    /* After 4.5 exec ignores the Qt::Sheet flag. See "New Ways of Using
+     * Dialogs" in http://doc.trolltech.com/qq/QtQuarterly30.pdf why. Because
+     * we are lazy, we recreate the old behavior. Unfortunately there is a bug
+     * in Qt 4.5.x which result in showing the native & the Qt dialog at the
+     * same time. */
+    QFileDialog dlg (aParent, Qt::Sheet);
+    dlg.setWindowTitle (aCaption);
+    dlg.setDirectory (aStartWith);
+    dlg.setFilter (aFilters);
+    if (aSingleFile)
+        dlg.setFileMode (QFileDialog::ExistingFile);
+    else
+        dlg.setFileMode (QFileDialog::ExistingFiles);
+    if (aSelectedFilter)
+        dlg.selectFilter (*aSelectedFilter);
+    dlg.setResolveSymlinks (aResolveSymlinks);
+
+    QEventLoop eventLoop;
+    QObject::connect(&dlg, SIGNAL(finished(int)),
+                     &eventLoop, SLOT(quit()));
+    /* Use the new open call. */
+    dlg.open();
+    eventLoop.exec();
+
+    return dlg.result() == QDialog::Accepted ? dlg.selectedFiles() : QStringList() << QString::null;
+
 #else