Changeset 88100 in vbox

Timestamp:

Mar 12, 2021 1:17:47 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8694: UIMessageCenter: Missed HiDPI support for UIProgressDialog pixmap; Aand cleanup for include mess for free.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp (modified) (7 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2006-2020 Oracle Corporation
+ * Copyright (C) 2006-2021 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -21 +21 @@
 #include <QFileInfo>
 #include <QLocale>
+#include <QProcess>
 #include <QThread>
-#include <QProcess>
 #ifdef VBOX_WS_MAC
 # include <QPushButton>
@@ -31 +31 @@
 #include "UICommon.h"
 #include "UIConverter.h"
+#include "UIErrorString.h"
+#include "UIExtraDataManager.h"
 #include "UIHelpBrowserDialog.h"
+#include "UIHostComboEditor.h"
+#include "UIIconPool.h"
+#include "UIMedium.h"
 #include "UIMessageCenter.h"
+#include "UIModalWindowManager.h"
 #include "UIProgressDialog.h"
-#include "UIErrorString.h"
+#include "VBoxAboutDlg.h"
 #ifdef VBOX_GUI_WITH_NETWORK_MANAGER
 # include "UINetworkRequestManager.h"
 # include "UINetworkRequestManagerWindow.h"
-#endif /* VBOX_GUI_WITH_NETWORK_MANAGER */
-#include "UIModalWindowManager.h"
-#include "UIExtraDataManager.h"
-#include "UIMedium.h"
+#endif
 #ifdef VBOX_OSE
 # include "UIDownloaderUserManual.h"
-#endif /* VBOX_OSE */
-#include "VBoxAboutDlg.h"
-#include "UIHostComboEditor.h"
+#endif
 #ifdef VBOX_WS_MAC
 # include "VBoxUtils-darwin.h"
@@ -55 +56 @@
 
 /* COM includes: */
+#include "CAppliance.h"
 #include "CAudioAdapter.h"
 #include "CBooleanFormValue.h"
@@ -63 +65 @@
 #include "CCloudProvider.h"
 #include "CCloudProviderManager.h"
+#include "CConsole.h"
 #include "CDHCPServer.h"
+#include "CExtPack.h"
+#include "CExtPackFile.h"
+#include "CExtPackManager.h"
 #include "CForm.h"
 #include "CGraphicsAdapter.h"
+#include "CHostNetworkInterface.h"
+#include "CMachine.h"
+#include "CMediumAttachment.h"
+#include "CMediumFormat.h"
 #include "CNATEngine.h"
 #include "CNATNetwork.h"
@@ -75 +85 @@
 #include "CStorageController.h"
 #include "CStringFormValue.h"
-#include "CConsole.h"
-#include "CMachine.h"
 #include "CSystemProperties.h"
-#include "CVirtualBoxErrorInfo.h"
-#include "CMediumAttachment.h"
-#include "CMediumFormat.h"
-#include "CAppliance.h"
-#include "CExtPack.h"
-#include "CExtPackManager.h"
-#include "CExtPackFile.h"
-#include "CHostNetworkInterface.h"
 #include "CUnattended.h"
 #include "CVFSExplorer.h"
+#include "CVirtualBoxErrorInfo.h"
 #include "CVirtualSystemDescription.h"
 #include "CVirtualSystemDescriptionForm.h"
 #ifdef VBOX_WITH_DRAG_AND_DROP
-# include "CGuest.h"
 # include "CDnDSource.h"
 # include "CDnDTarget.h"
-#endif /* VBOX_WITH_DRAG_AND_DROP */
+# include "CGuest.h"
+#endif
 
 /* Other VBox includes: */
+#include <iprt/errcore.h>
 #include <iprt/param.h>
 #include <iprt/path.h>
-
-#include <iprt/errcore.h>
 
 
@@ -365 +365 @@
                                               int cMinDuration /* = 2000 */)
 {
+    /* Prepare result: */
+    bool fRc = false;
+
+    /* Gather suitable dialog parent: */
+    QWidget *pDlgParent = windowManager().realParentWindow(pParent ? pParent : windowManager().mainWindowShown());
+    AssertPtrReturn(pDlgParent, fRc);
+
     /* Prepare pixmap: */
-    QPixmap *pPixmap = NULL;
+    QPixmap pixmap;
     if (!strImage.isEmpty())
-        pPixmap = new QPixmap(strImage);
+        pixmap = UIIconPool::iconSet(strImage).pixmap(pDlgParent->windowHandle(), QSize(90, 90));
 
     /* Create progress-dialog: */
-    QWidget *pDlgParent = windowManager().realParentWindow(pParent ? pParent : windowManager().mainWindowShown());
-    QPointer<UIProgressDialog> pProgressDlg = new UIProgressDialog(progress, strTitle, pPixmap, cMinDuration, pDlgParent);
-    windowManager().registerNewParent(pProgressDlg, pDlgParent);
-
-    /* Run the dialog with the 350 ms refresh interval. */
-    pProgressDlg->run(350);
-
-    /* Make sure progress-dialog still valid: */
-    bool fRc;
+    QPointer<UIProgressDialog> pProgressDlg = new UIProgressDialog(progress, strTitle, &pixmap, cMinDuration, pDlgParent);
     if (pProgressDlg)
     {
-        /* Delete progress-dialog: */
-        delete pProgressDlg;
-
-        fRc = true;
+        /* Register it as new parent: */
+        windowManager().registerNewParent(pProgressDlg, pDlgParent);
+
+        /* Run the dialog with the 350 ms refresh interval. */
+        pProgressDlg->run(350);
+
+        /* Make sure progress-dialog still valid: */
+        if (pProgressDlg)
+        {
+            /* Delete progress-dialog: */
+            delete pProgressDlg;
+            fRc = true;
+        }
     }
-    else
-        fRc = false;
-
-    /* Cleanup pixmap: */
-    if (pPixmap)
-        delete pPixmap;
-
+
+    /* Return result: */
     return fRc;
 }