Changeset 51004 in vbox

Timestamp:

Apr 8, 2014 5:13:43 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: 7340: Make GUI VM process task-bar icon configurable (Windows/Linux hosts).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDefs.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (3 diffs)
• runtime/UISession.h (modified) (3 diffs)

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

@@ -51 +51 @@
 
 /* Machine-window definitions: */
+#ifndef Q_WS_MAC
+const char* UIDefs::GUI_MachineWindowIcons = "GUI/MachineWindowIcons";
+#endif /* !Q_WS_MAC */
 const char* UIDefs::GUI_RestrictedRuntimeMenus = "GUI/RestrictedRuntimeMenus";
 #ifdef Q_WS_MAC

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

@@ -120 +120 @@
 
     /* Machine-window declarations: */
+#ifndef Q_WS_MAC
+    extern const char* GUI_MachineWindowIcons;
+#endif /* !Q_WS_MAC */
     extern const char* GUI_RestrictedRuntimeMenus;
 #ifdef Q_WS_MAC

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

@@ -4084 +4084 @@
 }
 
+#ifndef Q_WS_MAC
+/* static */
+QStringList VBoxGlobal::machineWindowIconNames(CMachine &machine)
+{
+    /* Return result: */
+    return machine.GetExtraDataStringList(GUI_MachineWindowIcons);
+}
+#endif /* !Q_WS_MAC */
+
 #ifdef RT_OS_LINUX
 /* static */

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.h

@@ -397 +397 @@
     static QList<GlobalSettingsPageType> restrictedGlobalSettingsPages(CVirtualBox &vbox);
     static QList<MachineSettingsPageType> restrictedMachineSettingsPages(CMachine &machine);
+#ifndef Q_WS_MAC
+    /** Loads redefined machine-window icon names. */
+    static QStringList machineWindowIconNames(CMachine &machine);
+#endif /* !Q_WS_MAC */
 
 #ifdef RT_OS_LINUX

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

@@ -174 +174 @@
 {
 #ifndef Q_WS_MAC
-    /* On Mac OS X application icon referenced in info.plist is used. */
-
-    /* Set default application icon (will be changed to VM-specific icon little bit later): */
+    /* On Mac OS X window icon referenced in info.plist is used. */
+
+    /* Set default window icon (will be changed to VM-specific icon little bit later): */
     setWindowIcon(QIcon(":/VirtualBox_48px.png"));
 
-    /* Set VM-specific application icon: */
-    setWindowIcon(vboxGlobal().vmGuestOSTypeIcon(machine().GetOSTypeId()));
+    /* Set redefined machine-window icon if any: */
+    QIcon *pMachineWidnowIcon = uisession()->machineWindowIcon();
+    if (pMachineWidnowIcon)
+        setWindowIcon(*pMachineWidnowIcon);
+    /* Or set default machine-window icon: */
+    else
+        setWindowIcon(vboxGlobal().vmGuestOSTypeIcon(machine().GetOSTypeId()));
 #endif /* !Q_WS_MAC */
 }

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

@@ -130 +130 @@
     , m_machineStatePrevious(KMachineState_Null)
     , m_machineState(session().GetMachine().GetState())
+#ifndef Q_WS_MAC
+    , m_pMachineWindowIcon(0)
+#endif /* !Q_WS_MAC */
     , m_fIsExtensionPackUsable(false)
     , m_requestedVisualStateType(UIVisualStateType_Invalid)
@@ -1117 +1120 @@
         QString strSettings;
 
+#ifndef Q_WS_MAC
+        /* Load/prepare user's machine-window icon: */
+        QIcon icon;
+        foreach (const QString &strIconName, VBoxGlobal::machineWindowIconNames(machine))
+            if (!strIconName.isEmpty())
+                icon.addFile(strIconName);
+        if (!icon.isNull())
+            m_pMachineWindowIcon = new QIcon(icon);
+#endif /* !Q_WS_MAC */
+
         /* Is there should be First RUN Wizard? */
         strSettings = machine.GetExtraData(GUI_FirstRun);
@@ -1179 +1192 @@
 # endif /* Q_WS_WIN */
 #endif
+
+#ifndef Q_WS_MAC
+        /* Cleanup user's machine-window icon: */
+        delete m_pMachineWindowIcon;
+        m_pMachineWindowIcon = 0;
+#endif /* !Q_WS_MAC */
     }
 }

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

@@ -41 +41 @@
 class CNetworkAdapter;
 class CMediumAttachment;
+#ifndef Q_WS_MAC
+class QIcon;
+#endif /* !Q_WS_MAC */
 
 /* CConsole callback event types: */
@@ -94 +97 @@
     QCursor cursor() const { return m_cursor; }
 
+#ifndef Q_WS_MAC
+    /** @name Branding stuff.
+     ** @{ */
+    /** Returns redefined machine-window icon. */
+    QIcon* machineWindowIcon() const { return m_pMachineWindowIcon; }
+    /** @} */
+#endif /* !Q_WS_MAC */
+
     /** @name Extension Pack stuff.
      ** @{ */
@@ -330 +341 @@
     QCursor m_cursor;
 
+#ifndef Q_WS_MAC
+    /** @name Branding variables.
+     ** @{ */
+    /** Holds redefined machine-window icon. */
+    QIcon *m_pMachineWindowIcon;
+    /** @} */
+#endif /* !Q_WS_MAC */
+
     /** @name Extension Pack variables.
      ** @{ */