Changeset 66656 in vbox

Timestamp:

Apr 24, 2017 1:16:40 PM (8 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

115025

Message:

FE/Qt: Reverting r114900 and r114897 as there will be more sane implementation.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachineWindow.cpp (modified) (2 diffs)
• UISession.cpp (modified) (1 diff)
• UIVMCloseDialog.cpp (modified) (2 diffs)
• UIVMCloseDialog.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -188 +188 @@
 
     /* Set redefined machine-window icon if any: */
-    const QIcon *pMachineWindowIcon = uisession()->machineWindowIcon();
-    if (pMachineWindowIcon)
-        setWindowIcon(*pMachineWindowIcon);
+    QIcon *pMachineWidnowIcon = uisession()->machineWindowIcon();
+    if (pMachineWidnowIcon)
+        setWindowIcon(*pMachineWidnowIcon);
     /* Or set default machine-window icon: */
     else
@@ -346 +346 @@
                                                                   console().GetGuestEnteredACPIMode(),
                                                                   restrictedCloseActions);
-#ifndef VBOX_WS_MAC
-        /* Configure close-dialog: */
-        const QIcon *pMachineWindowIcon = uisession()->machineWindowIcon();
-        if (pMachineWindowIcon)
-            pCloseDlg->setPixmap(pMachineWindowIcon->pixmap(QSize(32, 32)));
-#endif /* !VBOX_WS_MAC */
 
         /* Make sure close-dialog is valid: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -1290 +1290 @@
 
 #ifndef VBOX_WS_MAC
-        /* Check whether we have overriding machine-window icon: */
-        {
-            /* Prepare null icon: */
-            QIcon icon;
-
-            /* 1. Load icon from IMachine extra-data: */
-            if (icon.isNull())
-                foreach (const QString &strIconName, gEDataManager->machineWindowIconNames(strMachineID))
-                    if (!strIconName.isEmpty() && QFile::exists(strIconName))
-                        icon.addFile(strIconName);
-
-            /* 2. Load icon from IMachine interface: */
-            if (icon.isNull())
-            {
-                const QVector<BYTE> byteVector = machine().GetIcon();
-                const QByteArray byteArray = QByteArray::fromRawData(reinterpret_cast<const char*>(byteVector.constData()), byteVector.size());
-                const QImage image = QImage::fromData(byteArray);
-                if (!image.isNull())
-                {
-                    QPixmap pixmap = QPixmap::fromImage(image);
-                    const int iMinimumLength = qMin(pixmap.width(), pixmap.height());
-                    pixmap = pixmap.scaled(QSize(iMinimumLength, iMinimumLength), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
-                    icon.addPixmap(pixmap);
-                }
-            }
-
-            /* Finally, store the icon dynamically if overriden: */
-            if (!icon.isNull())
-                m_pMachineWindowIcon = new QIcon(icon);
-        }
+        /* Load/prepare user's machine-window icon: */
+        QIcon icon;
+        foreach (const QString &strIconName, gEDataManager->machineWindowIconNames(strMachineID))
+            if (!strIconName.isEmpty() && QFile::exists(strIconName))
+                icon.addFile(strIconName);
+        if (!icon.isNull())
+            m_pMachineWindowIcon = new QIcon(icon);
 
         /* Load user's machine-window name postfix: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.cpp

@@ -70 +70 @@
 }
 
-void UIVMCloseDialog::setPixmap(const QPixmap &pixmap)
-{
-    /* Make sure pixmap is valid: */
-    if (pixmap.isNull())
-        return;
-
-    /* Assign new pixmap: */
-    m_pIcon->setPixmap(pixmap);
-}
-
 void UIVMCloseDialog::sltUpdateWidgetAvailability()
 {
@@ -113 +103 @@
     /* Hide the dialog: */
     hide();
+}
+
+void UIVMCloseDialog::setPixmap(const QPixmap &pixmap)
+{
+    /* Make sure pixmap is valid: */
+    if (pixmap.isNull())
+        return;
+
+    /* Assign new pixmap: */
+    m_pIcon->setPixmap(pixmap);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIVMCloseDialog.h

@@ -44 +44 @@
     bool isValid() const { return m_fValid; }
 
-    /* API: Pixmap stuff: */
-    void setPixmap(const QPixmap &pixmap);
-
 private slots:
 
@@ -56 +53 @@
 
 private:
+
+    /* API: Pixmap stuff: */
+    void setPixmap(const QPixmap &pixmap);
 
     /* API: Detach-button stuff: */